r37829 - in /desktop/unstable/pango1.0/debian: changelog control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu May 23 13:49:43 2013
New Revision: 37829

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37829
Log:
Use Breaks instead of Conflicts since that is recommended nowadays for
moving files between packages.

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/control.in

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=37829&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog [utf-8] Thu May 23 13:49:43 2013
@@ -1,3 +1,10 @@
+pango1.0 (1.32.5-6) UNRELEASED; urgency=low
+
+  * Use Breaks instead of Conflicts since that is recommended nowadays for
+    moving files between packages.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 23 May 2013 03:19:43 +0200
+
 pango1.0 (1.32.5-5) unstable; urgency=low
 
   * Upload to unstable.

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=37829&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in [utf-8] Thu May 23 13:49:43 2013
@@ -68,9 +68,9 @@
           ttf-arphic-bsmi00lp,
           ttf-arphic-gkai00mp,
           ttf-arphic-bkai00mp
-Conflicts: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
-Breaks: plymouth (<< 0.8.3-19)
+Breaks:  libpango1.0-0 (<< 1.32.5-2),
+         plymouth (<< 0.8.3-19)
 Provides: @PANGO_MODVER_DEP@
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -94,7 +94,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libpango1.0-0 (<< 1.32.5-2)
+Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -118,7 +118,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libpango1.0-0 (<< 1.32.5-2)
+Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -142,7 +142,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libpango1.0-0 (<< 1.32.5-2)
+Breaks: libpango1.0-0 (<< 1.32.5-2)
 Replaces: libpango1.0-0 (<< 1.32.5-2)
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same