Bug#925479: unblock: debian-reference/2.76
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package debian-reference
(explain the reason for the unblock here)
debian-reference (2.76) unstable; urgency=medium
* Complete translation for de, it, ja, pt, and zh-cn.
Closes: #924863
* Update filepath to comply with doc-base CGI script restrictions.
Closes: #900360, #924686
* Add lintian override for missing-depends-on-sensible-utils,
* Update package and popcon data entity.
* Ready for buster release by setting buster as stable release.
-- Osamu Aoki <osamu@debian.org> Thu, 21 Mar 2019 23:23:38 +0900
By uploading this to unstable, www.debian.org pages of this document
start stating buster=stable. :-)
(include/attach the debdiff against the package in testing)
This package build in 2 steps.
1. manual build with downloading popcondata etc to make debian-reference.raw.xml
asciidoc/* used and *.ent updated
2. normal package build with package build script with po for
translation.
Thus following directory is excluded for debdiff for readability
po: excluded since trasnslation diff
asciidoc: excluded since this is used to create debian-reference.raw.xml
*.ent: excluded since update of pocon is not interesting diff
(There are some diffs due to wrap-and-sort)
$ debdiff --exclude po --exclude *.ent --exclude asciidoc debian-reference_2.75.dsc debian-reference_2.76.dsc >debian-reference_2.76.diff
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/bin/replace_package debian-reference-2.76/bin/replace_package
--- debian-reference-2.75/bin/replace_package 2018-07-02 00:49:45.000000000 +0900
+++ debian-reference-2.76/bin/replace_package 2019-03-21 23:23:38.000000000 +0900
@@ -1,5 +1,5 @@
# This is autogenerated by Makefile. Update this with "make rawxml"
s/@emacs@/emacs25/g
-s/@libpoppler@/libpoppler74/g
+s/@libpoppler@/libpoppler82/g
s/@libgstreamer@/libgstreamer1.0-0/g
s/@libphonon@/libphonon4/g
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian/all.doc-base-in debian-reference-2.76/debian/all.doc-base-in
--- debian-reference-2.75/debian/all.doc-base-in 2017-09-19 20:53:04.000000000 +0900
+++ debian-reference-2.76/debian/all.doc-base-in 2019-03-21 23:23:38.000000000 +0900
@@ -6,9 +6,12 @@
Section: Debian
Format: text
-Files: /usr/share/debian-reference/debian-reference.@@.txt.gz
+Files: /usr/share/doc/debian-reference-@@/docs/debian-reference.@@.txt.gz
+
+Format: PDF
+Files: /usr/share/doc/debian-reference-@@/docs/debian-reference.@@.pdf
Format: HTML
-Index: /usr/share/debian-reference/index.@@.html
-Files: /usr/share/debian-reference/*.@@.html
+Index: /usr/share/doc/debian-reference-@@/docs/index.@@.html
+Files: /usr/share/doc/debian-reference-@@/docs/*.@@.html
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian/all.lintian-overrides-in debian-reference-2.76/debian/all.lintian-overrides-in
--- debian-reference-2.75/debian/all.lintian-overrides-in 1970-01-01 09:00:00.000000000 +0900
+++ debian-reference-2.76/debian/all.lintian-overrides-in 2019-03-21 23:23:38.000000000 +0900
@@ -0,0 +1,4 @@
+debian-reference-@@: missing-depends-on-sensible-utils usr/share/debian-reference/pr01.@@.html
+debian-reference-@@: missing-depends-on-sensible-utils usr/share/debian-reference/ch02.@@.html
+debian-reference-@@: missing-depends-on-sensible-utils usr/share/debian-reference/ch09.@@.html
+
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian/changelog debian-reference-2.76/debian/changelog
--- debian-reference-2.75/debian/changelog 2019-03-10 22:27:19.000000000 +0900
+++ debian-reference-2.76/debian/changelog 2019-03-21 23:23:38.000000000 +0900
@@ -1,3 +1,15 @@
+debian-reference (2.76) unstable; urgency=medium
+
+ * Complete translation for de, it, ja, pt, and zh-cn.
+ Closes: #924863
+ * Update filepath to comply with doc-base CGI script restrictions.
+ Closes: #900360, #924686
+ * Add lintian override for missing-depends-on-sensible-utils,
+ * Update package and popcon data entity.
+ * Ready for buster release by setting buster as stable release.
+
+ -- Osamu Aoki <osamu@debian.org> Thu, 21 Mar 2019 23:23:38 +0900
+
debian-reference (2.75) unstable; urgency=medium
[ Holger Wansing ]
@@ -5,7 +17,7 @@
[ Osamu Aoki ]
* Fixed broken symlink (in 2.74/unstable). Closes: #910153
- * Fixed DEB_BUILD_OPTIONS. Closes: #907779
+ * Fixed DEB_BUILD_OPTIONS. Closes: #907779
-- Osamu Aoki <osamu@debian.org> Sun, 10 Mar 2019 22:27:19 +0900
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian/control debian-reference-2.76/debian/control
--- debian-reference-2.75/debian/control 2018-07-10 00:43:58.000000000 +0900
+++ debian-reference-2.76/debian/control 2019-03-21 23:23:38.000000000 +0900
@@ -6,10 +6,10 @@
Build-Depends-Indep: dblatex,
docbook-xml,
docbook-xsl,
- libopencc2-data,
fonts-liberation2,
fonts-vlgothic,
fonts-wqy-microhei,
+ libopencc2-data,
libxml2-utils,
locales-all | locales,
opencc,
@@ -46,11 +46,11 @@
Package: debian-reference
Architecture: all
Depends: debian-reference-en, ${misc:Depends}
-Recommends: debian-reference-fr,
+Recommends: debian-reference-de,
+ debian-reference-es,
+ debian-reference-fr,
debian-reference-it,
debian-reference-ja,
- debian-reference-es,
- debian-reference-de,
debian-reference-pt,
debian-reference-zh-cn,
debian-reference-zh-tw
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian/debian-reference-common.lintian-overrides debian-reference-2.76/debian/debian-reference-common.lintian-overrides
--- debian-reference-2.75/debian/debian-reference-common.lintian-overrides 1970-01-01 09:00:00.000000000 +0900
+++ debian-reference-2.76/debian/debian-reference-common.lintian-overrides 2019-03-21 23:23:38.000000000 +0900
@@ -0,0 +1 @@
+debian-reference-common: missing-depends-on-sensible-utils usr/bin/debian-reference
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian/rules debian-reference-2.76/debian/rules
--- debian-reference-2.75/debian/rules 2018-07-02 00:53:03.000000000 +0900
+++ debian-reference-2.76/debian/rules 2019-03-21 23:23:38.000000000 +0900
@@ -53,9 +53,10 @@
id) LANGX="Bahasa Indonesia" ;; \
*) LANGX="$$x" ;; \
esac ; \
- sed -e "s/@@/$$XX/" < all.links-in >$(MANUAL)-$${XX}.links ; \
- sed -e "s/@@/$$XX/" < all.install-in >$(MANUAL)-$${XX}.install ; \
- sed -e "s/@@/$$XX/" -e "s/@LANG@/$$LANGX/" < all.doc-base-in >$(MANUAL)-$${XX}.doc-base ; \
+ sed -e "s/@@/$$XX/g" < all.links-in >$(MANUAL)-$${XX}.links ; \
+ sed -e "s/@@/$$XX/g" < all.install-in >$(MANUAL)-$${XX}.install ; \
+ sed -e "s/@@/$$XX/g" -e "s/@LANG@/$$LANGX/g" < all.doc-base-in >$(MANUAL)-$${XX}.doc-base ; \
+ sed -e "s/@@/$$XX/g" < all.lintian-overrides-in >$(MANUAL)-$${XX}.lintian-overrides ; \
done
dh_auto_build $(BUILDOPT) -- \
"LANGALL=$(LANGALL)" \
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/debian-reference.raw.xml debian-reference-2.76/debian-reference.raw.xml
--- debian-reference-2.75/debian-reference.raw.xml 2018-07-02 00:49:52.000000000 +0900
+++ debian-reference-2.76/debian-reference.raw.xml 2019-03-21 23:23:38.000000000 +0900
@@ -8097,7 +8097,7 @@
<section id="_rescue_with_the_dpkg_command">
<title>Rescue with the dpkg command</title>
<para>Since <literal>dpkg</literal> is very low level package tool, it can function under the very bad situation such as unbootable system without network connection. Let's assume <literal>foo</literal> package was broken and needs to be replaced.</para>
- <para>You may still find cached copies of older bug free version of <literal>foo</literal> package in the package cache directory: "<literal>/var/cache/apt/archives/</literal>". (If not, you can download it from archive of <ulink url="http://snapshot.debian.org/";>http://snapshot.debian.org/</ulink> or copy it from package cache of a functioning machine.)</para>
+ <para>You may still find cached copies of older bug free version of <literal>foo</literal> package in the package cache directory: "<literal>/var/cache/apt/archives/</literal>". (If not, you can download it from archive of <ulink url="https://snapshot.debian.org/";>https://snapshot.debian.org/</ulink> or copy it from package cache of a functioning machine.)</para>
<para>If you can boot the system, you may install it by the following command.</para>
<screen># dpkg -i /path/to/foo_<old_version>_<arch>.deb</screen>
<tip>
@@ -8607,7 +8607,7 @@
<screen># apt-get update
# apt-get dist-upgrade
# apt-get install fakeroot devscripts build-essential
-$ apt-get build-dep foo
+# apt-get build-dep foo
$ apt-get source foo
$ cd foo*</screen>
<para>Update some tool chain packages such as <literal>dpkg</literal>, and <literal>debhelper</literal> from the
@@ -15319,23 +15319,6 @@
Flash plugin helper to install Adobe Flash Player (i386, amd64 only)
</entry>
</row>
- <row>
- <entry>
- <literal>browser-plugin-vlc</literal>
- </entry>
- <entry>
- @-@popcon1@-@
- </entry>
- <entry>
- @-@psize1@-@
- </entry>
- <entry>
- main
- </entry>
- <entry>
- Multimedia plugin based on <ulink url="https://en.wikipedia.org/wiki/VLC_media_player";>VLC media player</ulink>
- </entry>
- </row>
</tbody>
</tgroup>
</table>
@@ -16461,7 +16444,7 @@
</row>
<row>
<entry>
- <literal>getmail4</literal>
+ <literal>getmail</literal>
</entry>
<entry>
@-@popcon1@-@
@@ -22593,20 +22576,6 @@
</row>
<row>
<entry>
- <literal>apmd</literal>
- </entry>
- <entry>
- @-@popcon1@-@
- </entry>
- <entry>
- @-@psize1@-@
- </entry>
- <entry>
- daemon to manage events delivered by the Advanced Power Management (APM)
- </entry>
- </row>
- <row>
- <entry>
<literal>sleepd</literal>
</entry>
<entry>
@@ -28479,7 +28448,7 @@
</row>
<row>
<entry>
- <literal>imediff2</literal>
+ <literal>imediff</literal>
</entry>
<entry>
@-@popcon1@-@
@@ -28487,10 +28456,10 @@
<entry>
@-@psize1@-@
</entry>
- <entry><citerefentry><refentrytitle>imediff2</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+ <entry><citerefentry><refentrytitle>imediff</refentrytitle><manvolnum>1</manvolnum></citerefentry>
</entry>
<entry>
- interactive full screen 2-way merge tool
+ interactive full screen 2/3-way merge tool
</entry>
</row>
<row>
@@ -31980,7 +31949,7 @@
</row>
<row>
<entry>
- <literal>libpoppler74</literal>
+ <literal>libpoppler82</literal>
</entry>
<entry>
@-@popcon1@-@
@@ -34948,7 +34917,7 @@
<para>Bump package version to one which does not collide with official Debian versions, e.g. one appended with "<literal>+debug1</literal>" when recompiling existing package version, or one appended with "<literal>~pre1</literal>" when compiling unreleased package version by the following.</para>
<screen>$ dch -i</screen>
<para>Compile and install packages with debug symbols by the following.</para>
- <screen>$ export DEB_BUILD_OPTIONS=nostrip,noopt
+ <screen>$ export DEB_BUILD_OPTIONS="nostrip noopt"
$ debuild
$ cd ..
$ sudo debi package_name*.changes</screen>
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/Makefile debian-reference-2.76/Makefile
--- debian-reference-2.75/Makefile 2018-07-02 00:42:34.000000000 +0900
+++ debian-reference-2.76/Makefile 2019-03-21 23:23:38.000000000 +0900
@@ -21,10 +21,10 @@
# from stable -> testing just after stable release
# This is normal
-RELEASE_STATE := testing
+#RELEASE_STATE := testing
# this is just before freeze
-#RELEASE_STATE := stable
+RELEASE_STATE := stable
# TMP_DIR_DR is not mean to be set to generic TMPDIR like /tmp ~/.tmp
ifndef TMP_DIR_DR
@@ -243,8 +243,8 @@
echo "<!ENTITY Codename-stable \"Buster\">" >> common.ent
echo "<!ENTITY codename-testing \"bullseye\">" >> common.ent
echo "<!ENTITY Codename-testing \"Bullseye\">" >> common.ent
- echo "<!ENTITY codename-nexttesting \"bullseye+1\">" >> common.ent
- echo "<!ENTITY Codename-nexttesting \"Bullseye+1\">" >> common.ent
+ echo "<!ENTITY codename-nexttesting \"bookworm\">" >> common.ent
+ echo "<!ENTITY Codename-nexttesting \"Bookworm\">" >> common.ent
else
# Live with 2 year testing release from sid/unstable
echo "<!ENTITY codename-stable \"stretch\">" >> common.ent
diff -Nru --exclude po --exclude '*.ent' --exclude asciidoc debian-reference-2.75/README.md debian-reference-2.76/README.md
--- debian-reference-2.75/README.md 2018-03-11 22:25:37.000000000 +0900
+++ debian-reference-2.76/README.md 2019-03-18 10:39:53.000000000 +0900
@@ -87,6 +87,9 @@
### Updating the repository
+If you are updating the English content in asciidoc/*, please make sure to
+update debian-reference.raw.xml and commit it.
+
If you are updating the translation only, please only commit the updated
`po/*.po` to the `master` branch. I mean no commit of `po/templates.pot`,
`*.xml`, `*.ent`, and `asciidoc/*.txt` files. In other word, please don't use
@@ -121,6 +124,9 @@
$ git push origin :wip-foo-guest
```
+You can avoid using local branch as above if you use `git stash` and `git
+stash pop`.
+
Any missing PO strings of `zh-tw`/`zh-cn` are temporarily auto converted from
the existing `zh-cn`/`zh-tw` PO strings during the build time. So you may
find non-optimal translation strings not-found in the source tree to show up
@@ -229,6 +235,7 @@
test it first by generating HTML files only:
```
+ $ make debian-reference.raw.xml
$ make test "LANGPO="
```
@@ -238,6 +245,8 @@
```
$ make clean
$ git add asciidoc/*.txt
+ $ git add debian-reference.raw.xml
+ $ git add bin/replace_package
$ git commit -m "Updated ...."
$ make wrap; make po; make clean
$ git commit -a -m "make po"
unblock debian-reference/2.76
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (500, 'testing'), (10, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Reply to: