Control: tags 818544 + patch Control: tags 818544 + pending Control: tags 887032 + patch
Dear maintainer,
I've sponsored an NMU prepered by Hugh McMaster for sane-backends
(versioned as 1.0.25-4.2) and uploaded it to DELAYED/5.
Please feel free to tell me if I should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for sane-backends-1.0.25 sane-backends-1.0.25
changelog | 12 ++++++++++++
libsane-dev.doc-base | 16 ----------------
rules | 35 ++++++++++++++++++++---------------
3 files changed, 32 insertions(+), 31 deletions(-)
diff -Nru sane-backends-1.0.25/debian/changelog sane-backends-1.0.25/debian/changelog
--- sane-backends-1.0.25/debian/changelog 2017-05-21 10:04:48.000000000 +0200
+++ sane-backends-1.0.25/debian/changelog 2018-04-04 14:29:50.000000000 +0200
@@ -1,3 +1,15 @@
+sane-backends (1.0.25-4.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Enable successive package builds (Closes: #887032).
+ * Re-enable multi-arch installation of libsane-dev (Closes: #818544).
+ - Do not install sane.ps and backend-writing.txt in libsane-dev, as they
+ are already installed in libsane-common.
+ - Remove libsane-dev.doc-base, as it pointed only to sane.ps, which is
+ no longer installed in libsane-dev.
+
+ -- Hugh McMaster <hugh.mcmas...@outlook.com> Wed, 04 Apr 2018 22:29:50 +1000
+
sane-backends (1.0.25-4.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru sane-backends-1.0.25/debian/libsane-dev.doc-base sane-backends-1.0.25/debian/libsane-dev.doc-base
--- sane-backends-1.0.25/debian/libsane-dev.doc-base 2017-05-21 10:04:48.000000000 +0200
+++ sane-backends-1.0.25/debian/libsane-dev.doc-base 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Document: libsane-dev
-Title: SANE Standard
-Author: Andreas Beck and David Mosberger
-Abstract: SANE stands for "Scanner Access Now Easy" and is an application
- programming interface (API) that provides standardized access to any
- raster image scanner hardware (flatbed scanner, hand-held scanner,
- video- and still-cameras, frame-grabbers, etc.). The SANE standard is
- free and its discussion and development are open to everybody. The
- current source code is written to support several operating systems,
- including GNU/Linux, OS/2, Win32 and various Unices and is available
- under the GNU General Public License (commercial applications and
- backends are welcome, too, however).
-Section: Graphics
-
-Format: postscript
-Files: /usr/share/doc/libsane-dev/sane.ps.gz
diff -Nru sane-backends-1.0.25/debian/rules sane-backends-1.0.25/debian/rules
--- sane-backends-1.0.25/debian/rules 2017-05-21 10:04:48.000000000 +0200
+++ sane-backends-1.0.25/debian/rules 2018-04-01 15:45:25.000000000 +0200
@@ -31,8 +31,22 @@
%:
dh $@ --parallel --with autotools_dev,systemd
+override_dh_auto_clean:
+ # Autoconf-generated files
+ $(RM) include/byteorder.h include/_stdint.h
+ # Add here commands to clean up after the build process.
+ [ ! -f Makefile ] || $(MAKE) distclean
+ $(RM) debian/libsane-common.install
+ $(RM) debian/libsane.udev
+ dh_auto_clean
+
+override_dh_autoreconf:
+ mkdir -p /tmp/sane-backends
+ cp $(CURDIR)/aclocal.m4 /tmp/sane-backends
+ cp -r $(CURDIR)/m4 /tmp/sane-backends
+ dh_autoreconf -X.m4
+
override_dh_auto_configure:
- autoconf
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
@@ -56,14 +70,11 @@
(cd po && make sane-backends.pot)
$(MAKE)
-override_dh_auto_clean:
- # Autoconf-generated files
- $(RM) include/byteorder.h include/_stdint.h
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- $(RM) debian/libsane-common.install
- $(RM) debian/libsane.udev
- dh_auto_clean
+override_dh_auto_build:
+ dh_auto_build
+ cp -f /tmp/sane-backends/aclocal.m4 $(CURDIR)
+ cp -rf /tmp/sane-backends/m4 $(CURDIR)
+ rm -rf /tmp/sane-backends
override_dh_auto_install-arch:
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
@@ -90,12 +101,6 @@
mkdir -p $(CURDIR)/debian//sane-utils/usr/share/man/man5/
cp $(CURDIR)/doc/sane-umax_pp.man $(CURDIR)/debian/sane-utils/usr/share/man/man5/umax_pp.5
-override_dh_installdocs-arch:
- dh_installdocs
- # move files that belong to libsane-dev
- mv debian/tmp/usr/share/doc/libsane/sane.ps debian/libsane-dev/usr/share/doc/libsane-dev/
- mv debian/tmp/usr/share/doc/libsane/backend-writing.txt debian/libsane-dev/usr/share/doc/libsane-dev/
-
override_dh_installdocs-indep:
dh_installdocs
# Platform-specific documentation
signature.asc
Description: PGP signature
