diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..507c8f7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.bzr +.bzrignore
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 2912d7e..b33bb5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sane-backends (1.0.24-3) unstable; urgency=medium + + * debian/rules: + - Revert moving of HTML documentation to previous method to fix FTBFS + and simply delete duplicate HTML files afterwards. (Closes: #765339) + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 14 Oct 2014 14:25:25 +0200 + sane-backends (1.0.24-2) unstable; urgency=medium * New Maintainer. (Closes: #764198) @@ -22,7 +30,7 @@ sane-backends (1.0.24-2) unstable; urgency=medium - Set the home directory to /var/lib/saned at adduser call. (Closes: #665915) * debian/rules: - - libsane-common: Correct the move of the HTML files to prevent + - libsane-common: Correct moving of HTML files to prevent duplicate files within the package. - Add systemd to dh commandline. - Manuelly install the systemd .socket file. diff --git a/debian/rules b/debian/rules index 85d9193..9370932 100755 --- a/debian/rules +++ b/debian/rules @@ -97,7 +97,7 @@ override_dh_installdocs: # Platform-specific documentation # move the html files into html/ install -d debian/libsane-common/usr/share/doc/libsane/html - mv $(CURDIR)/debian/libsane-common/usr/share/doc/libsane/*.html $(CURDIR)/debian/libsane-common/usr/share/doc/libsane/html/ + mv debian/tmp/usr/share/doc/libsane/*.html debian/libsane-common/usr/share/doc/libsane/html/ # create the /etc/sane.d/dll.d directory in libsane install -d debian/libsane/etc/sane.d/dll.d $(RM) debian/libsane-common/etc/sane.d/saned.conf @@ -107,6 +107,8 @@ endif ifeq (linux,$(DEB_HOST_ARCH_OS)) cp README.linux debian/libsane-common/usr/share/doc/libsane/ endif + $(RM) -f $(CURDIR)/debian/libsane-common/usr/share/doc/libsane/*.html + $(RM) -f $(CURDIR)/debian/tmp/usr/share/doc/libsane/*.html override_dh_installudev: ifeq (linux,$(DEB_HOST_ARCH_OS)) |