~ubuntu-branches/ubuntu/lucid/cups-pdf/lucid-updates

« back to all changes in this revision

Viewing changes to debian/patches/50_default_conf.patch

  • Committer: Bazaar Package Importer
  • Author(s): Till Kamppeter
  • Date: 2008-06-11 09:49:55 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20080611094955-7ena6x74qxqjenfk
Tags: 2.4.7-3ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/postinst, debian/prerm: Let PDF print queue being created
    automatically when installing the package and being removed
    automatically when uninstalling the package.
* debian/patches/10_auto_assign_ppd.patch: Removed, applied upstream.
* debian/patches/01_mkdir_as_user.patch: Removed, applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff -Nur cups-pdf-2.4.6/extra/cups-pdf.conf cups-pdf-2.4.6.new/extra/cups-pdf.conf
2
 
--- cups-pdf-2.4.6/extra/cups-pdf.conf  2007-05-04 12:54:49.000000000 +0100
3
 
+++ cups-pdf-2.4.6.new/extra/cups-pdf.conf      2007-10-03 19:12:33.000000000 +0100
 
1
diff -Nur cups-pdf-2.4.7/extra/cups-pdf.conf cups-pdf-2.4.7.new/extra/cups-pdf.conf
 
2
--- cups-pdf-2.4.7/extra/cups-pdf.conf  2007-05-04 12:54:49.000000000 +0100
 
3
+++ cups-pdf-2.4.7.new/extra/cups-pdf.conf      2007-10-03 19:12:33.000000000 +0100
4
4
@@ -40,7 +40,7 @@
5
5
 ##  root_squash! 
6
6
 ### Default: /var/spool/cups-pdf/${USER}