From 671fe4da5ab40cd997b6001ab0c4a7af87bac318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 25 Aug 2020 22:06:56 +0200 Subject: New patches; Use --enable-locking instead --disable-locking, Add libpoppler-glib-dev & python3-minimal to Build-Depends --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index eac8ba3..125838a 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ override_dh_auto_configure: --datadir=\$${prefix}/share \ --mandir=\$${prefix}/share/man \ --docdir=\$${prefix}/share/doc/libsane \ - --disable-locking \ + --enable-locking \ --enable-static \ --enable-pthread \ --with-gphoto2 \ -- cgit v1.2.3 From 7b8c59efa065ba8b8578152f4d18e738f84e4978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 27 Aug 2020 15:36:38 +0200 Subject: New debian/sane-utils.logrotate to pack and remove old logs --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 125838a..4d9b6e1 100755 --- a/debian/rules +++ b/debian/rules @@ -75,6 +75,7 @@ override_dh_install-arch: # Install the pkg-config file mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ cp tools/sane-backends.pc debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ + cp debian/sane-utils.logrotate debian/sane-utils/etc/logrotate.d/sane-utils override_dh_install-indep: dh_install -- cgit v1.2.3 From d07f65467bb1191b071975c35252405d0af63511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 28 Aug 2020 13:10:52 +0200 Subject: Fix FTCBFS --- debian/rules | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4d9b6e1..d798b9e 100755 --- a/debian/rules +++ b/debian/rules @@ -23,10 +23,24 @@ endif %: dh $@ +ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) +SANE_DESC = $(CURDIR)/tools/sane-desc +else +SANE_DESC = $(CURDIR)/debian/sane-desc +endif + override_dh_auto_configure: autoconf - dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ +ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) + dpkg-architecture -f "-a$(DEB_BUILD_ARCH)" -c dh_auto_configure + $(MAKE) -C $(CURDIR)/lib liblib.la + $(MAKE) -C $(CURDIR)/sanei libsanei.la + $(MAKE) -C $(CURDIR)/tools sane-desc + mv $(CURDIR)/tools/sane-desc $(CURDIR)/debian/sane-desc + $(RM) include/byteorder.h include/_stdint.h + dh_auto_clean +endif + dh_auto_configure -- \ --prefix=/usr \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --sysconfdir=/etc \ @@ -59,6 +73,7 @@ override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) distclean $(RM) debian/libsane1.udev dh_auto_clean + $(RM) $(SANE_DESC) override_dh_auto_install-arch: $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp @@ -117,8 +132,9 @@ 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+hwdb > $(CURDIR)/debian/libsane1.udev - $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hwdb > $(CURDIR)/debian/20-sane.hwdb + $(SANE_DESC) -s $(CURDIR)/doc/descriptions -m udev+hwdb > $(CURDIR)/debian/libsane1.udev + $(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 1b9f323ebdbea2385c37bda49b75631e624e0f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Aug 2020 14:19:47 +0200 Subject: refresh patches --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index d798b9e..8bab3c0 100755 --- a/debian/rules +++ b/debian/rules @@ -63,8 +63,8 @@ override_dh_autoreconf: override_dh_auto_build-indep: # generate POT file for translators - (cd po && make sane-backends.pot) $(MAKE) + (cd po && make sane-backends.pot) override_dh_auto_clean: # Autoconf-generated files -- cgit v1.2.3