Closed darealshinji closed 9 years ago
Here's a proposed fix.
diff --git a/Debian/debian/notepadqq-common.lintian-overrides b/Debian/debian/notepadqq-common.lintian-overrides
index e2e475b..916d5bf 100644
--- a/Debian/debian/notepadqq-common.lintian-overrides
+++ b/Debian/debian/notepadqq-common.lintian-overrides
@@ -1,3 +1,7 @@
-# jquery in the repositories is outdated
+# we use newer versions than those in the repositories
notepadqq-common binary: embedded-javascript-library usr/share/notepadqq/editor/libs/jquery/jquery.min.js*
+notepadqq-common binary: embedded-javascript-library usr/share/notepadqq/extension_tools/node_modules/archiver/node_modules/async/lib/async.js*
+
+# unusual, but required
+notepadqq-common binary: unusual-interpreter usr/share/notepadqq/extension_tools/node_modules/shelljs/bin/shjs #!node
diff --git a/Debian/debian/rules b/Debian/debian/rules
index 7860301..7c4f7e1 100755
--- a/Debian/debian/rules
+++ b/Debian/debian/rules
@@ -3,6 +3,8 @@
export LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
export QT_SELECT=qt5
+EXTDIR=debian/tmp/usr/share/notepadqq/extension_tools/node_modules
+
%:
dh ${@} --parallel
@@ -12,9 +14,11 @@ override_dh_auto_clean:
rm -rf out
override_dh_install:
- dh_install -XLICENSE -XAUTHORS -X.md
+ rm -rf `find $(EXTDIR) -type d -name test*` \
+ $(EXTDIR)/archiver/node_modules/async/support $(EXTDIR)/shelljs/scripts
+ dh_install -XLICENSE -XLICENCE -XAUTHORS -X.md
install -m755 debian/tmp/usr/bin/notepadqq \
- $(CURDIR)/debian/notepadqq/usr/lib/notepadqq/notepadqq.sh
+ $(CURDIR)/debian/notepadqq/usr/lib/notepadqq/notepadqq.sh
override_dh_installdocs:
dh_installdocs --link-doc=notepadqq-common
Nice catch! I'll take care of it as soon as the next version comes out.
I get Lintian warnings for the notepadqq-common package:
I assume these files can be removed from usr/share/notepadqq/extension_tools:
And I guess these can be overridden: