r25214 - in /packages/unstable/system-config-printer/debian: control control.in

[agx at users.alioth.debian.org]

Author: agx
Date: Tue Sep 28 10:23:38 2010
New Revision: 25214

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25214
Log:
Make system-config-printer conflict on hal-cups-utils

to help lenny->squeeze updates. Otherwise hal-cups-utils won't get
removed. See
http://lists.debian.org/debian-release/2010/09/msg00923.html for a
discussion.

Modified:
    packages/unstable/system-config-printer/debian/control
    packages/unstable/system-config-printer/debian/control.in

Modified: packages/unstable/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/control?rev=25214&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/control [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/control [utf-8] Tue Sep 28 10:23:38 2010
@@ -45,6 +45,7 @@
 Suggests: python-smbc,
           python-gnomekeyring,
           sessioninstaller
+Conflicts: hal-cups-utils
 Description: graphical interface to configure the printing system
  System-config-printer is a GUI written in Python using GTK+ to 
  configure a CUPS server. Its primary use is to configure the printing 

Modified: packages/unstable/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/control.in?rev=25214&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/control.in [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/control.in [utf-8] Tue Sep 28 10:23:38 2010
@@ -40,6 +40,7 @@
 Suggests: python-smbc,
           python-gnomekeyring,
           sessioninstaller
+Conflicts: hal-cups-utils
 Description: graphical interface to configure the printing system
  System-config-printer is a GUI written in Python using GTK+ to 
  configure a CUPS server. Its primary use is to configure the printing