summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-30 18:55:53 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-30 18:55:53 +0200
commitc3241d4d79b7a5612f5fe63588f796646afdf706 (patch)
treed81076fccd08661cf6adaad81fad33796e4f1440 /debian
parentd0a7322e21ad51dc97fa759a16ca1c1c7e471764 (diff)
New package libsane-bin
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
-rw-r--r--debian/control20
-rw-r--r--debian/libsane-bin.install2
-rw-r--r--debian/libsane-dev.NEWS4
-rw-r--r--debian/libsane-dev.install2
-rw-r--r--debian/libsane-dev.preinst20
-rwxr-xr-xdebian/rules3
7 files changed, 51 insertions, 10 deletions
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 <debian@jff-webhosting.net> 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 <debian@jff-webhosting.net> 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