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

[Martin Pitt]

Author: mpitt
Date: Fri Sep 22 11:43:36 2006
New Revision: 382

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/control

Log:
* debian/control: Bump Conflicts/Replaces of cupsys-common to also apply to
  dapper-updates, to fix dapper-updates->edgy upgrade.

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 Sep 22 11:43:36 2006
@@ -1,3 +1,10 @@
+cupsys (1.2.3-1ubuntu3) UNRELEASED; urgency=low
+
+  * debian/control: Bump Conflicts/Replaces of cupsys-common to also apply to
+    dapper-updates, to fix dapper-updates->edgy upgrade.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Fri, 22 Sep 2006 13:37:04 +0200
+
 cupsys (1.2.3-1ubuntu2) edgy; urgency=low
 
   * debian/patches/56_dirsvc.dpatch: Update patch so that a patch/unpatch

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 Sep 22 11:43:36 2006
@@ -158,8 +158,8 @@
 Section: net
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: cupsys (<< 1.2.1-4)
-Replaces: cupsys (<< 1.2.1-4)
+Conflicts: cupsys (<< 1.2.3-1)
+Replaces: cupsys (<< 1.2.3-1)
 Description: Common UNIX Printing System(tm) - common files
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet