From 9ddc9fed69f3ba39db33787e5ff83b3f4f777062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 9 Jun 2025 14:46:51 +0200 Subject: New upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e51c729..0d6929e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sane-backends (1.4.0-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 + sane-backends (1.3.1-4) unstable; urgency=medium * New debian/patches/0205-ftbfs_with_GCC-15.patch (Closes: #1097841). -- cgit v1.2.3 From d55852dd7f8200b85ddc4df400cab4aad54a87f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 9 Jun 2025 14:55:28 +0200 Subject: Removal of patches that were applied by upstream --- debian/changelog | 5 +++++ debian/patches/series | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0d6929e..8f5c435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium * New upstream release. + - Removal of patches that were applied by upstream: + + debian/patches/0180-Escl_force_idle_status.patch + + debian/patches/0185-fix_memory.patch + + debian/patches/0190-Fix_scanimage_help.patch + + debian/patches/0205-ftbfs_with_GCC-15.patch -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 diff --git a/debian/patches/series b/debian/patches/series index 6e62f3f..5eb4472 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,7 @@ 0605-fix_groff-warnings.patch 0200-disable-check-equal-stderr.patch 0610-fix_groff_font_warnings.patch -0180-Escl_force_idle_status.patch -0185-fix_memory.patch -0190-Fix_scanimage_help.patch -0205-ftbfs_with_GCC-15.patch +#0180-Escl_force_idle_status.patch +#0185-fix_memory.patch +#0190-Fix_scanimage_help.patch +#0205-ftbfs_with_GCC-15.patch -- cgit v1.2.3 From df9f0d44a85053880f3e4055406e85dfcb787f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 9 Jun 2025 14:57:22 +0200 Subject: Refresh debian/libsane1.symbols --- debian/changelog | 1 + debian/libsane1.symbols | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8f5c435..7b3b9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium + debian/patches/0185-fix_memory.patch + debian/patches/0190-Fix_scanimage_help.patch + debian/patches/0205-ftbfs_with_GCC-15.patch + - Refresh debian/libsane1.symbols. -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 diff --git a/debian/libsane1.symbols b/debian/libsane1.symbols index 4a63c19..a9db584 100644 --- a/debian/libsane1.symbols +++ b/debian/libsane1.symbols @@ -1,7 +1,6 @@ libsane.so.1 libsane1 #MINVER# * Build-Depends-Package: libsane-dev (arch=!hurd-any)cmsg@Base 1.0.29 - fail_test@Base 1.0.29 md5_buffer@Base 1.0.27 md5_finish_ctx@Base 1.0.27 md5_init_ctx@Base 1.0.27 -- cgit v1.2.3 From fc79572cad91a67330eb73b56f08dab1b1643ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 9 Jun 2025 15:34:49 +0200 Subject: Refresh debian/copyright; debain/changelog: remove whitespace --- debian/changelog | 3 ++- debian/copyright | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7b3b9da..3fdd6a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium + debian/patches/0190-Fix_scanimage_help.patch + debian/patches/0205-ftbfs_with_GCC-15.patch - Refresh debian/libsane1.symbols. + - Refresh debian/copyright. -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 @@ -33,7 +34,7 @@ sane-backends (1.3.1-2) unstable; urgency=medium Thanks to Pino Toscano . * Move addgroup from debian/libsane1.postinst to debian/libsane1.preinst (Closes: #1095956). - * New debian/patches/0190-Fix_scanimage_help.patch to Fix_output of + * New debian/patches/0190-Fix_scanimage_help.patch to Fix_output of scanimage --help (Closes: #1094671). * debian/sane-utils.links: Add link from sane-umax_pp.5.gz to umax_pp.5.gz to make lintian happy. diff --git a/debian/copyright b/debian/copyright index da8004e..12df7ad 100644 --- a/debian/copyright +++ b/debian/copyright @@ -53,15 +53,15 @@ Files: backend/artec.* Copyright: 1996-1997 David Mosberger-Tang License: GPL-2+ -Files: backend/qcam.* +Files: backend/qcam.c Copyright: 1997 David Mosberger-Tang 1996 Scott Laird -License: GPL-2+ and EXPAT +License: Expat and/or GPL-2+ Files: backend/qcam.h Copyright: 1997 David Mosberger-Tang 1996 Scott Laird -License: GPL-2 and EXPAT +License: Expat and/or GPL Files: backend/artec_eplus48u.* Copyright: 2002 Michael Herder -- cgit v1.2.3 From e99c35b09bae90637115a70b99b5812455ccaeeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Sep 2025 15:01:09 +0200 Subject: d/copyright: refresh; Fix old FSF address --- debian/changelog | 4 +++- debian/copyright | 37 +++++++++++++++++++++++++++---------- debian/source/lintian-overrides | 11 +++++++++++ 3 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 debian/source/lintian-overrides (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3fdd6a9..dfca554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,9 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium + debian/patches/0190-Fix_scanimage_help.patch + debian/patches/0205-ftbfs_with_GCC-15.patch - Refresh debian/libsane1.symbols. - - Refresh debian/copyright. + * debian/copyright: + - Refresh. + - Fix old FSF address. -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 diff --git a/debian/copyright b/debian/copyright index 12df7ad..49e0b10 100644 --- a/debian/copyright +++ b/debian/copyright @@ -61,7 +61,7 @@ License: Expat and/or GPL-2+ Files: backend/qcam.h Copyright: 1997 David Mosberger-Tang 1996 Scott Laird -License: Expat and/or GPL +License: Expat and/or GPL-1 Files: backend/artec_eplus48u.* Copyright: 2002 Michael Herder @@ -1079,6 +1079,25 @@ 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 @@ -1091,7 +1110,7 @@ License: GPL-2+ 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 . + along with this program. If not, see https://www.gnu.org/licenses/. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. @@ -1125,7 +1144,7 @@ License: GPL-2 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 . + along with this program. If not, see https://www.gnu.org/licenses/. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. @@ -1141,7 +1160,7 @@ License: GPL-3 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 + along with this program. If not, see https://www.gnu.org/licenses/ . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". @@ -1158,7 +1177,7 @@ License: GPL-3+ 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 + along with this program. If not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". @@ -1176,8 +1195,7 @@ License: LGPL-2.1+ Lesser General Public License for more details. . You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; If not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". @@ -1912,8 +1930,7 @@ License: LGPL-2+ Lesser General Public License for more details. . You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + License along with this library; if not, see https://www.gnu.org/licenses/. . On Debian systems, the complete text of the GNU Library General Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2". @@ -2263,7 +2280,7 @@ License: GPL-2+ with sane exception 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 . + along with this program. If not, see https://www.gnu.org/licenses/. . The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..ecec065 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,11 @@ +# +# The license expat, gpl-1 and gpl-2+ are included +# +missing-license-paragraph-in-dep5-copyright +#missing-license-paragraph-in-dep5-copyright expat and/or gpl-2+ + +# +# mutiple licenses are allowd +# +space-in-std-shortname-in-dep5-copyright +#space-in-std-shortname-in-dep5-copyright expat and/or gpl-2+ -- cgit v1.2.3 From aad06a461af95e02d83fbbbdddccf4285554d54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Sep 2025 16:21:36 +0200 Subject: d/copyright: Fix old FSF address Part 2 --- debian/copyright | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 49e0b10..f560fb5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1967,8 +1967,7 @@ License: Expat License: GFDL-1.1+ GNU Free Documentation License Version 1.1, March 2000 - Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, - Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2000 Free Software Foundation - Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -- cgit v1.2.3 From 54756e013504bc8f99f5719816ae35dfb98d05f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Sep 2025 18:07:33 +0200 Subject: d/p/0125-multiarch_dll_search_path.patch; Fix compiler warning unknown escape sequence --- debian/changelog | 5 ++++- debian/patches/0125-multiarch_dll_search_path.patch | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dfca554..14a606d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,11 @@ 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. + * debian/patches/0125-multiarch_dll_search_path.patch: + - Fix compiler warning "unknown escape sequence" (Closes: #1107537). + Thanks to Peter Marschall . -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 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 -- cgit v1.2.3 From 134f142ded5aa18cb80e33ab5256ea6b2fc59016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Sep 2025 18:42:31 +0200 Subject: d/libsane1.lintian-overrides: Remove after release trixie --- debian/changelog | 3 +++ debian/libsane1.lintian-overrides | 9 --------- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 debian/libsane1.lintian-overrides (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14a606d..22d3024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,9 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium * debian/patches/0125-multiarch_dll_search_path.patch: - Fix compiler warning "unknown escape sequence" (Closes: #1107537). Thanks to Peter Marschall . + * debian/libsane1.lintian-overrides: + - Remove after release trixie (protective diversion for + upgrades of files moved from / to /usr). -- Jörg Frings-Fürst Mon, 09 Jun 2025 14:30:33 +0200 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 -- cgit v1.2.3 From 7c07d236e2dd75290003ea1d3ab8779d952e53a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Sep 2025 20:42:27 +0200 Subject: Remove after release trixie (protective diversion for upgrades of files moved from / to /usr --- debian/source/lintian-overrides | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') 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+ -- cgit v1.2.3 From 0c29c1523530a7851f29f3dc2fd9cc57b5d41cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Sep 2025 20:43:57 +0200 Subject: Remove after release trixie (protective diversion for upgrades of files moved from / to /usr --- debian/changelog | 11 +++++++---- debian/libsane1.postinst | 22 ---------------------- debian/libsane1.postrm | 23 ----------------------- debian/libsane1.preinst | 16 ---------------- 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 debian/libsane1.postinst delete mode 100644 debian/libsane1.postrm (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 22d3024..f23c3a2 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: @@ -13,11 +13,14 @@ sane-backends (1.4.0-1) UNRELEASED; urgency=medium * debian/patches/0125-multiarch_dll_search_path.patch: - Fix compiler warning "unknown escape sequence" (Closes: #1107537). Thanks to Peter Marschall . - * debian/libsane1.lintian-overrides: - - Remove after release trixie (protective diversion for + * 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 Mon, 09 Jun 2025 14:30:33 +0200 + -- Jörg Frings-Fürst Fri, 12 Sep 2025 20:42:43 +0200 sane-backends (1.3.1-4) unstable; urgency=medium 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 -- cgit v1.2.3 From b558ed7e7f7fecfc7b28594f0f1c26fce1b426b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Sep 2025 17:44:47 +0200 Subject: d/copyright: Fix license fot qcam.*; d/changelog: Change Date/time --- debian/changelog | 2 +- debian/copyright | 28 ++-------------------------- 2 files changed, 3 insertions(+), 27 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f23c3a2..94a5270 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,7 @@ sane-backends (1.4.0-1) unstable; urgency=medium - debian/libsane1.postrm - part of debian/libsane1.preinst. - -- Jörg Frings-Fürst Fri, 12 Sep 2025 20:42:43 +0200 + -- Jörg Frings-Fürst 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..9c412f9 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+ Files: backend/artec_eplus48u.* Copyright: 2002 Michael Herder @@ -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 -- cgit v1.2.3 From 0b8a357c867854848e6987edcf4433a9a6534ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Sep 2025 17:58:46 +0200 Subject: d/copyright: Fix license fot qcam.* part2 --- debian/copyright | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 9c412f9..1103f17 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,7 +56,7 @@ License: GPL-2+ Files: backend/qcam.* Copyright: 1997 David Mosberger-Tang 1996 Scott Laird -License: Expat and GPL-2+ +License: Expat and GPL-2+ with sane exception Files: backend/artec_eplus48u.* Copyright: 2002 Michael Herder -- cgit v1.2.3