diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog index 4474e2faf3..67419424c6 100644 --- a/debian-alt/precise/changelog +++ b/debian-alt/precise/changelog @@ -1,3 +1,9 @@ +i2p (0.9.30p-1~precise+1) precise; urgency=medium + + * Backport to Precise + + -- zzz on i2p (key signing) Mon, 03 May 2017 12:12:12 +0000 + i2p (0.9.29p-1~precise+1) precise; urgency=medium * Backport to Precise diff --git a/debian-alt/precise/control b/debian-alt/precise/control index 49b3639bad..5e11ecf148 100644 --- a/debian-alt/precise/control +++ b/debian-alt/precise/control @@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 7.0.50~) ,openjdk-6-jdk ,glassfish-javaee ,dh-apparmor + ,bash-completion ,gettext ,libgetopt-java ,libgmp-dev (>= 2:5.0.2) diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog index d116900731..7f7be87c49 100644 --- a/debian-alt/xenial/changelog +++ b/debian-alt/xenial/changelog @@ -1,3 +1,15 @@ +i2p (0.9.30-3ubuntu1) xenial; urgency=medium + + * New upstream version 0.9.30 + + -- zzz on i2p (key signing) Mon, 03 May 2017 12:12:12 +0000 + +i2p (0.9.29-1ubuntu1) trusty; urgency=medium + + * New upstream version 0.9.29 + + -- zzz on i2p (key signing) Mon, 27 Feb 2017 12:12:12 +0000 + i2p (0.9.28-1ubuntu1) trusty; urgency=medium * New upstream version 0.9.28 diff --git a/debian-alt/xenial/control b/debian-alt/xenial/control index 3fe552d463..2aea16cdfa 100644 --- a/debian-alt/xenial/control +++ b/debian-alt/xenial/control @@ -13,6 +13,8 @@ Build-Depends: debhelper (>= 7.0.50~) ,glassfish-javaee ,libtomcat8-java ,dh-apparmor + ,dh-systemd + ,bash-completion ,gettext ,libgetopt-java ,libgmp-dev (>= 2:5.0.2) diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index 736a1ff835..1fab6f69ac 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -176,7 +176,7 @@ Debian wrapper.config to try to prevent confusion. exit 1 fi } -@@ -1944,24 +1857,10 @@ +@@ -1946,24 +1859,10 @@ status ;; @@ -558,26 +558,24 @@ Debian wrapper.config to try to prevent confusion. +"För att köra som root oavsett, ändra /etc/default/i2p och sätt ALLOW_ROOT=true" --- a/installer/resources/locale/po/messages_ro.po +++ b/installer/resources/locale/po/messages_ro.po -@@ -187,15 +187,15 @@ - msgstr "Solicitarea dump-ului firului Java daca este pornit" +@@ -187,13 +187,13 @@ + msgstr "Solicită Java thread dump dacă rulează." - #: ../i2prouter:1864 + #: ../i2prouter:1874 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" --msgstr "Vă rugăm să editați i2prouter și setați variabila RUN_AS_USER " +-msgstr "Vă rugăm să editați i2prouter și să setați variabila RUN_AS_USER " +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" -+msgstr "Vă rugăm să editați /etc/default/i2p și setați variabila RUN_AS_USER " ++msgstr "Vă rugăm să editați /etc/default/i2p și să setați variabila RUN_AS_USER " - #: ../i2prouter:1869 + #: ../i2prouter:1879 msgid "Running I2P as the root user is *not* recommended." msgstr "Rularea I2P ca root *nu* este recomandată." - #: ../i2prouter:1872 + #: ../i2prouter:1882 -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." +-msgstr "Pentru a rula ca root, oricum, editați i2prouter și setați ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." - msgstr "" --"Pentru a rula ca root, oricum, editati i2prouter și setați ALLOW_ROOT = " -+"Pentru a rula ca root, oricum, editati /etc/default/i2p și setați ALLOW_ROOT = " - "true." ++msgstr "Pentru a rula ca root, oricum, editați /etc/default/i2p și setați ALLOW_ROOT=true." --- a/installer/resources/locale/po/messages_pt_BR.po +++ b/installer/resources/locale/po/messages_pt_BR.po @@ -189,13 +189,13 @@ diff --git a/debian/rules b/debian/rules index 5b8cc658c9..67e0d3315e 100755 --- a/debian/rules +++ b/debian/rules @@ -107,7 +107,7 @@ endif ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar @# debian and ubuntu: wheezy-backports, jessie+, xenial+ - /bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties + @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar