Change handling of ps_accounting

3 files changed, 8 insertions, 24 deletions

diff --git a/debian/changelog b/debian/changelog
index 2e6a04f..1a6cbc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 foomatic-filters (4.0.17-8) UNRELEASED; urgency=medium
 
-  * Move beh to the new packackage foomatic-filters-beh.
+  * Move beh to the new package foomatic-filters-beh (Closes: #799259).
   * debian/control:
     - Bump Standards-Version to 3.9.7 (no changes required).
     - Change Vcs-* to secure protocol.
@@ -12,6 +12,10 @@ foomatic-filters (4.0.17-8) UNRELEASED; urgency=medium
   * debian/rules:
     - Enable hardening.
     - Add overrides_dh_install-arch and -indep.
+  * Change handling of ps_accounting because debian stable has version 4.0.17.
+    - Move debian/foomatic-filters.postinst.in debian/foomatic-filters.postinst.
+      + Remove the version if query.
+    - debian/rules: Remove the foomatic-filters.postinst.in handling.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 13 Feb 2016 23:56:21 +0100
 
diff --git a/debian/foomatic-filters.postinst.in b/debian/foomatic-filters.postinst
index 2a5d21d..3387d5a 100644
--- a/debian/foomatic-filters.postinst.in
+++ b/debian/foomatic-filters.postinst
@@ -47,16 +47,9 @@ else
 	ps_accounting="ps_accounting: 0"
 fi
 
-# Since foomatic-filters #FF_PS_DEFAULT_CHANGE_VERSION# in #MOTHER_DISTRO#,
-# the default for inserting PostScript code for CUPS' page accounting changed.
-# This functionality is now activated by default as for problematic drivers it
-# can be deactivated individually.
-if dpkg --compare-versions "$2" lt-nl "#FF_PS_DEFAULT_CHANGE_VERSION#"; then
-	ps_accounting="ps_accounting: 1"
-	RET=true
-    db_set foomatic-filters/ps_accounting true
-fi
-
+ps_accounting="ps_accounting: 1"
+RET=true
+db_set foomatic-filters/ps_accounting true
 
 db_get foomatic-filters/spooler
 echo "$RET" >| /etc/foomatic/defaultspooler
diff --git a/debian/rules b/debian/rules
index 5fb5978..563c8db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,19 +25,6 @@ override_dh_install-arch:
 ifeq ($(derives_from_ubuntu),yes)
 	install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/foomatic-filters/usr/share/apport/package-hooks/source_foomatic-filters.py
 endif
-	
-	# Prepare the postinst with distro-specific versions
-	cp debian/foomatic-filters.postinst.in debian/foomatic-filters.postinst
-ifeq ($(derives_from_ubuntu),yes)
-	# We derive from Ubuntu, the ps_accounting default change was made in version 3.0.2-20070719-0ubuntu1
-	sed -i -e "s/#MOTHER_DISTRO#/Ubuntu/g" debian/foomatic-filters.postinst
-	sed -i -e "s/#FF_PS_DEFAULT_CHANGE_VERSION#/3.0.2-20070719-0ubuntu1/g" debian/foomatic-filters.postinst
-else
-	# We derive from Debian, the ps_accounting default change was made in version 4.0.5-1
-	sed -i -e "s/#MOTHER_DISTRO#/Debian/g" debian/foomatic-filters.postinst
-	sed -i -e "s/#FF_PS_DEFAULT_CHANGE_VERSION#/4.0.5-1/g" debian/foomatic-filters.postinst
-endif
-#	cp 111.111 333.333
 
 override_dh_install-indep:
 	dh_install