r13961 - in /desktop/unstable/libgnomecanvasmm2.6/debian: changelog control control.in

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Dec 18 17:20:47 2007
New Revision: 13961

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13961
Log:
* Wrap Conflicts and Replaces.

Modified:
    desktop/unstable/libgnomecanvasmm2.6/debian/changelog
    desktop/unstable/libgnomecanvasmm2.6/debian/control
    desktop/unstable/libgnomecanvasmm2.6/debian/control.in

Modified: desktop/unstable/libgnomecanvasmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6/debian/changelog?rev=13961&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvasmm2.6/debian/changelog (original)
+++ desktop/unstable/libgnomecanvasmm2.6/debian/changelog Tue Dec 18 17:20:47 2007
@@ -1,5 +1,6 @@
 libgnomecanvasmm2.6 (2.20.0-3) unstable; urgency=low
 
+  [ Deng Xiyue ]
   * debian/control, debian/control.in:
     + Bump standard version to 3.7.3. No change required.
     + Bump cdbs version to >= 0.4.41, reason given below.
@@ -31,6 +32,9 @@
   * debian/watch:
     + Use spaces instead of tabs when indent.
     (Thanks Loïc Minier for reviewing and the suggestions)
+
+  [ Loic Minier ]
+  * Wrap Conflicts and Replaces.
 
  -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Mon, 17 Dec 2007 16:58:06 +0800
 

Modified: desktop/unstable/libgnomecanvasmm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6/debian/control?rev=13961&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvasmm2.6/debian/control (original)
+++ desktop/unstable/libgnomecanvasmm2.6/debian/control Tue Dec 18 17:20:47 2007
@@ -34,8 +34,10 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgnomecanvasmm-2.6-1, libgnomecanvasmm-2.6-1c2
-Replaces: libgnomecanvasmm-2.6-1, libgnomecanvasmm-2.6-1c2
+Conflicts: libgnomecanvasmm-2.6-1,
+           libgnomecanvasmm-2.6-1c2
+Replaces: libgnomecanvasmm-2.6-1,
+          libgnomecanvasmm-2.6-1c2
 Description: C++ wrappers for libgnomecanvas2 (shared library)
  libgnomecanvas is a high-level, structured graphics
  library. libgnomecanvasmm is the C++ wrapper for libgnomecanvas.

Modified: desktop/unstable/libgnomecanvasmm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6/debian/control.in?rev=13961&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvasmm2.6/debian/control.in (original)
+++ desktop/unstable/libgnomecanvasmm2.6/debian/control.in Tue Dec 18 17:20:47 2007
@@ -34,8 +34,10 @@
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: libgnomecanvasmm-2.6-1, libgnomecanvasmm-2.6-1c2
-Replaces: libgnomecanvasmm-2.6-1, libgnomecanvasmm-2.6-1c2
+Conflicts: libgnomecanvasmm-2.6-1,
+           libgnomecanvasmm-2.6-1c2
+Replaces: libgnomecanvasmm-2.6-1,
+          libgnomecanvasmm-2.6-1c2
 Description: C++ wrappers for libgnomecanvas2 (shared library)
  libgnomecanvas is a high-level, structured graphics
  library. libgnomecanvasmm is the C++ wrapper for libgnomecanvas.