[Pkg-cups-devel] r635 - in cupsys/branches/cups-1.2-ubuntu: . debian debian/local/backends

Martin Pitt mpitt at alioth.debian.org
Fri Nov 30 18:14:25 UTC 2007


Author: mpitt
Date: Fri Nov 30 18:14:25 2007
New Revision: 635

Log:
merge to trunk

Modified:
   cupsys/branches/cups-1.2-ubuntu/   (props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
   cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
   cupsys/branches/cups-1.2-ubuntu/debian/local/backends/dnssd   (contents, props changed)
   cupsys/branches/cups-1.2-ubuntu/debian/rules

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	Fri Nov 30 18:14:25 2007
@@ -1,11 +1,63 @@
-cupsys (1.3.4-1ubuntu5) UNRELEASED; urgency=low
+cupsys (1.3.4-2ubuntu1) UNRELEASED; urgency=low
 
+  * Merge with Debian unstable. Remaining Ubuntu changes:
+    - TearDown (fast shutdown):
+      + debian/control: Add sysv-rc (>= 2.86.ds1-14.1ubuntu2) dependency.
+      + debian/rules: Use 'multiuser' update-rc.d mode.
+    - debian/control, debian/rules: Drop cupsys-dbg package.
+    - debian/cupsys.{pre,post}inst, debian/cupsys.preinst: Various upgrade
+      fixes that need to be kept until after the next LTS:
+      + Revert to single cupsd.conf file.
+      + Remove obsolete rc.d links.
+      + Revert usr/share/doc symlink/directory breakage.
+    - debian/patches/ubuntu-default-error-policy-retry-job.dpatch: Retry a
+      failed job instead of stopping the print queue.
+    - debian/patches/ubuntu-disable-browsing.dpatch: Disable browsing by
+      default.
+    - Add AppArmor profile:
+      + debian/local/apparmor-profile
+      + debian/cupsys.postinst: Reload AA profile on configuration.
   * Revert most of the doc symlinking changes from 1.3.2-1ubuntu4, since
     Ubuntu's cdbs does it by default now. Clean up a few other pieces of
     Debian-Ubuntu delta noise along the way.
 
  -- Martin Pitt <martin.pitt at ubuntu.com>  Fri, 30 Nov 2007 17:38:42 +0100
 
+cupsys (1.3.4-2) unstable; urgency=low
+
+  [ Kenshi Muto ]
+  * Bumps up shlibs to 1.3.4.
+
+  [ Martin Pitt ]
+  * debian/control: Remove gs-esp alternative dependency, it's just
+    "ghostscript" nowadays.
+  * debian/control: Slightly bump the C/R: for -common; it's a pointless delta
+    to Ubuntu and it doesn't hurt us.
+  * debian/cupsys-bsd.postinst: Symlink cupsys-bsd's doc directory to
+    cupsys-common's, not cupsys', since the latter is not a dependency.
+  * debian/control: Demote cups-pdf from Recommends: to Suggests: to match the
+    semantics (apt installs recommends by default now).
+  * debian/cupsys.init.d: Add LSB header, thanks to Petter Reinholdtsen!
+    (closes: #337640)
+  * debian/rules: Configure with default printcap in /var/run/cups/.
+    (closes: #452446)
+
+  [ Till Kamppeter ]
+  * Add debian/local/backends/dnssd: Printer discovery backend for
+    several cheaper printers, like the HP Color LaserJet 2600n, are not
+    discovered by the "snmp" backend.  In addition, this backend extracts more
+    info from the printers than the "snmp" backend, like for example available
+    page description languages.  This leads to better driver choices for
+    unknown printer models.
+  * debian/cupsys.install, debian/cupsys.{prerm,postinst,templates,rules}:
+    Install new backend.
+  * debian/control: Add Recommends: to avahi-utils; if it is installed, the
+    dnssd backend can actually work.
+  * debian/postinst: Activate new backends (since Etch) by default on
+    upgrades. This affects snmp, scsi, serial, and dnssd.
+
+ -- Martin Pitt <mpitt at debian.org>  Fri, 30 Nov 2007 18:42:15 +0100
+
 cupsys (1.3.4-1ubuntu4) hardy; urgency=low
 
   * correct Replaces line in cupsys-common to make dapper->hardy 

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	Fri Nov 30 18:14:25 2007
@@ -55,7 +55,7 @@
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: cupsys-client, smbclient (>= 3.0.9), foomatic-filters, avahi-utils
-Suggests: cupsys-bsd, cupsys-driver-gutenprint, foomatic-filters-ppds, hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified
+Suggests: cupsys-bsd, cupsys-driver-gutenprint, foomatic-filters-ppds, hplip, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf
 Description: Common UNIX Printing System(tm) - server
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	Fri Nov 30 18:14:25 2007
@@ -1,4 +1,15 @@
 #! /bin/sh
+### BEGIN INIT INFO
+# Provides:          cupsys
+# Required-Start:    $syslog
+# Required-Stop:     $syslog
+# Should-Start:      $network
+# Should-Stop:       $network
+# X-Start-Before:    samba
+# X-Stop-After:      samba
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/cupsd

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst	Fri Nov 30 18:14:25 2007
@@ -102,29 +102,20 @@
 	  fi
 	done
 	IFS=$save_IFS
-        db_fset cupsys/backend changed false
 
-        # In cupsys 1.2.8-0ubuntu3 the defaults for the active backends
-        # changed. snmp, scsi, and serial got added. So activate these
-        # backends.
-        if dpkg --compare-versions "$2" lt-nl "1.2.8-0ubuntu3"; then
-            for module in snmp scsi serial; do
-                [ -e /usr/lib/cups/backend/$module ] || \
-                ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
-            done
-        fi
-
-	# In cupsys 1.3.4-1ubuntu2 the "dnssd" backend got added
-	if dpkg --compare-versions "$2" lt-nl "1.3.4-1ubuntu2"; then
-	    for module in dnssd; do
-		[ -e /usr/lib/cups/backend/$module ] || \
-		ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
+	# activate new backends on upgrades
+	db_fset cupsys/backend changed false
+	
+	if dpkg --compare-versions "$2" lt-nl "1.3.4-2"; then
+	    for module in snmp scsi serial dnssd; do
+	        [ -e /usr/lib/cups/backend/$module ] || \
+	        ln /usr/lib/cups/backend-available/$module /usr/lib/cups/backend/$module
 	    done
 	fi
-
-        # Resync Debconf database with real state
-        list=`( cd /usr/lib/cups/backend && for f in ipp lpd parallel scsi serial socket usb snmp dnssd; do [ -e $f ] && echo -n "$f, "; done ) | sed -e 's/, $//'`
-        db_set cupsys/backend $list;
+	
+	# Resync Debconf database with real state
+	list=`( cd /usr/lib/cups/backend && for f in ipp lpd parallel scsi serial socket usb snmp dnssd; do [ -e $f ] && echo -n "$f, "; done ) | sed -e 's/, $//'`
+	db_set cupsys/backend $list;
 
 	if [ -f /etc/cups/classes.conf ]; then
 	  chown root:lp /etc/cups/classes.conf ; chmod 600 /etc/cups/classes.conf

Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs	Fri Nov 30 18:14:25 2007
@@ -1 +1 @@
-libcups 2 libcupsys2 (>= 1.3.0)
+libcups 2 libcupsys2 (>= 1.3.4)

Modified: cupsys/branches/cups-1.2-ubuntu/debian/local/backends/dnssd
==============================================================================

Modified: cupsys/branches/cups-1.2-ubuntu/debian/rules
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/rules	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/rules	Fri Nov 30 18:14:25 2007
@@ -18,7 +18,7 @@
 
 unpatch: deapply-dpatches
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --enable-gssapi --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin
+DEB_CONFIGURE_EXTRA_FLAGS := --with-optim=$(DEB_OPTFLAGS) --libdir=/usr/lib --mandir=/usr/share/man --with-docdir=/usr/share/cups/doc-root --localedir=/usr/share/cups/locale --enable-slp --enable-libpaper --enable-ssl --enable-gnutls --disable-openssl --enable-threads --enable-static --enable-dbus --enable-gssapi --disable-pdftops --disable-launchd --with-cups-group=lp --with-system-groups=lpadmin --with-printcap=/var/run/cups/printcap
 DEB_MAKE_INSTALL_TARGET := install BUILDROOT=$(DEB_DESTDIR)
 DEB_INSTALL_CHANGELOGS_ALL := CHANGES.txt
 DEB_DH_INSTALLINIT_ARGS := -u'multiuser 19'
@@ -27,6 +27,11 @@
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 LDFLAGS := -Wl,--as-needed
 
+common-post-build-arch::
+	# Fix permissions of filters/backends installed from debian/local/
+	chmod 755 debian/local/filters/*
+	chmod 755 debian/local/backends/*
+
 clean::
 	rm -f man/client.conf.man packaging/cups.list
 	rm -f conf/mime.convs conf/snmp.conf init/org.cups.cups-lpd.plist
@@ -54,10 +59,6 @@
 	# the system-config-printer applet
 	install -D -m 644 packaging/cups-dbus.conf $(DEB_DESTDIR)/../cupsys/etc/dbus-1/system.d/cups.conf
 
-	# Fix permissions of filters/backends installed from debian/local/
-	chmod 755 debian/cupsys/usr/lib/cups/filter/*
-	chmod 755 debian/cupsys/usr/lib/cups/backend*/*
-
 	# install AppArmor profile
 	install -D -m 644 debian/local/apparmor-profile $(DEB_DESTDIR)/../cupsys/etc/apparmor.d/usr.sbin.cupsd
 



More information about the Pkg-cups-devel mailing list