From 2902a708f97bd5c68b3a22eeea1f633feacf2410 Mon Sep 17 00:00:00 2001 From: kytv Date: Tue, 16 Jul 2013 22:17:50 +0000 Subject: [PATCH] debian updates - check script validity in build target - refresh patch - changelog update --- debian/changelog | 14 ++++++++++++-- debian/patches/0001-path-substitution.patch | 3 ++- debian/rules | 2 ++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ed9b0a33..c8a877d83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,18 @@ -i2p (0.9.7-0) unstable; urgency=low +i2p (0.9.7-2) unstable; urgency=low + + * Bugfix: Add missing ; to i2prouter script. + * Test scripts with "sh -n" in the build target + + -- Kill Your TV Tue, 16 Jul 2013 11:08:48 +0000 + +i2p (0.9.7-1) unstable; urgency=low * New upstream release + * debconf: + - New Chinese, Portuguese, and Turkish translations + - Russian translation updates - -- Kill Your TV Mon, 15 Jul 2013 00:00:00 +0000 + -- Kill Your TV Mon, 15 Jul 2013 19:35:09 +0000 i2p (0.9.6-1) unstable; urgency=low diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index b88aa1e44..e1cb1e72d 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -158,7 +158,7 @@ Debian wrapper.config to try to prevent confusion. exit 1 fi } -@@ -1866,24 +1809,9 @@ +@@ -1866,24 +1809,10 @@ status ;; @@ -183,6 +183,7 @@ Debian wrapper.config to try to prevent confusion. + 'install' | 'remove' | 'uninstall') + echo "Use \"dpkg-reconfigure i2p\" to configure the initscript." + exit 1 ++ ;; 'dump') checkUser "" "$COMMAND" diff --git a/debian/rules b/debian/rules index d5f9b339f..eb2be3167 100755 --- a/debian/rules +++ b/debian/rules @@ -62,6 +62,8 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" else @echo "Already found deb in version, not doing anything" endif + sh -n installer/resources/i2prouter || exit 1 + sh -n installer/resources/runplain.sh || exit 1 TZ=UTC ant preppkg-unix javadoc echo router.updateDisabled=true > $(I2P)/router.config mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper