[Pkg-cups-devel] r577 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Tue Aug 21 05:31:18 2007
New Revision: 577

Log:
merge to trunk

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.files
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst

Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog	Tue Aug 21 05:31:18 2007
@@ -1,3 +1,27 @@
+cupsys (1.3.0-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge bugfixes from Debian.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 21 Aug 2007 07:30:37 +0200
+
+cupsys (1.3.0-3) unstable; urgency=low
+
+  [ Martin Pitt ]
+  * debian/control: Allow 'ghostscript' as alternative dependency to gs-esp.
+  * debian/cupsys.dirs: Create /usr/lib/cups/backend/ (regression from the big
+    debian/rules cleanup). (closes: #438432)
+  * debian/cupsys.preinst: Bump the version comparison for the file owner
+    cleanup, since some log files were still left as owned by 'cupsys' until
+    #437536 was fixed.
+  * debian/cupsys-common.files: Do not install the .po files, cups does not
+    use them at runtime. (closes: #438625)
+
+  [ Till Kamppeter ]
+  * debian/local/postscript.ppd: New generic PostScript PPD file for
+    unknown PostScript printers added.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 20 Aug 2007 16:23:58 +0200
+
 cupsys (1.3.0-2ubuntu2) gutsy; urgency=low
 
   * debian/local/postscript.ppd: New generic PostScript PPD file for

Modified: cupsys/branches/cups-1.2-ubuntu/debian/control
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/control	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/control	Tue Aug 21 05:31:18 2007
@@ -51,7 +51,7 @@
 Priority: optional
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, gs-esp, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
+Depends: ${shlibs:Depends}, debconf (>= 1.2.9) | debconf-2.0, poppler-utils | xpdf-utils, perl-modules, procps, ghostscript, lsb-base (>= 3), cupsys-common, ssl-cert (>= 1.0.11), adduser, sysv-rc (>= 2.86.ds1-14.1ubuntu2)
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.files
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.files	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys-common.files	Tue Aug 21 05:31:18 2007
@@ -1,3 +1,2 @@
 usr/share/cups/charsets
 usr/share/cups/charmaps
-usr/share/locale

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs	Tue Aug 21 05:31:18 2007
@@ -3,6 +3,7 @@
 usr/share/cups/drivers
 etc/default
 etc/cups/ssl
+usr/lib/cups/backend
 usr/lib/cups/backend-available
 var/cache/cups/ppd
 usr/share/ppd/cups-included

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.preinst	Tue Aug 21 05:31:18 2007
@@ -36,7 +36,7 @@
 	fi
 
         # fix 'cupsys' -> 'root' file owner mode transition
-	if dpkg --compare-versions "$2" lt-nl '1.2.12-2'; then
+	if dpkg --compare-versions "$2" lt-nl '1.3.0-3'; then
             chown -R root /etc/cups /var/log/cups /var/run/cups /var/cache/cups /var/spool/cups
         fi
     ;;