diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-28 13:57:41 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-28 13:57:41 +0200 |
commit | b3854f7c266d92c2f0e384562493d4ff281e8ec9 (patch) | |
tree | 1a259e1d7d9956ad2e1d79dac736632806a5057f /debian/rules | |
parent | 6dc74bfe7c897a776817cdcb7bbd7db6094ce1f1 (diff) | |
parent | 820acc6d73ec6f98236160d1ed2e383957500ddb (diff) |
Merge branch 'feature/bugfix' into develop
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules index d843757..ad09a43 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 @@ -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/libsane.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 @@ -127,9 +130,8 @@ 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 # 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 {} \; |