summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-14 22:55:49 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-14 22:55:49 +0200
commit37f4486a41ec847a1b8dbfb4d1d1418535632c9c (patch)
tree509c635dbd3eac4f6b3a37885c0dfbf83f690c56
parent89b6762d03c38ff4a0ec4a99e09351c8e86a8f21 (diff)
Move docu install for libsane-dev to override_dh_installdocs-arch
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules5
2 files changed, 7 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 8b06c45..589258b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sane-backends (1.0.25-3) UNRELEASED; urgency=low
+sane-backends (1.0.25-3) unstable; urgency=low
* New debian/patches/0130-usb-timeout.patch:
- Add a timeout to prevent "Resource temporarily unavailable" error
@@ -9,6 +9,7 @@ sane-backends (1.0.25-3) UNRELEASED; urgency=low
(Closes: #806104).
- To prevent lintian errors move "empty dependency_libs in all .la
files" to override_dh_makeshlibs-arch.
+ - Move docu install for libsane-dev to override_dh_installdocs-arch.
* debian/watch:
- bump version to 4 (no changes required).
* debian/control:
@@ -22,7 +23,7 @@ sane-backends (1.0.25-3) UNRELEASED; urgency=low
* Add year 2016 to debian/* at debian/copyright.
* New debian/libsane-dev.dirs to prevent build errors.
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 16 Jan 2016 21:30:19 +0100
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 14 Apr 2016 22:54:23 +0200
sane-backends (1.0.25-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index ad0d8f4..fcd28d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,11 +90,14 @@ override_dh_install-arch:
mkdir -p $(CURDIR)/debian//sane-utils/usr/share/man/man5/
cp $(CURDIR)/doc/sane-umax_pp.man $(CURDIR)/debian/sane-utils/usr/share/man/man5/umax_pp.5
-override_dh_installdocs-indep:
+override_dh_installdocs-arch:
dh_installdocs
# move files that belong to libsane-dev
mv debian/tmp/usr/share/doc/libsane/sane.ps debian/libsane-dev/usr/share/doc/libsane-dev/
mv debian/tmp/usr/share/doc/libsane/backend-writing.txt debian/libsane-dev/usr/share/doc/libsane-dev/
+
+override_dh_installdocs-indep:
+ dh_installdocs
# Platform-specific documentation
# move the html files into html/
install -d debian/libsane-common/usr/share/doc/libsane/html