From 6b8cb54466de5abea0dd245e77d1c8a74c7e7aaf Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 26 May 2016 11:42:24 +0000
Subject: [PATCH] Debian: Refresh patch, update docs
---
debian-alt/README.txt | 4 +---
debian-alt/doc/launchpad.txt | 5 +++--
debian/patches/0001-path-substitution.patch | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/debian-alt/README.txt b/debian-alt/README.txt
index 7ceec41976..2e18105686 100644
--- a/debian-alt/README.txt
+++ b/debian-alt/README.txt
@@ -1,9 +1,7 @@
The files in ../debian/ are for jessie/stable.
Alternates are in the subdirectories here.
-trusty may be copied to utopic and vivid.
-They do not have libjetty8-java.
-wily has libjetty8-java.
+trusty may be copied to utopic, vivid, wily, xenial.
tails-jessie and tails-wheezy are currently the same as
jessie and wheezy, respectively. If they diverge, put the changes here.
diff --git a/debian-alt/doc/launchpad.txt b/debian-alt/doc/launchpad.txt
index 60a71e624c..d95482f6ce 100644
--- a/debian-alt/doc/launchpad.txt
+++ b/debian-alt/doc/launchpad.txt
@@ -39,20 +39,21 @@ Generate files to upload
- export TZ=UTC
- cd i2p.i2p.foobar
+- copy debian-alt/(series)/changelog to debian/
- edit debian/changelog to add the release at the top
* version MUST be 0.9.XX-1ubuntu1
next version for fixes would be 0.9.XX-2ubunutu1
- * series MUST be trusty
+ * series MUST be trusty (or precise)
* name and email MUST EXACTLY match what's in your GPG keyring
or the signing will fail.
(or add -kkeyid argument to debuild, which you must do
if you want to sign with a subkey)
run gpg -K to list your private keys
-- edit debian/control to uncomment libservice-wrapper-java line
- ant debian-release-tarball
this will make a directory ../i2p-0.9.XX-0-xxxxxxxx/
and a tarball ../i2p_0.9.XX.orig.tar.bz2
- cp debian/changelog ../i2p-0.9.XX-0-xxxxxxxx/debian/
+- cp debian-alt/(series)/(other files besides changelog) to ../i2p-0.9.XX-0-xxxxxxxx/debian/
- cd ../i2p-0.9.XX-0-xxxxxxxx/
- Build the *1ubuntu1* files:
If you have NOT done a successful dput for this release yet:
diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 9ab41c037b..1c1746e75f 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -371,16 +371,16 @@ Debian wrapper.config to try to prevent confusion.
@@ -185,7 +185,7 @@
msgstr ""
- #: ../i2prouter:1864
+ #: ../i2prouter:1875
-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
msgstr ""
- #: ../i2prouter:1869
+ #: ../i2prouter:1880
@@ -193,5 +193,5 @@
msgstr ""
- #: ../i2prouter:1872
+ #: ../i2prouter:1883
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr ""
--
GitLab