diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/copyright | 28 | ||||
| -rw-r--r-- | debian/libsane1.lintian-overrides | 9 | ||||
| -rw-r--r-- | debian/libsane1.postinst | 22 | ||||
| -rw-r--r-- | debian/libsane1.postrm | 23 | ||||
| -rw-r--r-- | debian/libsane1.preinst | 16 | ||||
| -rw-r--r-- | debian/patches/0125-multiarch_dll_search_path.patch | 2 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 2 |
8 files changed, 17 insertions, 102 deletions
diff --git a/debian/changelog b/debian/changelog index dfca554..94a5270 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.4.0-1) UNRELEASED; urgency=medium +sane-backends (1.4.0-1) unstable; urgency=medium * New upstream release. - Removal of patches that were applied by upstream: @@ -8,10 +8,19 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium + debian/patches/0205-ftbfs_with_GCC-15.patch - Refresh debian/libsane1.symbols. * debian/copyright: - - Refresh. + - Refresh. - Fix old FSF address. - - -- Jörg Frings-Fürst <debian@jff.email> Mon, 09 Jun 2025 14:30:33 +0200 + * debian/patches/0125-multiarch_dll_search_path.patch: + - Fix compiler warning "unknown escape sequence" (Closes: #1107537). + Thanks to Peter Marschall <peter@adpm.de>. + * Remove after release trixie (protective diversion for + upgrades of files moved from / to /usr). + - debian/libsane1.lintian-overrides. + - debian/libsane1.postinst + - debian/libsane1.postrm + - part of debian/libsane1.preinst. + + -- Jörg Frings-Fürst <debian@jff.email> Sat, 13 Sep 2025 17:42:34 +0200 sane-backends (1.3.1-4) unstable; urgency=medium diff --git a/debian/copyright b/debian/copyright index f560fb5..1103f17 100644 --- a/debian/copyright +++ b/debian/copyright @@ -53,15 +53,10 @@ Files: backend/artec.* Copyright: 1996-1997 David Mosberger-Tang License: GPL-2+ -Files: backend/qcam.c +Files: backend/qcam.* Copyright: 1997 David Mosberger-Tang 1996 Scott Laird -License: Expat and/or GPL-2+ - -Files: backend/qcam.h -Copyright: 1997 David Mosberger-Tang - 1996 Scott Laird -License: Expat and/or GPL-1 +License: Expat and GPL-2+ with sane exception Files: backend/artec_eplus48u.* Copyright: 2002 Michael Herder <crapsite@gmx.net> @@ -1079,25 +1074,6 @@ License: Artistic IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. -License: GPL-1 - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 1 of the License. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see https://www.gnu.org/licenses/. - . - On Debian systems, the full text of the GNU General Public - License version 1 can be found in the file - `/usr/share/common-licenses/GPL-1'. - License: GPL-2+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides deleted file mode 100644 index ee56b5b..0000000 --- a/debian/libsane1.lintian-overrides +++ /dev/null @@ -1,9 +0,0 @@ -# begin-remove-after: released:trixie -# protective diversion for upgrades of files moved from / to /usr -libsane1: systemd-diversion lib/udev/hwdb.d/20-sane.hwdb [preinst:11] -libsane1: systemd-diversion lib/udev/rules.d/60-libsane1.rules [preinst:14] -libsane1: systemd-diversion lib/udev/rules.d/99-libsane1.rules [preinst:17] -libsane1: diversion-for-unknown-file lib/udev/hwdb.d/20-sane.hwdb [preinst:11] -libsane1: diversion-for-unknown-file lib/udev/rules.d/60-libsane1.rules [preinst:14] -libsane1: diversion-for-unknown-file lib/udev/rules.d/99-libsane1.rules [preinst:17] -# end-remove-after diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst deleted file mode 100644 index b5da9aa..0000000 --- a/debian/libsane1.postinst +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -e - -# begin-remove-after: released:trixie -# protective diversion of files moved from / to /usr, to avoid file loss. -# Only for upgrades. -if [ "$1" = "configure" ]; then - # At this point, the package will have installed the same file in */usr*. - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \ - --remove /lib/udev/hwdb.d/20-sane.hwdb - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/60-libsane1.rules - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/99-libsane1.rules -fi -# end-remove-after - - -#DEBHELPER# diff --git a/debian/libsane1.postrm b/debian/libsane1.postrm deleted file mode 100644 index 6448e00..0000000 --- a/debian/libsane1.postrm +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -set -e - -# begin-remove-after: released:trixie -# protective diversion of files moved from / to /usr, to avoid file loss. -# Only for upgrades. -if [ "$1" = "remove" ] && [ "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = "1" ]; then - # Cleanup in case package is removed before upgrade is finished (postinst ran). - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \ - --remove /lib/udev/hwdb.d/20-sane.hwdb - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/60-libsane1.rules - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \ - --remove /lib/udev/rules.d/99-libsane1.rules -fi -# end-remove-after - -#DEBHELPER# - diff --git a/debian/libsane1.preinst b/debian/libsane1.preinst index 1f02da9..a3a3fb9 100644 --- a/debian/libsane1.preinst +++ b/debian/libsane1.preinst @@ -2,22 +2,6 @@ set -e -# begin-remove-after: released:trixie -# protective diversion of files moved from / to /usr, to avoid file loss. -# Only for upgrades. -if [ "$1" = "upgrade" ]; then - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/hwdb.d/20-sane.hwdb.usr-is-merged \ - --add /lib/udev/hwdb.d/20-sane.hwdb - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/60-libsane1.rules.usr-is-merged \ - --add /lib/udev/rules.d/60-libsane1.rules - dpkg-divert --package usr-is-merged --no-rename \ - --divert /lib/udev/rules.d/99-libsane1.rules.usr-is-merged \ - --add /lib/udev/rules.d/99-libsane1.rules -fi -# end-remove-after - #if [ "$1" = "upgrade" ]; then # Add the scanner system group if it doesn't exist if ! getent group | grep -q "^scanner:"; then diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch index 67b9484..125cafa 100644 --- a/debian/patches/0125-multiarch_dll_search_path.patch +++ b/debian/patches/0125-multiarch_dll_search_path.patch @@ -38,7 +38,7 @@ Index: trunk/backend/Makefile.am ## included LICENSE file for license information. -AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -+AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\:$(prefix)/lib64/sane\"" ++AM_CPPFLAGS += -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include $(USB_CFLAGS) -DLIBDIR="\"$(libdir)/sane\"" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane:$(prefix)/lib64/sane\"" AM_LDFLAGS += $(STRICT_LDFLAGS) # The -rpath option is added because we are creating _LTLIBRARIES based diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index ecec065..07c4334 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -5,7 +5,7 @@ missing-license-paragraph-in-dep5-copyright #missing-license-paragraph-in-dep5-copyright expat and/or gpl-2+ # -# mutiple licenses are allowd +# multiple licenses are allowed # space-in-std-shortname-in-dep5-copyright #space-in-std-shortname-in-dep5-copyright expat and/or gpl-2+ |