[Pkg-cups-devel] r653 - in cupsys/branches/cups-1.2-ubuntu: . debian

[Martin Pitt]

Author: mpitt
Date: Tue Dec 11 08:50:55 2007
New Revision: 653

Log:
merge from 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

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 Dec 11 08:50:55 2007
@@ -1,8 +1,5 @@
 cupsys (1.3.4-2ubuntu3) UNRELEASED; urgency=low
 
-  * debian/control: Let the cupsys package recommend avahi-daemon, together
-    with this package CUPS does mDNS/DNS-SD broadcasts and so the shared 
-    printers get visible for Mac OS X clients.
   * debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch:
     CUPS stopped broadcasting on a HUP signal when using a fixed
     BrowseAddress (CUPS STR #2618, LP: #173470).

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 Dec 11 08:50:55 2007
@@ -54,7 +54,7 @@
 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, avahi-utils, avahi-daemon
+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, cups-pdf
 Description: Common UNIX Printing System(tm) - server
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and