summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 21:22:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2020-08-24 21:22:05 +0200
commit1b05d872ce723d1c89abd1a88cd8f29035a42d49 (patch)
tree4a1a246517b186011aa7a0fae57e5ea53c18169e
parenta789bf1c1e51fe570c28a5d26c8fa14e646c468c (diff)
parent4edaecb7040a03f8d7a90e7191472da6adc06e98 (diff)
Merge branch 'release/debian/4.0.17-12' into masterdebian/4.0.17-12
-rw-r--r--debian/changelog19
-rw-r--r--debian/compat1
-rw-r--r--debian/control5
-rw-r--r--debian/foomatic-filters-beh.install2
-rw-r--r--debian/foomatic-filters.dirs2
-rw-r--r--debian/foomatic-filters.manpages2
-rw-r--r--debian/patches/0110-fixed-segfault-when-creating-logfile.patch1
-rw-r--r--debian/patches/0600-spelling-errors.diff1
-rwxr-xr-xdebian/rules8
9 files changed, 36 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index f0b37d2..5f693b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+foomatic-filters (4.0.17-12) unstable; urgency=medium
+
+ * 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).
+ * 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.
+ * Fix lintian breakout-link warning:
+ - debian/rules: remove links with copys.
+ * debian/control:
+ - Add Rules-Requires-Root.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sat, 22 Aug 2020 16:42:10 +0200
+
foomatic-filters (4.0.17-11) unstable; urgency=medium
* debian/changelog:
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 a531461..04dbb2e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Jörg Frings-Fürst <debian@jff.email>
Build-Depends:
autoconf,
- debhelper (>= 11),
+ debhelper-compat (= 13),
libcups2-dev,
libdbus-1-dev,
perl,
@@ -13,7 +13,8 @@ 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
+Rules-Requires-Root: no
Package: foomatic-filters
Architecture: any
diff --git a/debian/foomatic-filters-beh.install b/debian/foomatic-filters-beh.install
index b0a9549..3614b39 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/lib/cups/backend/
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/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 <till.kamppeter@gmail.com>
+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 <debian@jff-webhosting.net>
Reviewed-by:
+Forwarded: not needed
Last-Update: 2014-05-04
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/rules b/debian/rules
index 1a5c24d..7c52296 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ 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 $@
@@ -18,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