From c3241d4d79b7a5612f5fe63588f796646afdf706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 30 Aug 2015 18:55:53 +0200 Subject: New package libsane-bin --- debian/changelog | 10 +++++++--- debian/control | 20 ++++++++++++++++++++ debian/libsane-bin.install | 2 ++ debian/libsane-dev.NEWS | 4 ++-- debian/libsane-dev.install | 2 -- debian/libsane-dev.preinst | 20 ++++++++++++++++++++ debian/rules | 3 --- 7 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 debian/libsane-bin.install create mode 100644 debian/libsane-dev.preinst diff --git a/debian/changelog b/debian/changelog index 7176b46..4cf54d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,11 +6,15 @@ sane-backends (1.0.24-14) UNRELEASED; urgency=medium * debian/control: - To prevent error messages at startup disable snmp through remove libsnmp-dev from Build-Depends (Closes: #787567). - * To prevent installation errors (Closes: #786923): - - Remove debian/libsane-dev.links - - New libsane-dev.NEWS. * debian/sane-utils.lintian-overrides: - Add maintainer-script-should-not-use-adduser-system-without-home. + * Architecture dependent binaries(Closes: #786923): + - debian/control: + + New package libsane-bin: + Move architecture-dependent binaries from libsane-dev to libsane-bin. + - debian/rules: + + Delete command to move sane-config to + sane-config.${DEB_HOST_MULTIARCH}. -- Jörg Frings-Fürst Sun, 28 Jun 2015 10:12:36 +0200 diff --git a/debian/control b/debian/control index bc72cc7..2e17380 100644 --- a/debian/control +++ b/debian/control @@ -113,6 +113,7 @@ Architecture: any Multi-Arch: same Depends: libsane (= ${binary:Version}), + libsane-bin (>= 1.0.24-14), ${misc:Depends} Recommends: libsane-extras-dev Description: API development library for scanners [development files] @@ -129,6 +130,25 @@ Description: API development library for scanners [development files] This package contains the files needed to build your applications using SANE. +Package: libsane-bin +Section: libdevel +Architecture: any +Multi-Arch: foreign +Replaces: libsane-dev (<< 1.0.24-14) +Breaks: libsane-dev (<< 1.0.24-14) +Description: API development library for scanners [sane-config binary] + 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). + . + This package contains the sane-config binary. + Package: libsane-dbg Section: debug Priority: extra diff --git a/debian/libsane-bin.install b/debian/libsane-bin.install new file mode 100644 index 0000000..a436299 --- /dev/null +++ b/debian/libsane-bin.install @@ -0,0 +1,2 @@ +usr/bin/sane-config +usr/share/man/man1/sane-config.1 diff --git a/debian/libsane-dev.NEWS b/debian/libsane-dev.NEWS index 7592d91..5e03a1f 100644 --- a/debian/libsane-dev.NEWS +++ b/debian/libsane-dev.NEWS @@ -1,6 +1,6 @@ sane-backends (1.0.24-14) UNRELEASED; urgency=medium - Starting with this release sane-config are moved to - sane-config.${DEB_HOST_MULTIARCH}. + Starting with this release sane-config are moved to + the new package libsane-bin. -- Jörg Frings-Fürst Sun, 18 Jan 2015 11:46:18 +0100 diff --git a/debian/libsane-dev.install b/debian/libsane-dev.install index 122f709..6df5f63 100644 --- a/debian/libsane-dev.install +++ b/debian/libsane-dev.install @@ -1,7 +1,5 @@ -usr/bin/sane-config usr/include/ usr/lib/*/*.a usr/lib/*/*.so usr/lib/*/sane/*.a usr/lib/*/sane/*.so -usr/share/man/man1/sane-config.1 diff --git a/debian/libsane-dev.preinst b/debian/libsane-dev.preinst new file mode 100644 index 0000000..b085e99 --- /dev/null +++ b/debian/libsane-dev.preinst @@ -0,0 +1,20 @@ +#!/bin/sh +set -e + + + +case "$1" in + install|upgrade|abort-upgrade) +# +# remove obsolete file +# + rm -f /urs/bin/sane-config.* + ;; + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index b387128..062c99d 100755 --- a/debian/rules +++ b/debian/rules @@ -92,9 +92,6 @@ override_dh_install: # 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 - # - mv ${CURDIR}/debian/libsane-dev/usr/bin/sane-config ${CURDIR}/debian/libsane-dev/usr/bin/sane-config.${DEB_HOST_MULTIARCH} - override_dh_installdocs: dh_installdocs -- cgit v1.2.3