diff options
| author | Didier Raboud <didier@raboud.com> | 2010-07-19 16:33:30 +0200 |
|---|---|---|
| committer | Didier Raboud <didier@raboud.com> | 2010-07-19 16:33:30 +0200 |
| commit | d0bf50f69321527a9646fb93a3c63082499e82cb (patch) | |
| tree | ae2618ee32b73c37d9f20acdba503555ad4138cd | |
| parent | 05f115dd175ce9d6140afb91a3a5fa4af10c1820 (diff) | |
- Turn on the insertion of PostScript code for CUPS' page accounting by default (LP: #119403).
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/foomatic-filters.postinst | 12 | ||||
| -rw-r--r-- | debian/foomatic-filters.templates | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 07e8ac4..031c2b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ foomatic-filters (4.0.4-1) UNRELEASED; urgency=low × - Install the apport hook on Ubuntu - Merge the changelog entries. - Merge most package relationships. + - Merge package descriptions (Closes: #467380) + - Turn on the insertion of PostScript code for CUPS' page accounting by default + (LP: #119403). * s/cupsys/cups/ everywhere (Closes: #511748) diff --git a/debian/foomatic-filters.postinst b/debian/foomatic-filters.postinst index bc30bff..bebb8ca 100644 --- a/debian/foomatic-filters.postinst +++ b/debian/foomatic-filters.postinst @@ -45,6 +45,18 @@ else ps_accounting="ps_accounting: 0" fi +# Since foomatic-filters 3.0.2-20070719-0ubuntu1 in Ubuntu and +# since foomatic-filters 4.0.4-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.4-1" || (dpkg --compare-versions "$2" lt-nl "3.0.2-20070719-0ubuntu1" && dpkg-vendor --derives-from Ubuntu); then + ps_accounting="ps_accounting: 1" + RET=true + db_set foomatic-filters/ps_accounting true +fi + + db_get foomatic-filters/spooler echo "$RET" >| /etc/foomatic/defaultspooler diff --git a/debian/foomatic-filters.templates b/debian/foomatic-filters.templates index f841076..2408533 100644 --- a/debian/foomatic-filters.templates +++ b/debian/foomatic-filters.templates @@ -45,7 +45,7 @@ _Description: Command to convert standard input to PostScript: Template: foomatic-filters/ps_accounting Type: boolean -Default: false +Default: true _Description: Enable PostScript accounting for CUPS? You should choose this option if you want to insert PostScript code for accounting into each print job. This is currently only useful |