From 68e00695abb9ab3d306f0eec4bc5b93c8abec345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 19:36:35 +0200 Subject: Move libsane-common.install.in to libsane-common.install --- debian/changelog | 1 + debian/libsane-common.install | 5 +++++ debian/libsane-common.install.in | 5 ----- debian/rules | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 debian/libsane-common.install delete mode 100644 debian/libsane-common.install.in diff --git a/debian/changelog b/debian/changelog index 15b9af4..8eab99e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium + Move rules from override_dh_install-arch and override_dh_auto_install-arch to override_dh_install-indep and override_dh_auto_install-indep to build the arch all packages without error (CLoses: #870455). + * Move libsane-common.install.in to libsane-common.install. -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 diff --git a/debian/libsane-common.install b/debian/libsane-common.install new file mode 100644 index 0000000..9def933 --- /dev/null +++ b/debian/libsane-common.install @@ -0,0 +1,5 @@ +etc/ +usr/share/man/man7 +usr/share/locale/ +usr/share/man/man5/sane-scsi.5 +usr/share/man/man5/sane-usb.5 diff --git a/debian/libsane-common.install.in b/debian/libsane-common.install.in deleted file mode 100644 index 9def933..0000000 --- a/debian/libsane-common.install.in +++ /dev/null @@ -1,5 +0,0 @@ -etc/ -usr/share/man/man7 -usr/share/locale/ -usr/share/man/man5/sane-scsi.5 -usr/share/man/man5/sane-usb.5 diff --git a/debian/rules b/debian/rules index 81a683c..fb48f8f 100755 --- a/debian/rules +++ b/debian/rules @@ -62,7 +62,6 @@ override_dh_auto_clean: $(RM) include/byteorder.h include/_stdint.h # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean - $(RM) debian/libsane-common.install $(RM) debian/libsane1.udev dh_auto_clean @@ -74,7 +73,6 @@ override_dh_auto_install-arch: $(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.* override_dh_auto_install-indep: - cp debian/libsane-common.install.in debian/libsane-common.install dh_auto_install override_dh_install-arch: -- cgit v1.2.3