[Pkg-cups-devel] r772 - in cupsys/trunk: . debian

[Martin Pitt]

Author: mpitt
Date: Wed Apr 23 09:23:48 2008
New Revision: 772

Log:
* debian/control: Add appropriate Conflicts/Replaces to older cupsys-bsd
  which shipped daemon/cups-lpd. (Closes: #477392)

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/control

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Wed Apr 23 09:23:48 2008
@@ -2,8 +2,10 @@
 
   * debian/cupsys-bsd.install: Remove daemon/cups-lpd. It really does not
     belong into -bsd.
+  * debian/control: Add appropriate Conflicts/Replaces to older cupsys-bsd
+    which shipped daemon/cups-lpd. (Closes: #477392)
 
- -- Martin Pitt <mpitt at debian.org>  Wed, 23 Apr 2008 10:59:16 +0200
+ -- Martin Pitt <mpitt at debian.org>  Wed, 23 Apr 2008 11:00:41 +0200
 
 cupsys (1.3.7-4) unstable; urgency=high
 

Modified: cupsys/trunk/debian/control
==============================================================================
--- cupsys/trunk/debian/control	(original)
+++ cupsys/trunk/debian/control	Wed Apr 23 09:23:48 2008
@@ -63,8 +63,8 @@
  poppler-utils | xpdf-utils, perl-modules, procps, 
  ghostscript | gs-esp, lsb-base (>= 3), cupsys-common,  
  ssl-cert (>= 1.0.11), adduser
-Replaces: cupsys-pstoraster
-Conflicts: cupsys-pstoraster (<< 2)
+Replaces: cupsys-pstoraster, cupsys-bsd (<< 1.3.7-5)
+Conflicts: cupsys-pstoraster (<< 2), cupsys-bsd (<< 1.3.7-5)
 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,