diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-28 08:53:54 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-28 08:53:54 +0200 |
| commit | df8388850f009a9d71a614f32f980d648f547304 (patch) | |
| tree | 2f4d02b2353d6e6ee26683912b6332fa76741525 | |
| parent | 55cfdd525fd27dd5f5a87ba5ccdd0f970d42d67f (diff) | |
Use the hwdb+udev format
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/libsane1.dirs | 1 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4b402ed..3dd0033 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,11 @@ sane-backends (1.0.27-1~experimental2) UNRELEASED; urgency=medium + Remove outdated Recommends libsane-extras from libsane1 (Closes: #868265). * debian/sane-utils.postrm: - + Reenable set -e and masquerade update-inetd calls with "|| true". + + Enable set -e and masquerade update-inetd calls with "|| true". * Rebuild symbols files (Closes: #868309). + * Use the hwdb+udev format (Closes: #869244): + - debian/rules: Change override_dh_installudev-arch. + - New file libsane1.dirs for /lib/udev/hwdb.d/. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 15 Jul 2017 11:31:34 +0200 diff --git a/debian/libsane1.dirs b/debian/libsane1.dirs new file mode 100644 index 0000000..ad3a3cc --- /dev/null +++ b/debian/libsane1.dirs @@ -0,0 +1 @@ +/lib/udev/hwdb.d/ diff --git a/debian/rules b/debian/rules index bcc9c9e..417efe3 100755 --- a/debian/rules +++ b/debian/rules @@ -113,7 +113,10 @@ override_dh_installudev-arch: ifeq (linux,$(DEB_HOST_ARCH_OS)) # udev support # Generate the udev rules file - $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev+acl > $(CURDIR)/debian/libsane1.udev +# $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev+acl > $(CURDIR)/debian/libsane1.udev + $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev+hwdb > $(CURDIR)/debian/libsane1.udev + $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hwdb > $(CURDIR)/debian/20-sane.hwdb + cp $(CURDIR)/debian/20-sane.hwdb $(CURDIR)/debian/libsane1/lib/udev/hwdb.d/ dh_installudev endif |