Bug#688819: unblock: debian-edu-doc/1.4~20120925~6.0.6+r0
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package debian-edu-doc
It fixes a serious mess of the “symlink replaced by directory”-kind
(#688707). It also update the doc (and its translation in a trivial
way). The updated XML file is part of the attached diff, not the PO
and POT files to avoid seeing the same noise multiple times.
unblock debian-edu-doc/1.4~20120925~6.0.6+r0
Thanks in advance, regards.
David
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.5-trunk-amd64 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diffstat for debian-edu-doc-1.4~20120808~6.0.5+r0 debian-edu-doc-1.4~20120925~6.0.6+r0
debian/changelog | 9 +++++++
debian/debian-edu-doc-es.preinst | 12 ++++++++++
debian/debian-edu-doc-fr.preinst | 12 ++++++++++
debian/debian-edu-doc-it.preinst | 12 ++++++++++
documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml | 8 +++---
documentation/debian-edu-squeeze/images/de/worldmap.png |binary
documentation/debian-edu-squeeze/images/es/worldmap.png |binary
documentation/debian-edu-squeeze/images/fr/worldmap.png |binary
documentation/debian-edu-squeeze/images/worldmap.png |binary
9 files changed, 49 insertions(+), 4 deletions(-)
diff -Nru --exclude '*.po' --exclude '*.pot' debian-edu-doc-1.4~20120808~6.0.5+r0/debian/changelog debian-edu-doc-1.4~20120925~6.0.6+r0/debian/changelog
--- debian-edu-doc-1.4~20120808~6.0.5+r0/debian/changelog 2012-08-08 20:19:54.000000000 +0200
+++ debian-edu-doc-1.4~20120925~6.0.6+r0/debian/changelog 2012-09-25 23:17:01.000000000 +0200
@@ -1,3 +1,12 @@
+debian-edu-doc (1.4~20120925~6.0.6+r0) unstable; urgency=low
+
+ * debian/debian-edu-doc-{es,fr,it}.preinst: Remove previous images symlinks
+ on Squeeze → Wheezy upgrade (other languages are not affected).
+ Closes: #688707
+ * Update manuals and images from the wiki.
+
+ -- David Prévot <taffit@debian.org> Tue, 25 Sep 2012 17:14:44 -0400
+
debian-edu-doc (1.4~20120808~6.0.5+r0) unstable; urgency=low
[ Updated squeeze manual translations ]
diff -Nru --exclude '*.po' --exclude '*.pot' debian-edu-doc-1.4~20120808~6.0.5+r0/debian/debian-edu-doc-es.preinst debian-edu-doc-1.4~20120925~6.0.6+r0/debian/debian-edu-doc-es.preinst
--- debian-edu-doc-1.4~20120808~6.0.5+r0/debian/debian-edu-doc-es.preinst 1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-doc-1.4~20120925~6.0.6+r0/debian/debian-edu-doc-es.preinst 2012-09-25 04:26:04.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Delete symlink that will be replaced by a directory
+docdir="/usr/share/doc/debian-edu-doc-es/images"
+if [ -L $docdir ]; then
+ rm $docdir 2>/dev/null
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru --exclude '*.po' --exclude '*.pot' debian-edu-doc-1.4~20120808~6.0.5+r0/debian/debian-edu-doc-fr.preinst debian-edu-doc-1.4~20120925~6.0.6+r0/debian/debian-edu-doc-fr.preinst
--- debian-edu-doc-1.4~20120808~6.0.5+r0/debian/debian-edu-doc-fr.preinst 1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-doc-1.4~20120925~6.0.6+r0/debian/debian-edu-doc-fr.preinst 2012-09-25 04:26:04.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Delete symlink that will be replaced by a directory
+docdir="/usr/share/doc/debian-edu-doc-fr/images"
+if [ -L $docdir ]; then
+ rm $docdir 2>/dev/null
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru --exclude '*.po' --exclude '*.pot' debian-edu-doc-1.4~20120808~6.0.5+r0/debian/debian-edu-doc-it.preinst debian-edu-doc-1.4~20120925~6.0.6+r0/debian/debian-edu-doc-it.preinst
--- debian-edu-doc-1.4~20120808~6.0.5+r0/debian/debian-edu-doc-it.preinst 1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-doc-1.4~20120925~6.0.6+r0/debian/debian-edu-doc-it.preinst 2012-09-25 04:26:04.000000000 +0200
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+# Delete symlink that will be replaced by a directory
+docdir="/usr/share/doc/debian-edu-doc-it/images"
+if [ -L $docdir ]; then
+ rm $docdir 2>/dev/null
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru --exclude '*.po' --exclude '*.pot' debian-edu-doc-1.4~20120808~6.0.5+r0/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml debian-edu-doc-1.4~20120925~6.0.6+r0/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml
--- debian-edu-doc-1.4~20120808~6.0.5+r0/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml 2012-07-25 23:08:00.000000000 +0200
+++ debian-edu-doc-1.4~20120925~6.0.6+r0/documentation/debian-edu-squeeze/debian-edu-squeeze-manual.xml 2012-09-25 04:43:31.000000000 +0200
@@ -1861,22 +1861,22 @@
<section id="Desktop--Playing_DVDs">
<title>Playing DVDs
</title>
-<para>libdvdcss is needed for playing most commercial DVDs. For legal reasons it's not included in Debian (Edu). If you are legally allowed to use it, you can use the packages from debian-multimedia.org. Add the multimedia repository (as described in the following section) and install the required libraries:
+<para>libdvdcss is needed for playing most commercial DVDs. For legal reasons it's not included in Debian (Edu). If you are legally allowed to use it, you can use the packages from deb-multimedia.org. Add the multimedia repository (as described in the following section) and install the required libraries:
</para><screen><![CDATA[apt-get install libdvdcss2 w32codecs]]></screen>
</section>
<section id="Desktop--Using_the_multimedia_repository">
<title>Using the multimedia repository
</title>
-<para>To use www.debian-multimedia.org do the following:
+<para>To use www.deb-multimedia.org do the following:
</para><screen><![CDATA[# install the debian-keyring securely:
apt-get install debian-keyring
-# fetch the debian-multimedia key insecurely:
+# fetch the deb-multimedia key insecurely:
gpg --keyserver pgpkeys.pca.dfn.de --recv-keys 1F41B907
# check securely if the key is correct and add it to the keyring used by APT if it is:
gpg --keyring /usr/share/keyrings/debian-keyring.gpg --check-sigs 1F41B907 && gpg --export 1F41B907 | apt-key add -
# add repository to sources.list - please check the homepages for mirrors!
-echo "deb http://debian-multimedia.org squeeze main" >> /etc/apt/sources.list
+echo "deb http://deb-multimedia.org squeeze main" >> /etc/apt/sources.list
# update the list of available packages:
apt-get update]]></screen>
</section>
Binary files /tmp/XuxOisNMRd/debian-edu-doc-1.4~20120808~6.0.5+r0/documentation/debian-edu-squeeze/images/de/worldmap.png and /tmp/OF2JNKIIev/debian-edu-doc-1.4~20120925~6.0.6+r0/documentation/debian-edu-squeeze/images/de/worldmap.png differ
Binary files /tmp/XuxOisNMRd/debian-edu-doc-1.4~20120808~6.0.5+r0/documentation/debian-edu-squeeze/images/es/worldmap.png and /tmp/OF2JNKIIev/debian-edu-doc-1.4~20120925~6.0.6+r0/documentation/debian-edu-squeeze/images/es/worldmap.png differ
Binary files /tmp/XuxOisNMRd/debian-edu-doc-1.4~20120808~6.0.5+r0/documentation/debian-edu-squeeze/images/fr/worldmap.png and /tmp/OF2JNKIIev/debian-edu-doc-1.4~20120925~6.0.6+r0/documentation/debian-edu-squeeze/images/fr/worldmap.png differ
Binary files /tmp/XuxOisNMRd/debian-edu-doc-1.4~20120808~6.0.5+r0/documentation/debian-edu-squeeze/images/worldmap.png and /tmp/OF2JNKIIev/debian-edu-doc-1.4~20120925~6.0.6+r0/documentation/debian-edu-squeeze/images/worldmap.png differ
Reply to: