From 652f9bb6a09f7146be35a59c8fc32371fabff674 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Tue, 22 Oct 2019 16:36:23 +0000 Subject: [PATCH] Debian/Ubuntu updates for 0.9.43 --- debian-alt/README.txt | 2 +- debian-alt/bionic/changelog | 6 +++++ debian-alt/disco/changelog | 6 +++++ debian-alt/doc/debian-build.txt | 30 +++++---------------- debian-alt/doc/launchpad.txt | 2 +- debian-alt/precise/changelog | 6 +++++ debian-alt/trusty/changelog | 6 +++++ debian-alt/xenial/changelog | 6 +++++ debian/patches/0001-path-substitution.patch | 4 +-- 9 files changed, 40 insertions(+), 28 deletions(-) diff --git a/debian-alt/README.txt b/debian-alt/README.txt index cbc18a733d..95a60654ec 100644 --- a/debian-alt/README.txt +++ b/debian-alt/README.txt @@ -9,7 +9,7 @@ trusty may be copied to vivid. trusty may be used for jessie with libjetty9-java from backports. xenial may be copied to yakkety, zesty bionic may be copied to cosmic -disco may be copied to eoan +disco may be copied to eoan and focal Not maintained: wheezy files are not maintained. Use the precise files instead. diff --git a/debian-alt/bionic/changelog b/debian-alt/bionic/changelog index cf0ea74c8c..803b9076f3 100644 --- a/debian-alt/bionic/changelog +++ b/debian-alt/bionic/changelog @@ -1,3 +1,9 @@ +i2p (0.9.43-1ubuntu1) bionic; urgency=medium + + * New upstream version 0.9.43 + + -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 22 Oct 2019 12:12:12 +0000 + i2p (0.9.42-1ubuntu1) bionic; urgency=medium * New upstream version 0.9.42 diff --git a/debian-alt/disco/changelog b/debian-alt/disco/changelog index 94895e96a5..0075c5641b 100644 --- a/debian-alt/disco/changelog +++ b/debian-alt/disco/changelog @@ -1,3 +1,9 @@ +i2p (0.9.43-1~disco+1) disco; urgency=medium + + * New upstream version 0.9.43 + + -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 22 Oct 2019 12:12:12 +0000 + i2p (0.9.42-1~disco+1) disco; urgency=medium * New upstream version 0.9.42 diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt index 40c50da51f..4f338d5773 100644 --- a/debian-alt/doc/debian-build.txt +++ b/debian-alt/doc/debian-build.txt @@ -71,19 +71,18 @@ reprepro includedeb stable i2p_0.9.xx-1_all.deb reprepro includedsc stable i2p_0.9.XX-1.dsc # copy built packages from launchpad -reprepro -v update precise -reprepro -v update trusty -reprepro -v update xenial -reprepro -v update bionic -reprepro -v update cosmic -reprepro -v update disco -reprepro -v update eoan +for i in precise trusty xenial bionic disco eoan focal +do + reprepro -v update $i +done + # todo when set up # To add or remove distributions, edit /var/www/debian/conf/distributions # and /var/www/debian/conf/updates # and then: reprepro -v export foo (for new foo) # and then: reprepro -v update foo # and: reprepro -v copysrc foo buster i2p-keyring +# and: reprepro -v copysrc foo buster syndie # If you remove, you must do: reprepro clearvanished @@ -107,23 +106,6 @@ reprepro -v copysrc stretch trusty i2p reprepro -v copysrc sid disco i2p reprepro -v copysrc buster disco i2p -# install in the architectures not copied from ubuntu -# 'flood' should do this but forgot how, can't make it work any more -reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p_0.9.xxp-1~precise+1_all.deb -reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-doc_0.9.xxp-1~precise+1_all.deb -reprepro -v -A 'armel|armhf|powerpc' includedeb wheezy i2p-router_0.9.xxp-1~precise+1_all.deb -reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p_0.9.xxp-1~trusty+1_all.deb -reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-doc_0.9.xxp-1~trusty+1_all.deb -reprepro -v -A 'armel|armhf|powerpc' includedeb jessie i2p-router_0.9.xxp-1~trusty+1_all.deb -reprepro -v -A 'armel|armhf' includedeb stretch i2p_0.9.xx-1ubuntu1_all.deb -reprepro -v -A 'armel|armhf' includedeb stretch i2p-doc_0.9.xx-1ubuntu1_all.deb -reprepro -v -A 'armel|armhf' includedeb stretch i2p-router_0.9.xx-1ubuntu1_all.deb -reprepro -v -A 'armel|armhf' includedeb sid i2p_0.9.xx-1~disco+1_all.deb -reprepro -v -A 'armel|armhf' includedeb sid i2p-doc_0.9.xx-1~disco+1_all.deb -reprepro -v -A 'armel|armhf' includedeb sid i2p-router_0.9.xx-1~disco+1_all.deb - - - # check status reprepro ls i2p reprepro ls i2p-doc diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt index be905a3ebd..61e22f3df2 100644 --- a/debian-alt/doc/launchpad.txt +++ b/debian-alt/doc/launchpad.txt @@ -18,7 +18,7 @@ precise saucy precise wheezy trusty wily precise jessie, stretch xenial yakkety xenial -- bionic cosmic bionic -- -disco eoan bionic buster, sid +disco focal bionic buster, sid Prep (first time only) diff --git a/debian-alt/precise/changelog b/debian-alt/precise/changelog index 7479d3b017..58744cdb0c 100644 --- a/debian-alt/precise/changelog +++ b/debian-alt/precise/changelog @@ -1,3 +1,9 @@ +i2p (0.9.43p-1~precise+1) precise; urgency=medium + + * Backport to Precise + + -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 22 Oct 2019 12:12:12 +0000 + i2p (0.9.42p-1~precise+1) precise; urgency=medium * Backport to Precise diff --git a/debian-alt/trusty/changelog b/debian-alt/trusty/changelog index 6a330001d0..ca4edbbc67 100644 --- a/debian-alt/trusty/changelog +++ b/debian-alt/trusty/changelog @@ -1,3 +1,9 @@ +i2p (0.9.43p-1~trusty+1) trusty; urgency=medium + + * Backport to Trusty + + -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 22 Oct 2019 12:12:12 +0000 + i2p (0.9.42p-1~trusty+1) trusty; urgency=medium * Backport to Trusty diff --git a/debian-alt/xenial/changelog b/debian-alt/xenial/changelog index d01d2537c8..88e545e366 100644 --- a/debian-alt/xenial/changelog +++ b/debian-alt/xenial/changelog @@ -1,3 +1,9 @@ +i2p (0.9.43x-1~xenial+1) xenial; urgency=medium + + * Backport to Xenial + + -- zzz on i2p (key signing) <zzz@i2pmail.org> Tue, 22 Oct 2019 12:12:12 +0000 + i2p (0.9.42x-1~xenial+1) xenial; urgency=medium * Backport to Xenial diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch index bf12ab97fe..6599661802 100644 --- a/debian/patches/0001-path-substitution.patch +++ b/debian/patches/0001-path-substitution.patch @@ -558,9 +558,9 @@ Index: b/installer/resources/locale/po/messages_sv.po #: ../i2prouter:1874 -msgid "Please edit i2prouter and set the variable RUN_AS_USER" --msgstr "Var god ändra i2prouter och set variabeln RUN_AS_USER" +-msgstr "Vänligen ändra i2prouter och set variabeln RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" -+msgstr "Var god ändra /etc/default/i2p och set variabeln RUN_AS_USER" ++msgstr "Vänligen ändra /etc/default/i2p och set variabeln RUN_AS_USER" #: ../i2prouter:1879 msgid "Running I2P as the root user is *not* recommended." -- GitLab