summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <didier@raboud.com>2010-08-17 21:49:51 +0200
committerDidier Raboud <didier@raboud.com>2010-08-17 21:49:51 +0200
commited09a44b79bd9470e30bf559f603d5c19d35beb2 (patch)
tree237e04c07e3e2d22c834704fdc546417a3ce38cb
parent5a23f3299f7a4f90c24a8952b1129da5578f7ee7 (diff)
Correct postinst to remove the incorrect dpkg-vendor use (it lives in dpkg-dev).
-rw-r--r--debian/changelog7
-rw-r--r--debian/foomatic-filters.postinst5
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index ae87051..7aece26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+foomatic-filters (4.0.5-1) UNRELEASED; urgency=low
+
+ * Correct postinst to remove the incorrect dpkg-vendor use (it lives in
+ dpkg-dev).
+
+ -- Didier Raboud <didier@raboud.com> Tue, 17 Aug 2010 21:47:35 +0200
+
foomatic-filters (4.0.5-1~exp0) experimental; urgency=low
[ Till Kamppeter ]
diff --git a/debian/foomatic-filters.postinst b/debian/foomatic-filters.postinst
index 687523a..63578d1 100644
--- a/debian/foomatic-filters.postinst
+++ b/debian/foomatic-filters.postinst
@@ -47,12 +47,11 @@ else
ps_accounting="ps_accounting: 0"
fi
-# Since foomatic-filters 3.0.2-20070719-0ubuntu1 in Ubuntu and
-# since foomatic-filters 4.0.5-1 in Debian, the default for inserting
+# Since foomatic-filters 4.0.5-1 in Debian, 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 "4.0.5-1" || (dpkg --compare-versions "$2" lt-nl "3.0.2-20070719-0ubuntu1" && dpkg-vendor --derives-from Ubuntu); then
+if dpkg --compare-versions "$2" lt-nl "4.0.5-1" ; then
ps_accounting="ps_accounting: 1"
RET=true
db_set foomatic-filters/ps_accounting true