[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 5 commits: Avoid broken symlinks and missing PDF manuals (Closes: #985703, #985773)
Wolfgang Schweer
gitlab at salsa.debian.org
Wed Mar 24 00:30:10 GMT 2021
Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-doc
Commits:
206a30ac by Wolfgang Schweer at 2021-03-24T01:00:11+01:00
Avoid broken symlinks and missing PDF manuals (Closes: #985703, #985773)
Adjust documentation/common/Makefile.common (both bugs)
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
91c752bf by Wolfgang Schweer at 2021-03-24T01:02:31+01:00
Remove non-working images
Some images in documentation/audacity/images/fr and documentation/rosegarden/images/nb-no
caused more broken links, replace them with links to (en) images.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
ea20cb5f by Wolfgang Schweer at 2021-03-24T01:15:15+01:00
Remove remaining non-working images
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
82145900 by Wolfgang Schweer at 2021-03-24T01:19:34+01:00
Add Suggests: on debian-edu-doc-legacy-en to debian/control
Thanks to Andreas Beckmann for the hint.
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
f5266323 by Wolfgang Schweer at 2021-03-24T01:28:38+01:00
Add changelog entries for my last commits
Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>
- - - - -
11 changed files:
- debian/changelog
- debian/control
- − documentation/audacity/images/fr/noiseremoval.png
- documentation/common/Makefile.common
- − documentation/rosegarden/images/nb-no/edirol25.jpg
- − documentation/rosegarden/images/nb-no/notationsafter.png
- − documentation/rosegarden/images/nb-no/notationsbefore.png
- − documentation/rosegarden/images/nb-no/notebeforeandafter.png
- − documentation/rosegarden/images/nb-no/rolandum1.jpg
- − documentation/rosegarden/images/nb-no/tempoandtimesignatureeditor.png
- − documentation/rosegarden/images/nb-no/tempochange.png
Changes:
=====================================
debian/changelog
=====================================
@@ -12,6 +12,14 @@ debian-edu-doc (2.11.22) UNRELEASED; urgency=medium
* Buster manual:
- Portugese (Portugal): José Vieira and ssantos
+ [ Wolfgang Schweer ]
+ * Avoid broken symlinks and missing PDF manuals (Closes: #985703, #985773).
+ - Adjust documentation/common/Makefile.common (both bugs).
+ - Remove non-working images from documentation/audacity/images/fr and
+ documentation/rosegarden/images/nb-no (those caused more broken links).
+ - debian/control: add Suggests: on debian-edu-doc-legacy-en, thanks to
+ Andreas Beckmann for the hint.
+
-- Wolfgang Schweer <wschweer at arcor.de> Sun, 21 Mar 2021 12:15:38 +0100
debian-edu-doc (2.11.21) experimental; urgency=medium
=====================================
debian/control
=====================================
@@ -36,6 +36,7 @@ Vcs-Browser: https://salsa.debian.org/debian-edu/debian-edu-doc
Package: debian-edu-doc-en
Depends: ${misc:Depends}
+Suggests: debian-edu-doc-legacy-en
Architecture: all
Multi-Arch: foreign
Description: English documentation from the Debian Edu project
=====================================
documentation/audacity/images/fr/noiseremoval.png deleted
=====================================
Binary files a/documentation/audacity/images/fr/noiseremoval.png and /dev/null differ
=====================================
documentation/common/Makefile.common
=====================================
@@ -172,6 +172,7 @@ endif
ifndef LINGUA
pdf: build-xml
sed -i $(SED_00) $(name).en.xml
+ sed -i $(SED_100) $(name).en.xml
$(DBLATEX) $(name).en.xml --param=lingua=en
else
pdf: build-xml
@@ -223,6 +224,7 @@ install: build
mkdir -p $$LANGPATH/$(name)-images/ ; \
find images -maxdepth 1 -type f -exec cp \{\} $$LANGPATH/$(name)-images/ \; ; \
sed -i $(SED_00) $(name).xml ; \
+ sed -i $(SED_100) $(name).xml ; \
$(DBLATEX) -o $$LANGPATH/$(name).pdf $(name).xml --param=lingua=$$f ; \
else \
mkdir -p $$LANGPATH/$(name)-images ; \
@@ -246,6 +248,8 @@ install: build
$(DBLATEX) -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; \
cp $$LANGPATH/$(name)-images-tmp/*.* $$LANGPATH/$(name)-images 2> /dev/null ; \
rm -rf $$LANGPATH/$(name)-images-tmp ; \
+ rm -rf $$LANGPATH/debian-edu-itil-manual-images ; \
+ rm -rf $(DESTDIR)/debian-edu-doc-legacy-en/$(DESTPATH)/debian-edu-doc-legacy-en/debian-edu-itil-manual-images ; \
fi ; \
fi ; \
if [ -e $(name).epub ] && [ "$$f" = "en" ] ; then \
=====================================
documentation/rosegarden/images/nb-no/edirol25.jpg deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/edirol25.jpg and /dev/null differ
=====================================
documentation/rosegarden/images/nb-no/notationsafter.png deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/notationsafter.png and /dev/null differ
=====================================
documentation/rosegarden/images/nb-no/notationsbefore.png deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/notationsbefore.png and /dev/null differ
=====================================
documentation/rosegarden/images/nb-no/notebeforeandafter.png deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/notebeforeandafter.png and /dev/null differ
=====================================
documentation/rosegarden/images/nb-no/rolandum1.jpg deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/rolandum1.jpg and /dev/null differ
=====================================
documentation/rosegarden/images/nb-no/tempoandtimesignatureeditor.png deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/tempoandtimesignatureeditor.png and /dev/null differ
=====================================
documentation/rosegarden/images/nb-no/tempochange.png deleted
=====================================
Binary files a/documentation/rosegarden/images/nb-no/tempochange.png and /dev/null differ
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d9ecd74c515d11bc37170011a7326cce04b846f1...f526632350005a3239199dafd7279c8112fa729d
--
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/d9ecd74c515d11bc37170011a7326cce04b846f1...f526632350005a3239199dafd7279c8112fa729d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20210324/83ee4602/attachment-0001.htm>
More information about the debian-edu-commits
mailing list