diff options
author | Nicolas Boulenguez <nicolas@debian.org> | 2018-04-16 22:17:20 +0200 |
---|---|---|
committer | Didier Raboud <odyx@debian.org> | 2018-04-16 22:34:51 +0200 |
commit | a4de06d7c710dfdcc04fb74c04911127ddb80c79 (patch) | |
tree | ce29f039c6765c4ba5380fea732e859b1a4ab773 | |
parent | bbc25fc2e48cbdc69d0e15081d04183a6297386c (diff) |
Rewrite ARCH_OS-different installation to avoid the use of debhelper's --ignore
Closes: #895659
-rw-r--r-- | debian/printer-driver-gutenprint.install.linux | 1 | ||||
-rwxr-xr-x | debian/rules | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/debian/printer-driver-gutenprint.install.linux b/debian/printer-driver-gutenprint.install.linux deleted file mode 100644 index 391459d..0000000 --- a/debian/printer-driver-gutenprint.install.linux +++ /dev/null @@ -1 +0,0 @@ -usr/share/cups/usb diff --git a/debian/rules b/debian/rules index a15178a..b795e52 100755 --- a/debian/rules +++ b/debian/rules @@ -38,10 +38,9 @@ override_dh_clean: override_dh_install-arch: ifeq ($(DEB_BUILD_ARCH_OS),linux) - # Install common files - dh_install -pprinter-driver-gutenprint --ignore=debian/printer-driver-gutenprint.install.linux + dh_install -pprinter-driver-gutenprint usr/share/cups/usb endif - dh_install -a + dh_install -a --remaining-packages # Remove rpath find debian/printer-driver-gutenprint/usr/lib -type f -perm /0111 -print0 | xargs -0 chrpath --delete # Install ppd-updater file |