echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

launchpad build fixes

Browse Source
This commit is contained in:
zzz
2017-05-03 21:29:22 +00:00
parent 8d6ca6431d
commit ffb3e27c0f
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian-alt/precise/changelog
View File

@ -1,3 +1,9 @@
i2p (0.9.30p-1~precise+1) precise; urgency=medium
* Backport to Precise
-- zzz on i2p (key signing) <zzz@i2pmail.org> Mon, 03 May 2017 12:12:12 +0000
i2p (0.9.29p-1~precise+1) precise; urgency=medium i2p (0.9.29p-1~precise+1) precise; urgency=medium
* Backport to Precise * Backport to Precise

1
debian-alt/precise/control
View File

@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 7.0.50~)
,openjdk-6-jdk ,openjdk-6-jdk
,glassfish-javaee ,glassfish-javaee
,dh-apparmor ,dh-apparmor
,bash-completion
,gettext ,gettext
,libgetopt-java ,libgetopt-java
,libgmp-dev (>= 2:5.0.2) ,libgmp-dev (>= 2:5.0.2)

12
debian-alt/xenial/changelog
View File

@ -1,3 +1,15 @@
i2p (0.9.30-3ubuntu1) xenial; urgency=medium
* New upstream version 0.9.30
-- zzz on i2p (key signing) <zzz@i2pmail.org> 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) <zzz@i2pmail.org> Mon, 27 Feb 2017 12:12:12 +0000
i2p (0.9.28-1ubuntu1) trusty; urgency=medium i2p (0.9.28-1ubuntu1) trusty; urgency=medium
* New upstream version 0.9.28 * New upstream version 0.9.28

2
debian-alt/xenial/control
View File

@ -13,6 +13,8 @@ Build-Depends: debhelper (>= 7.0.50~)
,glassfish-javaee ,glassfish-javaee
,libtomcat8-java ,libtomcat8-java
,dh-apparmor ,dh-apparmor
,dh-systemd
,bash-completion
,gettext ,gettext
,libgetopt-java ,libgetopt-java
,libgmp-dev (>= 2:5.0.2) ,libgmp-dev (>= 2:5.0.2)

22
debian/patches/0001-path-substitution.patch vendored
View File

@ -176,7 +176,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1944,24 +1857,10 @@ @@ -1946,24 +1859,10 @@
status 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" +"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 --- a/installer/resources/locale/po/messages_ro.po
+++ b/installer/resources/locale/po/messages_ro.po +++ b/installer/resources/locale/po/messages_ro.po
@@ -187,15 +187,15 @@ @@ -187,13 +187,13 @@
msgstr "Solicitarea dump-ului firului Java daca este pornit" msgstr "Solicită Java thread dump dacă rulează."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -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" +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." msgid "Running I2P as the root user is *not* recommended."
msgstr "Rularea I2P ca root *nu* este recomandată." 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." -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." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Pentru a rula ca root, oricum, editați /etc/default/i2p și setați ALLOW_ROOT=true."
-"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."
--- a/installer/resources/locale/po/messages_pt_BR.po --- a/installer/resources/locale/po/messages_pt_BR.po
+++ b/installer/resources/locale/po/messages_pt_BR.po +++ b/installer/resources/locale/po/messages_pt_BR.po
@@ -189,13 +189,13 @@ @@ -189,13 +189,13 @@

2
debian/rules vendored
View File

@ -107,7 +107,7 @@ endif
ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# debian and ubuntu: wheezy-backports, jessie+, xenial+ @# 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 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-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar