summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/Makefile3
-rw-r--r--debian/changelog4
2 files changed, 7 insertions, 0 deletions
diff --git a/build/Makefile b/build/Makefile
index 5668cf151..fd06b6c80 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -27,6 +27,9 @@ $(TARGETS): %:
mkdir -p "$$arch_destination/$$destsuffix" ; \
for format in $$formats; do \
if [ "$$format" = html ]; then \
+ mkdir -p "$$arch_destination/$$destsuffix/images" ; \
+ mv ./$$destdir/html/images/* "$$arch_destination/$$destsuffix/images" ; \
+ rmdir ./$$destdir/html/images ; \
mv ./$$destdir/html/* "$$arch_destination/$$destsuffix" ; \
else \
# Do not fail because of missing PDF support for some languages \
diff --git a/debian/changelog b/debian/changelog
index e525ae2fe..4b1c16520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,10 +38,14 @@ installation-guide (20150324) UNRELEASED; urgency=medium
* Make USB boot a more prominent option for booting the installer on x86
* Remove the old hdX device names, switch to sdX for disks
* Various fixes for arm* support
+ * Loads of trivial translations.
[ Samuel Thibault ]
* Add missing "set -e" in build/Makefile to trap build failures.
Closes: #782673.
+ * Loads of trivial translations.
+ * Fix moving the html images when destination already contains a built
+ manual. Closes: #782765.
-- Samuel Thibault <sthibault@debian.org> Sat, 28 Mar 2015 10:10:34 +0100