Your message dated Wed, 03 Dec 2014 22:37:06 +0000
with message-id <[email protected]>
and subject line Re: Bug#771442: unblock:
debian-edu-doc/1.6~20141203~8.0+edu0~alpha1 (pre-approval)
has caused the Debian Bug report #771442,
regarding unblock: debian-edu-doc/1.6~20141203~8.0+edu0~alpha1 (pre-approval)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
771442: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771442
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
x-debbugs-cc: [email protected]
Hi,
this is a pre-approval unblock request for debian-edu-doc
1.6~20141203~8.0+edu0~alpha1 which fixes one important bug (#768439, breaking
navigation in the manual) plus 3 normal bugs related to the handling of
images in the localized manual variants as well as content and translation
updates.
I plan to upload debian-edu-doc to unstable on the 3rd of December and don't
expect any further changes to the above with the exception of (maybe) content,
translation and image updates - IOW the filterdiffed output will stay the
same :)
debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) UNRELEASED; urgency=medium
[ Wolfgang Schweer ]
* documentation/scripts/get_manual: Extend regex to replace all occurrences
of '~' (and not just '~alpha') in XML section ids with '+', so that PDF
generation succeeds. (Closes: #768439).
* Makefile.common:
- Enable EPUB generation for default language en. (Closes: #771174).
- Store images in manual specific directories instead of a common one to
avoid linking to wrong images for the jessie and wheezy HTML manuals.
(Closes: #771345).
- If available use language specific images in EPUB manuals instead of
default (en) ones. (Closes: #771435).
* Update manuals and images from the wiki.
* (it) Fix typos in wheezy and jessie manual translations.
* (en, de, fr) Update jessie network architecture images.
[ Jessie Manual translation updates ]
* German (Wolfgang Schweer)
* Dutch (Frans Spiesschaert) (Closes: #771231)
[ Wheezy Manual translation updates ]
* German (Wolfgang Schweer)
* Dutch (Frans Spiesschaert)
-- Wolfgang Schweer <[email protected]> Mon, 17 Nov 2014 15:18:02 +0100
$ git diff 1.6_20141026_8.0+edu0_alpha0..master|filterdiff -x "*.po" -x "*.pot"
-x "*.xml" --clean|diffstat
debian/changelog | 27 +++++++++++++++++++++++++++
documentation/common/Makefile.common | 31 ++++++++++++++++++++++++-------
documentation/scripts/get_manual | 2 +-
3 files changed, 52 insertions(+), 8 deletions(-)
$ git diff 1.6_20141026_8.0+edu0_alpha0..master|filterdiff -x "*.po" -x "*.pot"
-x "*.xml" --clean > debian-edu-doc.filterdiff
# file attached
# these changes steam from these four commits:
$ ( for i in 586948aa9645c9be875c3f600a9cbe21a0fa0c7e
f5397bc9790b70c5ed703e8f6233689fee697e18
c82b8008d871a562f6bf6d0ea1929ebe83962f10
d3b61f0fad52e203eb6a7f1d6b7f1b83ae8e39c3 ; do git show $i ; done ) >
debian-edu-doc.4commits.diff
# file attached
$ git diff 1.6_20141026_8.0+edu0_alpha0..master|diffstat
/dev/null
|binary
b/debian/changelog
| 27
b/documentation/audacity/audacity-manual.fr.po
| 2
b/documentation/audacity/audacity-manual.nl.po
| 2
b/documentation/audacity/audacity-manual.pot
| 2
b/documentation/common/Makefile.common
| 31
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.da.po
| 345 +++
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.de.po
| 763 ++------
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.es.po
| 309 ++-
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.fr.po
| 345 +++
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.it.po
| 343 +++
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nb.po
| 919 ++++++----
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.nl.po
| 657 +++++--
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.pot
| 192 +-
b/documentation/debian-edu-jessie/debian-edu-jessie-manual.xml
| 100 -
b/documentation/debian-edu-jessie/images/Debian_Edu_Network_Jessie.png
|binary
b/documentation/debian-edu-jessie/images/de/Debian_Edu_Network_Jessie.png
|binary
b/documentation/debian-edu-jessie/images/de/worldmap.png
|binary
b/documentation/debian-edu-jessie/images/es/worldmap.png
|binary
b/documentation/debian-edu-jessie/images/fr/Debian_Edu_Network_Jessie.png
|binary
b/documentation/debian-edu-jessie/images/fr/worldmap.png
|binary
b/documentation/debian-edu-jessie/images/source/Debian_Edu_Network_Jessie.odg
|binary
b/documentation/debian-edu-jessie/images/worldmap.png
|binary
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.da.po
| 15
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.de.po
| 14
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.es.po
| 15
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.fr.po
| 15
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.it.po
| 17
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nb.po
| 580 ++++--
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.nl.po
| 287 +--
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.pot
| 8
b/documentation/debian-edu-wheezy/debian-edu-wheezy-manual.xml
| 2
b/documentation/debian-edu-wheezy/images/de/worldmap.png
|binary
b/documentation/debian-edu-wheezy/images/es/worldmap.png
|binary
b/documentation/debian-edu-wheezy/images/fr/worldmap.png
|binary
b/documentation/debian-edu-wheezy/images/worldmap.png
|binary
b/documentation/rosegarden/rosegarden-manual.es.po
| 2
b/documentation/rosegarden/rosegarden-manual.fr.po
| 2
b/documentation/rosegarden/rosegarden-manual.nb.po
| 2
b/documentation/rosegarden/rosegarden-manual.nl.po
| 2
b/documentation/rosegarden/rosegarden-manual.pot
| 2
b/documentation/scripts/get_manual
| 2
42 files changed, 3350 insertions(+), 1652 deletions(-)
Thanks for your work on jessie!
cheers,
Holger
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+debian-edu-doc (1.6~20141203~8.0+edu0~alpha1) UNRELEASED; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * documentation/scripts/get_manual: Extend regex to replace all occurrences
+ of '~' (and not just '~alpha') in XML section ids with '+', so that PDF
+ generation succeeds. (Closes: #768439).
+ * Makefile.common:
+ - Enable EPUB generation for default language en. (Closes: #771174).
+ - Store images in manual specific directories instead of a common one to
+ avoid linking to wrong images for the jessie and wheezy HTML manuals.
+ (Closes: #771345).
+ - If available use language specific images in EPUB manuals instead of
+ default (en) ones. (Closes: #771435).
+ * Update manuals and images from the wiki.
+ * (it) Fix typos in wheezy and jessie manual translations.
+ * (en, de, fr) Update jessie network architecture images.
+
+ [ Jessie Manual translation updates ]
+ * German (Wolfgang Schweer)
+ * Dutch (Frans Spiesschaert) (Closes: #771231)
+
+ [ Wheezy Manual translation updates ]
+ * German (Wolfgang Schweer)
+ * Dutch (Frans Spiesschaert)
+
+ -- Wolfgang Schweer <[email protected]> Mon, 17 Nov 2014 15:18:02 +0100
+
debian-edu-doc (1.6~20141026~8.0+edu0~alpha0) unstable; urgency=medium
* Update manuals and images from the wiki.
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -51,10 +51,22 @@ build-html:
sed -i "s/href=\"index.html/href=\"$(name).$$f.html/g" $(name).$$f.html ; \
done
build-epub:
+ # build the English EPUB version
+ echo "Creating epub for en"
+ $(DBTOEPUB) $(name).xml
+ # build all other EPUB versions
-for LINGUA in $(LANGUAGES) ; do \
echo "Creating epub for $$LINGUA"; \
po4a --translate-only $(name).$$LINGUA.xml po4a.cfg ; \
+ mkdir images-tmp ; \
+ cp images/*.* images-tmp/ ; \
+ if [ -e images/$$LINGUA ] ; then \
+ cp -v images/$$LINGUA/*.* images-tmp/ ; \
+ fi ; \
+ sed -i "s#./images#./images-tmp#g" $(name).$$LINGUA.xml ; \
$(DBTOEPUB) $(name).$$LINGUA.xml ; \
+ sed -i "s#./images-tmp#./images/#g" $(name).$$LINGUA.xml ; \
+ rm -rf images-tmp/ ; \
done
else
build-html:
@@ -95,16 +107,17 @@ install: build
if [ -e $(name).$$f.html ] ; then \
cp $(name).$$f.html $$LANGPATH/$(name).html ; \
sed -i "s/href=\"$(name).$$f.html/href=\"$(name).html/g" $$LANGPATH/$(name).html ; \
+ sed -i "s#./images#./$(name)-images#g" $$LANGPATH/$(name).html ; \
if [ "$$f" = "en" ] ; then \
for i in images/*.png ; \
do convert -units PixelsPerCentimeter -density 42x42 $$i $${i%.png}.pdf ; \
done ; \
- mkdir -p $$LANGPATH/images/ ; \
- find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/images/ \; ; \
+ mkdir -p $$LANGPATH/$(name)-images/ ; \
+ find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/$(name)-images/ \; ; \
sed s/\.png"/.pdf"/g $(name).xml > $(name).$$f.xml ; \
$(DBLATEX) -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; \
else \
- mkdir -p $$LANGPATH/images ; \
+ mkdir -p $$LANGPATH/$(name)-images ; \
cd images ; \
if [ -d $$f ] ; then \
for i in $$f/*.png ; \
@@ -113,21 +126,25 @@ install: build
fi ; \
for i in *.* ; do \
if [ -e $$f/$$i ] ; then \
- cp -v $$f/$$i $$LANGPATH/images/ ; \
+ cp -v $$f/$$i $$LANGPATH/$(name)-images/ ; \
else \
- ln -sf ../../debian-edu-doc-en/images/$$i $$LANGPATH/images/$$i ; \
+ ln -sf ../../debian-edu-doc-en/$(name)-images/$$i $$LANGPATH/$(name)-images/$$i ; \
fi ; done ; \
cd .. ; \
sed -i s/\.png"/.pdf"/g $(name).$$f.xml ; \
+ sed -i "s#./images#./$(name)-images#g" $(name).$$f.xml ; \
mv images images_tmp_away ; $(DBLATEX) -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; mv images_tmp_away images ; \
- rm $$LANGPATH/images/*.pdf ; \
+ rm $$LANGPATH/$(name)-images/*.pdf ; \
fi ; \
fi ; \
+ if [ -e $(name).epub ] ; then \
+ cp $(name).epub $$LANGPATH/$(name).epub ; \
+ fi ; \
if [ -e $(name).$$f.epub ] ; then \
cp $(name).$$f.epub $$LANGPATH/$(name).epub ; \
fi ; \
done
- rm $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/images/*.pdf ; \
+ rm $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/$(name)-images/*.pdf ; \
clean:
rm -f *.pdf images/*.pdf images/*/*.pdf
--- a/documentation/scripts/get_manual
+++ b/documentation/scripts/get_manual
@@ -41,7 +41,7 @@ unique_section_ids() {
-e 'my %ids; sub escape {
my $s = shift;
$s=~s/ /_/g;
- $s=~s/~alpha/+alpha/g;
+ $s=~s/~/+/g;
$s=~s/"/.22/g;
$s=~s/\+/+-/g;
$s=~s/\//+AC8/g;
commit 586948aa9645c9be875c3f600a9cbe21a0fa0c7e
Author: Wolfgang Schweer <[email protected]>
Date: Sat Nov 29 16:15:32 2014 +0100
Makefile.common: If available use language specific images in EPUB manuals instead of default (en) ones.
diff --git a/debian/changelog b/debian/changelog
index b9644bc..7ce3c07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ debian-edu-doc (1.6~20141117~8.0+edu0~alpha1) UNRELEASED; urgency=medium
* Makefile.common: Store images in manual specific directories instead of
a common one to avoid linking to wrong images for the jessie and wheezy
HTML manuals. (Closes: #771345).
+ * Makefile.common: If available use language specific images in EPUB manuals
+ instead of default (en) ones.
[ Jessie Manual translation updates ]
* German (Wolfgang Schweer)
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 369f1e2..09e9b9c 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -58,7 +58,15 @@ build-epub:
-for LINGUA in $(LANGUAGES) ; do \
echo "Creating epub for $$LINGUA"; \
po4a --translate-only $(name).$$LINGUA.xml po4a.cfg ; \
+ mkdir images-tmp ; \
+ cp images/*.* images-tmp/ ; \
+ if [ -e images/$$LINGUA ] ; then \
+ cp -v images/$$LINGUA/*.* images-tmp/ ; \
+ fi ; \
+ sed -i "s#./images#./images-tmp#g" $(name).$$LINGUA.xml ; \
$(DBTOEPUB) $(name).$$LINGUA.xml ; \
+ sed -i "s#./images-tmp#./images/#g" $(name).$$LINGUA.xml ; \
+ rm -rf images-tmp/ ; \
done
else
build-html:
commit f5397bc9790b70c5ed703e8f6233689fee697e18
Author: Wolfgang Schweer <[email protected]>
Date: Fri Nov 28 18:42:28 2014 +0100
Makefile.common: Store images in manual specific directories instead of a common one to avoid linking to wrong images for the jessie and wheezy HTML manuals.
diff --git a/debian/changelog b/debian/changelog
index 6104de7..10a47b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ debian-edu-doc (1.6~20141117~8.0+edu0~alpha1) UNRELEASED; urgency=medium
* (en, de, fr) Update jessie network architecture images.
* Makefile.common: Enable EPUB generation for default language en.
(Closes: #771174).
+ * Makefile.common: Store images in manual specific directories instead of
+ a common one to avoid linking to wrong images for the jessie and wheezy
+ HTML manuals.
[ Jessie Manual translation updates ]
* German (Wolfgang Schweer)
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 807d2c2..369f1e2 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -99,16 +99,17 @@ install: build
if [ -e $(name).$$f.html ] ; then \
cp $(name).$$f.html $$LANGPATH/$(name).html ; \
sed -i "s/href=\"$(name).$$f.html/href=\"$(name).html/g" $$LANGPATH/$(name).html ; \
+ sed -i "s#./images#./$(name)-images#g" $$LANGPATH/$(name).html ; \
if [ "$$f" = "en" ] ; then \
for i in images/*.png ; \
do convert -units PixelsPerCentimeter -density 42x42 $$i $${i%.png}.pdf ; \
done ; \
- mkdir -p $$LANGPATH/images/ ; \
- find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/images/ \; ; \
+ mkdir -p $$LANGPATH/$(name)-images/ ; \
+ find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/$(name)-images/ \; ; \
sed s/\.png"/.pdf"/g $(name).xml > $(name).$$f.xml ; \
$(DBLATEX) -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; \
else \
- mkdir -p $$LANGPATH/images ; \
+ mkdir -p $$LANGPATH/$(name)-images ; \
cd images ; \
if [ -d $$f ] ; then \
for i in $$f/*.png ; \
@@ -117,14 +118,15 @@ install: build
fi ; \
for i in *.* ; do \
if [ -e $$f/$$i ] ; then \
- cp -v $$f/$$i $$LANGPATH/images/ ; \
+ cp -v $$f/$$i $$LANGPATH/$(name)-images/ ; \
else \
- ln -sf ../../debian-edu-doc-en/images/$$i $$LANGPATH/images/$$i ; \
+ ln -sf ../../debian-edu-doc-en/$(name)-images/$$i $$LANGPATH/$(name)-images/$$i ; \
fi ; done ; \
cd .. ; \
sed -i s/\.png"/.pdf"/g $(name).$$f.xml ; \
+ sed -i "s#./images#./$(name)-images#g" $(name).$$f.xml ; \
mv images images_tmp_away ; $(DBLATEX) -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; mv images_tmp_away images ; \
- rm $$LANGPATH/images/*.pdf ; \
+ rm $$LANGPATH/$(name)-images/*.pdf ; \
fi ; \
fi ; \
if [ -e $(name).epub ] ; then \
@@ -134,7 +136,7 @@ install: build
cp $(name).$$f.epub $$LANGPATH/$(name).epub ; \
fi ; \
done
- rm $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/images/*.pdf ; \
+ rm $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/$(name)-images/*.pdf ; \
clean:
rm -f *.pdf images/*.pdf images/*/*.pdf
commit c82b8008d871a562f6bf6d0ea1929ebe83962f10
Author: Wolfgang Schweer <[email protected]>
Date: Thu Nov 27 12:15:35 2014 +0100
Makefile.common: Enable EPUB generation for default language en.
diff --git a/debian/changelog b/debian/changelog
index cdbd740..7fe7484 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ debian-edu-doc (1.6~20141117~8.0+edu0~alpha1) UNRELEASED; urgency=medium
* Update manuals and images from the wiki.
* (it) Fix typos in wheezy and jessie manual translations.
* (en, de, fr) Update jessie network architecture images.
+ * Makefile.common: Enable EPUB generation for default language en.
[ Wheezy Manual translation updates ]
* German (Wolfgang Schweer)
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index 3b49c53..807d2c2 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -51,6 +51,10 @@ build-html:
sed -i "s/href=\"index.html/href=\"$(name).$$f.html/g" $(name).$$f.html ; \
done
build-epub:
+ # build the English EPUB version
+ echo "Creating epub for en"
+ $(DBTOEPUB) $(name).xml
+ # build all other EPUB versions
-for LINGUA in $(LANGUAGES) ; do \
echo "Creating epub for $$LINGUA"; \
po4a --translate-only $(name).$$LINGUA.xml po4a.cfg ; \
@@ -123,6 +127,9 @@ install: build
rm $$LANGPATH/images/*.pdf ; \
fi ; \
fi ; \
+ if [ -e $(name).epub ] ; then \
+ cp $(name).epub $$LANGPATH/$(name).epub ; \
+ fi ; \
if [ -e $(name).$$f.epub ] ; then \
cp $(name).$$f.epub $$LANGPATH/$(name).epub ; \
fi ; \
commit d3b61f0fad52e203eb6a7f1d6b7f1b83ae8e39c3
Author: Wolfgang Schweer <[email protected]>
Date: Mon Nov 17 15:27:56 2014 +0100
documentation/scripts/get_manual: Replace each occurrence of '~' in xml file section ids with '+' to let PDF generation succeed. (Closes: #768439).
diff --git a/debian/changelog b/debian/changelog
index fb2bd40..3746eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-doc UNRELEASED; urgency=medium
+
+ * documentation/scripts/get_manual: Replace each occurrence of '~'
+ in xml file section ids with '+' to let PDF generation succeed.
+ (Closes: #768439).
+
+ -- Wolfgang Schweer <[email protected]> Mon, 17 Nov 2014 15:18:02 +0100
+
debian-edu-doc (1.6~20141026~8.0+edu0~alpha0) unstable; urgency=medium
* Update manuals and images from the wiki.
diff --git a/documentation/scripts/get_manual b/documentation/scripts/get_manual
index ed5889a..0e7f5a3 100755
--- a/documentation/scripts/get_manual
+++ b/documentation/scripts/get_manual
@@ -41,7 +41,7 @@ unique_section_ids() {
-e 'my %ids; sub escape {
my $s = shift;
$s=~s/ /_/g;
- $s=~s/~alpha/+alpha/g;
+ $s=~s/~/+/g;
$s=~s/"/.22/g;
$s=~s/\+/+-/g;
$s=~s/\//+AC8/g;
signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
On Wed, 2014-12-03 at 22:25 +0100, Holger Levsen wrote:
> control: tags -1 - moreinfo
>
> On Samstag, 29. November 2014, Adam D. Barratt wrote:
> > The proposed changes look okay to me, thanks.
> > Please remove the "moreinfo" tag once the package has been accepted.
>
> debian-edu-doc uploaded and accepted, thanks as so often already! :)
Unblocked.
Regards,
Adam
--- End Message ---
