From 03996ab25c50b9f2c8a872aacba3287dad5a29f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 15 Jul 2017 11:59:37 +0200 Subject: Rename libsane.udev to libsane1.udev --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index d843757..bcc9c9e 100755 --- a/debian/rules +++ b/debian/rules @@ -113,7 +113,7 @@ 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/libsane.udev + $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev+acl > $(CURDIR)/debian/libsane1.udev dh_installudev endif @@ -127,7 +127,6 @@ override_dh_installinit-arch: override_dh_systemd_enable-arch: dh_systemd_enable --no-enable saned.socket - cp 111.111 222.222 override_dh_makeshlibs-arch: dh_makeshlibs -- -v$(VERSION) -Pdebian/libsane1 -plibsane1 -- cgit v1.2.3 From df8388850f009a9d71a614f32f980d648f547304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 28 Jul 2017 08:53:54 +0200 Subject: Use the hwdb+udev format --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/rules') 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 -- cgit v1.2.3 From 8beb6e7bce264735a8d11eef188b9a8ca2c112ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 28 Jul 2017 09:52:38 +0200 Subject: Drop defaults when using dh compat 10 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 417efe3..df29cd3 100755 --- a/debian/rules +++ b/debian/rules @@ -29,7 +29,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) endif %: - dh $@ --parallel --with autotools_dev,systemd + dh $@ override_dh_auto_configure: autoconf -- cgit v1.2.3 From 820acc6d73ec6f98236160d1ed2e383957500ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 28 Jul 2017 13:56:55 +0200 Subject: Remove .la files from install --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index df29cd3..ad09a43 100755 --- a/debian/rules +++ b/debian/rules @@ -134,4 +134,4 @@ override_dh_systemd_enable-arch: override_dh_makeshlibs-arch: dh_makeshlibs -- -v$(VERSION) -Pdebian/libsane1 -plibsane1 # Empty dependency_libs in all .la files - find debian -name "*.la" -type f -exec sed -i "/dependency_libs/ s/'.*'/''/" -i {} \; + #find debian -name "*.la" -type f -exec sed -i "/dependency_libs/ s/'.*'/''/" -i {} \; -- cgit v1.2.3