Re: Q: update developers-reference
On Tue, 26 May 2015 14:12:48 +0200
Lucas Nussbaum <lucas@lucas-nussbaum.net> wrote:
> I would welcome a patch.
Okay, here it is, could you check it, please?
--
Regards,
Hideki Yamane henrich @ debian.or.jp/org
http://wiki.debian.org/HidekiYamane
>From 3da7236f0af6d3deb16449550db54718d27264af Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:09:15 +0900
Subject: [PATCH 1/8] fix URL for snapshot.d.o
---
pkgs.dbk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs.dbk b/pkgs.dbk
index 5a34b95..4d29e37 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -1516,7 +1516,7 @@ You should do all the things required before introducing new packages
<para>
You should base your work on the latest packaging available that is suitable.
That might be the latest version from <literal>unstable</literal>, which will
-still be present in the <ulink url="&snap-debian-org;">snapshot archive</ulink>.
+still be present in the <ulink url="http://&snap-debian-org;/";>snapshot archive</ulink>.
</para>
<para>
The version control system used by the previous maintainer might contain useful
--
2.1.4
>From 7831443bc84ecb2afb7c7aa91bf1eda1d5c04fd0 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:42:05 +0900
Subject: [PATCH 2/8] fix Bug#784244
---
debian/changelog | 1 +
pkgs.dbk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f183066..a840d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
[ Hideki Yamane ]
* add css and images for HTML documents, borrowed from debian reference.
(Closes: #780787)
+ * not say "security NMU" but just say "upload" (Closes: #784244)
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
diff --git a/pkgs.dbk b/pkgs.dbk
index 4d29e37..0237819 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -2157,9 +2157,9 @@ this, a version of the form
<literal>+deb<replaceable>X</replaceable>u<replaceable>Y</replaceable></literal>
should be used, where <replaceable>X</replaceable> is the major release number,
and <replaceable>Y</replaceable> is a counter starting at <literal>1</literal>.
-For example, while Wheezy (Debian 7.0) is stable, a security NMU to stable for
+For example, while Wheezy (Debian 7.0) is stable, a security upload to stable for
a package at version <literal>1.5-3</literal> would have version
-<literal>1.5-3+deb7u1</literal>, whereas a security NMU to Jessie would get
+<literal>1.5-3+deb7u1</literal>, whereas a security upload to Jessie would get
version <literal>1.5-3+deb8u1</literal>.
</para>
</section>
--
2.1.4
>From 2e9c7b3714aba9c34488c25c94e86edcf47fff41 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:42:38 +0900
Subject: [PATCH 3/8] fix Bug#784248
---
debian/changelog | 1 +
pkgs.dbk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index a840d4b..c974e4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
* add css and images for HTML documents, borrowed from debian reference.
(Closes: #780787)
* not say "security NMU" but just say "upload" (Closes: #784244)
+ * just say wheezy as "Debian 7", instead of "7.0" (Closes: #784248)
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
diff --git a/pkgs.dbk b/pkgs.dbk
index 0237819..1db832d 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -2157,7 +2157,7 @@ this, a version of the form
<literal>+deb<replaceable>X</replaceable>u<replaceable>Y</replaceable></literal>
should be used, where <replaceable>X</replaceable> is the major release number,
and <replaceable>Y</replaceable> is a counter starting at <literal>1</literal>.
-For example, while Wheezy (Debian 7.0) is stable, a security upload to stable for
+For example, while Wheezy (Debian 7) is stable, a security NMU to stable for
a package at version <literal>1.5-3</literal> would have version
<literal>1.5-3+deb7u1</literal>, whereas a security upload to Jessie would get
version <literal>1.5-3+deb8u1</literal>.
--
2.1.4
>From 7037c21b4b0284e52baa9405a36ac0212e3132a4 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:42:56 +0900
Subject: [PATCH 4/8] add changelog entry for Bug#761005
---
debian/changelog | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c974e4c..3fda741 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
(Closes: #780787)
* not say "security NMU" but just say "upload" (Closes: #784244)
* just say wheezy as "Debian 7", instead of "7.0" (Closes: #784248)
+ * update README-Contrib (svn to git) by Charles Plessy <plessy@debian.org>
+ (Closes: #761005)
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
--
2.1.4
>From 3405745f899e1ba8e700334cd4bbde20a1d8cd83 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:43:24 +0900
Subject: [PATCH 5/8] fix Bug#780243
---
debian/changelog | 3 +++
pkgs.dbk | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3fda741..9114343 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
* just say wheezy as "Debian 7", instead of "7.0" (Closes: #784248)
* update README-Contrib (svn to git) by Charles Plessy <plessy@debian.org>
(Closes: #761005)
+ * suggest to use codename for the upload target distribution for
+ testing-proposed-update.
+ Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #780243)
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
diff --git a/pkgs.dbk b/pkgs.dbk
index 1db832d..d58222b 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -2770,8 +2770,9 @@ Make sure that you included an appropriate explanation in the changelog;
</listitem>
<listitem>
<para>
-Make sure that you've written <literal>testing</literal> or
-<literal>testing-proposed-updates</literal> into your target distribution;
+Make sure that you've written the testing
+<link linkend="codenames">code name</link> (e.g. <literal>jessie</literal>)
+into your target distribution;
</para>
</listitem>
<listitem>
--
2.1.4
>From 179ee92ada1ff6f49ca32759abbf57aab167b83b Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:43:40 +0900
Subject: [PATCH 6/8] fix Bug#768426
---
debian/changelog | 2 ++
pkgs.dbk | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9114343..ead5b46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
* suggest to use codename for the upload target distribution for
testing-proposed-update.
Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #780243)
+ * suggest to use "<codename><n> version" scheme.
+ Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #768426)
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
diff --git a/pkgs.dbk b/pkgs.dbk
index d58222b..c97bf4e 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -2741,11 +2741,11 @@ updates through <literal>unstable</literal> are possible, if the upload via
<literal>unstable</literal> does not pull in any new dependencies.
</para>
<para>
-Version numbers are usually selected by adding the codename of the
-<literal>testing</literal> distribution and a running number, like
-<literal>1.2squeeze1</literal> for the first upload through
-<literal>testing-proposed-updates</literal> of package version
-<literal>1.2</literal>.
+Version numbers are usually selected by appending
+<literal>+deb</literal><replaceable>X</replaceable><literal>uY</literal>,
+where <replaceable>X</replaceable> is the major release number of Debian and
+<replaceable>Y</replaceable> is a counter starting at <literal>1</literal>.
+e.g. <literal>1:2.4.3-4+deb8u1</literal>.
</para>
<para>
Please make sure you didn't miss any of these items in your upload:
--
2.1.4
>From 5fb74f85857ddd0494a232a7cb756339c9db28b4 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:44:02 +0900
Subject: [PATCH 7/8] adjust codename and release number
---
debian/changelog | 1 +
pkgs.dbk | 4 ++--
resources.dbk | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ead5b46..8e9a272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #780243)
* suggest to use "<codename><n> version" scheme.
Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #768426)
+ * adjust release codename and version number.
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
diff --git a/pkgs.dbk b/pkgs.dbk
index c97bf4e..457619d 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -1124,7 +1124,7 @@ Be sure to verify the following items:
<emphasis role="strong">Target the right distribution</emphasis>
in your <filename>debian/changelog</filename>:
<replaceable>codename</replaceable><literal>-security</literal>
-(e.g. <literal>wheezy-security</literal>).
+(e.g. <literal>jessie-security</literal>).
Do not target <replaceable>distribution</replaceable><literal>-proposed-updates</literal> or
<literal>stable</literal>!
</para>
@@ -1155,7 +1155,7 @@ you have already used for a previous upload, or one that conflicts with a
binNMU. The convention is to append
<literal>+deb</literal><replaceable>X</replaceable><literal>u1</literal> (where
<replaceable>X</replaceable> is the major release number), e.g.
-<literal>1:2.4.3-4+deb7u1</literal>, of course increasing 1 for any subsequent
+<literal>1:2.4.3-4+deb8u1</literal>, of course increasing 1 for any subsequent
uploads.
</para>
</listitem>
diff --git a/resources.dbk b/resources.dbk
index 4fa5909..4b939e6 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -771,8 +771,10 @@ Debian 1.3, <literal>bo</literal>; Debian 2.0, <literal>hamm</literal>;
Debian 2.1, <literal>slink</literal>; Debian 2.2, <literal>potato</literal>;
Debian 3.0, <literal>woody</literal>; Debian 3.1, <literal>sarge</literal>;
Debian 4.0, <literal>etch</literal>; Debian 5.0, <literal>lenny</literal>;
-Debian 6.0, <literal>squeeze</literal>; Debian 7.0, <literal>wheezy</literal>;
-and the next release will be called <literal>jessie</literal>.
+Debian 6.0, <literal>squeeze</literal>; Debian 7, <literal>wheezy</literal>;
+Debian 8, <literal>jessie</literal>;
+the next release Debian 9 will be called <literal>stretch</literal>
+and Debian 10 will be called <literal>buster</literal>.
There is also a ``pseudo-distribution'', called
<literal>sid</literal>, which is the current <literal>unstable</literal>
distribution; since packages are moved from <literal>unstable</literal> to
--
2.1.4
>From fdfd7d687ee8518d805339203ab3625b1ea2bb09 Mon Sep 17 00:00:00 2001
From: Hideki Yamane <henrich@debian.org>
Date: Thu, 28 May 2015 21:46:04 +0900
Subject: [PATCH 8/8] fix Bug#738566
---
Makefile | 2 +-
debian/changelog | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index c8b96a0..63730d3 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ developers-reference.pdf: $(CURDIR)/developers-reference.pdf
developers-reference.epub: $(CURDIR)/developers-reference.epub
%/developers-reference.epub: $(addprefix %/,$(SOURCES))
- TOP=`pwd` && cd $(@D) && xmlto epub index.dbk && mv index.epub $(@F)
+ TOP=`pwd` && cd $(@D) && LC_ALL=C.UTF-8 xmlto epub index.dbk && mv index.epub $(@F)
.PHONY: pot
pot: po4a/po/developers-reference.pot
diff --git a/debian/changelog b/debian/changelog
index 8e9a272..bfeec15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-developers-reference (3.4.15) UNRELEASED; urgency=medium
+developers-reference (3.4.15+nmu1) UNRELEASED; urgency=medium
[ Raphaël Hertzog ]
* Drop myself from Uploaders.
@@ -16,8 +16,9 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
* suggest to use "<codename><n> version" scheme.
Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #768426)
* adjust release codename and version number.
+ * fix wrong encoding in epub (Closes: #738566)
- -- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
+ -- Hideki Yamane <henrich@debian.org> Thu, 28 May 2015 21:45:13 +0900
developers-reference (3.4.14) unstable; urgency=medium
--
2.1.4
Reply to: