From 1f2f4ba8283bd55bba9250923403160e881640f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 14:44:01 +0200 Subject: Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error multiple definition' --- debian/changelog | 8 ++++++++ debian/rules | 2 ++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index f0b37d2..d4d2ef5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium + + * debian/rules: + - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error + "multiple definition" (Closes: #957218). + + -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 + foomatic-filters (4.0.17-11) unstable; urgency=medium * debian/changelog: diff --git a/debian/rules b/debian/rules index 1a5c24d..3c61bec 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") # hardening export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--allow-multiple-definition + %: dh $@ -- cgit v1.2.3 From ffbc9d24b4f7c2828b5744f34d88efb82df10fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 14:48:37 +0200 Subject: Declare compliance with Debian Policy 4.5.0 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4d2ef5..ecb63c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium * debian/rules: - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error - "multiple definition" (Closes: #957218). + "multiple definition" (Closes: #957218). + * Declare compliance with Debian Policy 4.5.0 (No changes needed). -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 diff --git a/debian/control b/debian/control index a531461..9523a59 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: Homepage: https://wiki.linuxfoundation.org/openprinting/start Vcs-Git: git://jff.email/opt/git/foomatic-filters.git Vcs-Browser: https://jff.email/cgit/foomatic-filters.git -Standards-Version: 4.2.1 +Standards-Version: 4.5.0 Package: foomatic-filters Architecture: any -- cgit v1.2.3 From b2906e7dc3b52a187cf81e8952015bf89307421f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 14:50:23 +0200 Subject: Switch to debhelper-compat --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index ecb63c7..ffb1404 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error "multiple definition" (Closes: #957218). * Declare compliance with Debian Policy 4.5.0 (No changes needed). + * Switch to debhelper-compat: + - debian/control: change to debhelper-compat (=13). + - remove debian/compat. -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index 9523a59..7e93714 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: autoconf, - debhelper (>= 11), + debhelper-compat (= 13), libcups2-dev, libdbus-1-dev, perl, -- cgit v1.2.3 From 53afd37fb26d992afa7f5f50c653222e8d45f3de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 14:57:37 +0200 Subject: Add 'Forwarded: not needed' into patches --- debian/changelog | 3 +++ debian/patches/0110-fixed-segfault-when-creating-logfile.patch | 1 + debian/patches/0600-spelling-errors.diff | 1 + 3 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index ffb1404..951aaea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium * Switch to debhelper-compat: - debian/control: change to debhelper-compat (=13). - remove debian/compat. + * Add 'Forwarded: not needed' into: + - debian/patches/0110-fixed-segfault-when-creating-logfile.patch. + - debian/patches/0600-spelling-errors.diff. -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 diff --git a/debian/patches/0110-fixed-segfault-when-creating-logfile.patch b/debian/patches/0110-fixed-segfault-when-creating-logfile.patch index 29a743f..ea3b06d 100644 --- a/debian/patches/0110-fixed-segfault-when-creating-logfile.patch +++ b/debian/patches/0110-fixed-segfault-when-creating-logfile.patch @@ -1,5 +1,6 @@ Description: foomatic-rip: Fixed segfault when creating log file (Bug #1206). Author: Till Kamppeter +Forwarded: not needed Last-Update: 2014-04-25 --- a/foomaticrip.c +++ b/foomaticrip.c diff --git a/debian/patches/0600-spelling-errors.diff b/debian/patches/0600-spelling-errors.diff index daa2a8b..114c079 100644 --- a/debian/patches/0600-spelling-errors.diff +++ b/debian/patches/0600-spelling-errors.diff @@ -1,6 +1,7 @@ Description: some typo in sources and manpage Author: Jörg Frings-Fürst Reviewed-by: +Forwarded: not needed Last-Update: 2014-05-04 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -- cgit v1.2.3 From f4cbb1626e55ec2554935ed01dc99b29e7cf26af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 16:29:03 +0200 Subject: Fix lintian breakout-link warning --- debian/changelog | 4 +++- debian/foomatic-filters-beh.install | 2 +- debian/foomatic-filters-beh.preinst | 11 +++++++++++ debian/foomatic-filters.dirs | 2 ++ debian/foomatic-filters.manpages | 2 +- debian/rules | 8 +++++++- 6 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 debian/foomatic-filters-beh.preinst diff --git a/debian/changelog b/debian/changelog index 951aaea..cc8a868 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium - * debian/rules: + * debian/rules: - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error "multiple definition" (Closes: #957218). * Declare compliance with Debian Policy 4.5.0 (No changes needed). @@ -10,6 +10,8 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium * Add 'Forwarded: not needed' into: - debian/patches/0110-fixed-segfault-when-creating-logfile.patch. - debian/patches/0600-spelling-errors.diff. + * Fix lintian breakout-link warning: + - debian/rules: remove links with copys. -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 diff --git a/debian/foomatic-filters-beh.install b/debian/foomatic-filters-beh.install index b0a9549..46abf84 100644 --- a/debian/foomatic-filters-beh.install +++ b/debian/foomatic-filters-beh.install @@ -1,2 +1,2 @@ -usr/lib/cups/backend +usr/lib/cups/backend/beh usr/libexec/cups/backend/ diff --git a/debian/foomatic-filters-beh.preinst b/debian/foomatic-filters-beh.preinst new file mode 100644 index 0000000..e416e2e --- /dev/null +++ b/debian/foomatic-filters-beh.preinst @@ -0,0 +1,11 @@ +#!/bin/sh +set -e + +case "$1" in + upgrade) + # remove beh from old directory + rm -f usr/lib/cups/backend/beh +esac + + +#DEBHELPER# diff --git a/debian/foomatic-filters.dirs b/debian/foomatic-filters.dirs index 84a4858..7d8e6f7 100644 --- a/debian/foomatic-filters.dirs +++ b/debian/foomatic-filters.dirs @@ -4,3 +4,5 @@ usr/sbin usr/share/foomatic usr/share/man/man1 usr/share/man/man8 +usr/lib/ppr/interfaces +usr/lib/ppr/lib diff --git a/debian/foomatic-filters.manpages b/debian/foomatic-filters.manpages index f101e1b..366d8bf 100644 --- a/debian/foomatic-filters.manpages +++ b/debian/foomatic-filters.manpages @@ -1 +1 @@ -foomatic-rip.1 +usr/share/man/man1/foomatic-rip.1 diff --git a/debian/rules b/debian/rules index 3c61bec..7c52296 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,6 @@ derives_from_ubuntu := $(shell (dpkg-vendor --derives-from Ubuntu && echo "yes") export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--allow-multiple-definition - %: dh $@ @@ -20,6 +19,13 @@ override_dh_auto_build: override_dh_install-arch: dh_install + rm -f $(CURDIR)/debian/foomatic-filters/usr/lib/cups/filter/foomatic-rip + cp -p $(CURDIR)/debian/foomatic-filters/usr/bin/foomatic-rip $(CURDIR)/debian/foomatic-filters/usr/lib/cups/filter/foomatic-rip + rm -f $(CURDIR)/debian/foomatic-filters/usr/lib/ppr/interfaces/foomatic-rip + rm -f $(CURDIR)/debian/foomatic-filters/usr/lib/ppr/lib/foomatic-rip + cp -p $(CURDIR)/debian/foomatic-filters/usr/bin/foomatic-rip $(CURDIR)/debian/foomatic-filters/usr/lib/ppr/interfaces/foomatic-rip + cp -p $(CURDIR)/debian/foomatic-filters/usr/bin/foomatic-rip $(CURDIR)/debian/foomatic-filters/usr/lib/ppr/lib/foomatic-rip + rm -f $(CURDIR)/debian/foomatic-filters/etc/foomatic/filter.conf* cp -p $(CURDIR)/debian/parseconfig.pl $(CURDIR)/debian/foomatic-filters/usr/share/foomatic chmod +x $(CURDIR)/debian/foomatic-filters/usr/share/foomatic/parseconfig.pl -- cgit v1.2.3 From d8e8b27518359014c3a7ad5a65988a1b16490cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 16:40:57 +0200 Subject: Add Rules-Requires-Root --- debian/changelog | 2 ++ debian/control | 1 + debian/foomatic-filters-beh.install | 2 +- debian/foomatic-filters-beh.preinst | 11 ----------- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 debian/foomatic-filters-beh.preinst diff --git a/debian/changelog b/debian/changelog index cc8a868..2d5194f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium - debian/patches/0600-spelling-errors.diff. * Fix lintian breakout-link warning: - debian/rules: remove links with copys. + * debian/control: + - Add Rules-Requires-Root. -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 diff --git a/debian/control b/debian/control index 7e93714..04dbb2e 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Homepage: https://wiki.linuxfoundation.org/openprinting/start Vcs-Git: git://jff.email/opt/git/foomatic-filters.git Vcs-Browser: https://jff.email/cgit/foomatic-filters.git Standards-Version: 4.5.0 +Rules-Requires-Root: no Package: foomatic-filters Architecture: any diff --git a/debian/foomatic-filters-beh.install b/debian/foomatic-filters-beh.install index 46abf84..3614b39 100644 --- a/debian/foomatic-filters-beh.install +++ b/debian/foomatic-filters-beh.install @@ -1,2 +1,2 @@ -usr/lib/cups/backend/beh usr/libexec/cups/backend/ +usr/lib/cups/backend/beh usr/lib/cups/backend/ diff --git a/debian/foomatic-filters-beh.preinst b/debian/foomatic-filters-beh.preinst deleted file mode 100644 index e416e2e..0000000 --- a/debian/foomatic-filters-beh.preinst +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -e - -case "$1" in - upgrade) - # remove beh from old directory - rm -f usr/lib/cups/backend/beh -esac - - -#DEBHELPER# -- cgit v1.2.3 From 4edaecb7040a03f8d7a90e7191472da6adc06e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 22 Aug 2020 16:42:51 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d5194f..5f693b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium +foomatic-filters (4.0.17-12) unstable; urgency=medium * debian/rules: - Add export DEB_LDFLAGS_MAINT_APPEND to fix the ld error @@ -15,7 +15,7 @@ foomatic-filters (4.0.17-12) UNRELEASED; urgency=medium * debian/control: - Add Rules-Requires-Root. - -- Jörg Frings-Fürst Sat, 22 Aug 2020 14:36:15 +0200 + -- Jörg Frings-Fürst Sat, 22 Aug 2020 16:42:10 +0200 foomatic-filters (4.0.17-11) unstable; urgency=medium -- cgit v1.2.3