[Pkg-cups-devel] r109 - cupsys/branches/cups-1.2/debian

[Kenshi Muto]

Author: kmuto
Date: Sun Jan 22 13:34:20 2006
New Revision: 109

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/control
Log:
libcupsys2 should conflict with cups 1.1 series

Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Sun Jan 22 13:34:20 2006
@@ -3,6 +3,7 @@
   [ Kenshi Muto ]
   * debian/postinst:
     - Fix value extract code of $VAL.
+  * libcupsys2 should conflict with cups 1.1 series. (closes: #349341)
 
   [ Martin Pitt ]
   * New SVN release taken from r4892.

Modified: cupsys/branches/cups-1.2/debian/control
==============================================================================
--- cupsys/branches/cups-1.2/debian/control	(original)
+++ cupsys/branches/cups-1.2/debian/control	Sun Jan 22 13:34:20 2006
@@ -55,7 +55,7 @@
 Depends: ${shlibs:Depends}
 Provides: libcupsys2-gnutls10
 Replaces: cupsys-client (<= 1.1.10-2), libcupsys2-gnutls10 (<= 1.1.23-11)
-Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11)
+Conflicts: gs-esp (<< 7.05.6-2), cupsys-driver-gimpprint (<< 4.2.5-3), libcupsys2-gnutls10 (<= 1.1.23-11), cupsys (<< 1.1.99.b1)
 Description: Common UNIX Printing System(tm) - libs
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet