r13598 - in /desktop/unstable: gconfmm2.6/debian/ glibmm2.4/debian/ gnome-vfsmm2.6/debian/ libglademm2.4/debian/ libgnomecanvasmm2.6/debian/ libgnomemm2.6/debian/ libgnomeuimm2.6/debian/

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Mon Nov 26 17:23:17 UTC 2007


Author: manphiz-guest
Date: Mon Nov 26 17:23:17 2007
New Revision: 13598

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13598
Log:
Use Conflicts and Replaces to handle file moving in control file, and mention in corresponding changelog.

Modified:
    desktop/unstable/gconfmm2.6/debian/changelog
    desktop/unstable/gconfmm2.6/debian/control
    desktop/unstable/gconfmm2.6/debian/control.in
    desktop/unstable/glibmm2.4/debian/changelog
    desktop/unstable/glibmm2.4/debian/control
    desktop/unstable/glibmm2.4/debian/control.in
    desktop/unstable/gnome-vfsmm2.6/debian/changelog
    desktop/unstable/gnome-vfsmm2.6/debian/control
    desktop/unstable/gnome-vfsmm2.6/debian/control.in
    desktop/unstable/libglademm2.4/debian/changelog
    desktop/unstable/libglademm2.4/debian/control
    desktop/unstable/libglademm2.4/debian/control.in
    desktop/unstable/libgnomecanvasmm2.6/debian/changelog
    desktop/unstable/libgnomecanvasmm2.6/debian/control
    desktop/unstable/libgnomecanvasmm2.6/debian/control.in
    desktop/unstable/libgnomemm2.6/debian/changelog
    desktop/unstable/libgnomemm2.6/debian/control
    desktop/unstable/libgnomemm2.6/debian/control.in
    desktop/unstable/libgnomeuimm2.6/debian/changelog
    desktop/unstable/libgnomeuimm2.6/debian/control
    desktop/unstable/libgnomeuimm2.6/debian/control.in

Modified: desktop/unstable/gconfmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconfmm2.6/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/gconfmm2.6/debian/changelog (original)
+++ desktop/unstable/gconfmm2.6/debian/changelog Mon Nov 26 17:23:17 2007
@@ -2,11 +2,11 @@
 
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
-    + Use Replaces: instead of Conflicts: to describe file overwriting,
-      which might causes breakage when upgrading. Hence the urgency.
+    + Add Replaces: to handle file moving together with Conflicts:,
+      without which might causes breakage when upgrading. Hence the urgency.
       (Closes: #452142)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 11:48:43 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:16:34 +0800
 
 gconfmm2.6 (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/gconfmm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconfmm2.6/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/gconfmm2.6/debian/control (original)
+++ desktop/unstable/gconfmm2.6/debian/control Mon Nov 26 17:23:17 2007
@@ -49,6 +49,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libgconfmm-2.6-dev (<< 2.20.0-1)
 Replaces: libgconfmm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for GConf (documentation)
  GConf is a system for storing application preferences.  gconfmm is

Modified: desktop/unstable/gconfmm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconfmm2.6/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/gconfmm2.6/debian/control.in (original)
+++ desktop/unstable/gconfmm2.6/debian/control.in Mon Nov 26 17:23:17 2007
@@ -49,6 +49,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libgconfmm-2.6-dev (<< 2.20.0-1)
 Replaces: libgconfmm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for GConf (documentation)
  GConf is a system for storing application preferences.  gconfmm is

Modified: desktop/unstable/glibmm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/changelog (original)
+++ desktop/unstable/glibmm2.4/debian/changelog Mon Nov 26 17:23:17 2007
@@ -2,15 +2,15 @@
 
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
-    + Use Replaces: instead of Conflicts: to describe file overwriting,
-      which might causes breakage when upgrading. Hence the urgency.
+    + Add Replaces: to handle file moving together with Conflicts:,
+      without which might causes breakage when upgrading. Hence the urgency.
       (Closes: 452135)
   * debian/patches
     + Rename 99_relibtoolize.patch to 70_relibtoolize for consistency.
     + Add 10_gcc4.3_include_fix.patch to fix FTBFS with gcc 4.3.
       (Closes: 452082)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 11:45:28 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:18:00 +0800
 
 glibmm2.4 (2.14.2-1) unstable; urgency=low
 

Modified: desktop/unstable/glibmm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control (original)
+++ desktop/unstable/glibmm2.4/debian/control Mon Nov 26 17:23:17 2007
@@ -69,6 +69,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libglibmm-2.4-dev (<< 2.14.1-1)
 Replaces: libglibmm-2.4-dev (<< 2.14.1-1)
 Description: C++ wrapper for the GLib toolkit (documentation)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME

Modified: desktop/unstable/glibmm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glibmm2.4/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/glibmm2.4/debian/control.in (original)
+++ desktop/unstable/glibmm2.4/debian/control.in Mon Nov 26 17:23:17 2007
@@ -69,6 +69,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libglibmm-2.4-dev (<< 2.14.1-1)
 Replaces: libglibmm-2.4-dev (<< 2.14.1-1)
 Description: C++ wrapper for the GLib toolkit (documentation)
  GLib is a low-level general-purpose library used mainly by GTK+/GNOME

Modified: desktop/unstable/gnome-vfsmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfsmm2.6/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/gnome-vfsmm2.6/debian/changelog (original)
+++ desktop/unstable/gnome-vfsmm2.6/debian/changelog Mon Nov 26 17:23:17 2007
@@ -2,11 +2,11 @@
 
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
-    + Use Replaces: instead of Conflicts: to describe file overwriting,
-      which might causes breakage when upgrading. Hence the urgency.
+    + Add Replaces: to handle file moving together with Conflicts:,
+      without which might causes breakage when upgrading. Hence the urgency.
       (Closes: 452138)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 11:47:07 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:15:38 +0800
 
 gnome-vfsmm2.6 (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-vfsmm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfsmm2.6/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/gnome-vfsmm2.6/debian/control (original)
+++ desktop/unstable/gnome-vfsmm2.6/debian/control Mon Nov 26 17:23:17 2007
@@ -48,6 +48,7 @@
 Depends: ${misc:Depends},
          doc-base,
          lynx | www-browser
+Conflicts: libgnome-vfsmm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnome-vfsmm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for GnomeVFS (documentation)
  GnomeVFS is the GNOME filesystem abstraction library. Gnome-vfsmm is

Modified: desktop/unstable/gnome-vfsmm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfsmm2.6/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/gnome-vfsmm2.6/debian/control.in (original)
+++ desktop/unstable/gnome-vfsmm2.6/debian/control.in Mon Nov 26 17:23:17 2007
@@ -48,6 +48,7 @@
 Depends: ${misc:Depends},
          doc-base,
          lynx | www-browser
+Conflicts: libgnome-vfsmm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnome-vfsmm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for GnomeVFS (documentation)
  GnomeVFS is the GNOME filesystem abstraction library. Gnome-vfsmm is

Modified: desktop/unstable/libglademm2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/changelog (original)
+++ desktop/unstable/libglademm2.4/debian/changelog Mon Nov 26 17:23:17 2007
@@ -2,13 +2,13 @@
 
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
-    + Add Replaces: field in -doc with -dev << 2.6.5-1 for file overwriting,
-      without which might causes breakage when upgrading. Hence the urgency.
-      (Closes: #452161)
+    + Add Replaces: and Conflicts: field with -dev << 2.6.5-1 in -doc to 
+      handle file moving, without which might causes breakage when upgrading.
+      Hence the urgency. (Closes: #452161)
   * debian/patches
     + Rename 99_relibtoolize.patch to 70_relibtoolize.patch for consistency.
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 11:54:53 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:04:27 +0800
 
 libglademm2.4 (2.6.5-1) unstable; urgency=low
 

Modified: desktop/unstable/libglademm2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/control (original)
+++ desktop/unstable/libglademm2.4/debian/control Mon Nov 26 17:23:17 2007
@@ -63,6 +63,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc, libglademm-2.4-dev
+Conflicts: libglademm-2.4-dev (<< 2.6.5-1)
 Replaces: libglademm-2.4-dev (<< 2.6.5-1)
 Description: C++ wrappers for libglade2 (documentation)
  Libglade is a library which enables an application to build its graphical

Modified: desktop/unstable/libglademm2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libglademm2.4/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libglademm2.4/debian/control.in (original)
+++ desktop/unstable/libglademm2.4/debian/control.in Mon Nov 26 17:23:17 2007
@@ -63,6 +63,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libglibmm-2.4-doc, libgtkmm-2.4-doc, libglademm-2.4-dev
+Conflicts: libglademm-2.4-dev (<< 2.6.5-1)
 Replaces: libglademm-2.4-dev (<< 2.6.5-1)
 Description: C++ wrappers for libglade2 (documentation)
  Libglade is a library which enables an application to build its graphical

Modified: desktop/unstable/libgnomecanvasmm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvasmm2.6/debian/changelog (original)
+++ desktop/unstable/libgnomecanvasmm2.6/debian/changelog Mon Nov 26 17:23:17 2007
@@ -2,11 +2,11 @@
 
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
-    + Use Replaces: instead of Conflicts: to describe file overwriting,
-      which might causes breakage when upgrading. Hence the urgency.
+    + Add Replaces: to handle file moving together with Conflicts:,
+      without which might causes breakage when upgrading. Hence the urgency.
       (Closes: 452157)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 11:42:38 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:18:54 +0800
 
 libgnomecanvasmm2.6 (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/libgnomecanvasmm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvasmm2.6/debian/control (original)
+++ desktop/unstable/libgnomecanvasmm2.6/debian/control Mon Nov 26 17:23:17 2007
@@ -49,6 +49,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libgnomecanvasmm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnomecanvasmm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for libgnomecanvas2 (documentation)
  libgnomecanvas is a high-level, structured graphics

Modified: desktop/unstable/libgnomecanvasmm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomecanvasmm2.6/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomecanvasmm2.6/debian/control.in (original)
+++ desktop/unstable/libgnomecanvasmm2.6/debian/control.in Mon Nov 26 17:23:17 2007
@@ -49,6 +49,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libgnomecanvasmm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnomecanvasmm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for libgnomecanvas2 (documentation)
  libgnomecanvas is a high-level, structured graphics

Modified: desktop/unstable/libgnomemm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/changelog (original)
+++ desktop/unstable/libgnomemm2.6/debian/changelog Mon Nov 26 17:23:17 2007
@@ -2,11 +2,11 @@
 
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
-    + Use Replaces: instead of Conflicts: to describe file overwriting,
-      which might causes breakage when upgrading. Hence the urgency.
+    + Add Replaces: to handle file moving together with Conflicts:,
+      without which might causes breakage when upgrading. Hence the urgency.
       (Closes: 452131)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 11:44:05 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:19:43 +0800
 
 libgnomemm2.6 (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/libgnomemm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/control (original)
+++ desktop/unstable/libgnomemm2.6/debian/control Mon Nov 26 17:23:17 2007
@@ -52,6 +52,7 @@
 Depends: ${misc:Depends},
          doc-base,
          lynx | www-browser
+Conflicts: libgnomemm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnomemm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for libgnome (documentation)
  Gnomemm is a powerful C++ binding for the GNOME libraries.

Modified: desktop/unstable/libgnomemm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomemm2.6/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomemm2.6/debian/control.in (original)
+++ desktop/unstable/libgnomemm2.6/debian/control.in Mon Nov 26 17:23:17 2007
@@ -52,6 +52,7 @@
 Depends: ${misc:Depends},
          doc-base,
          lynx | www-browser
+Conflicts: libgnomemm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnomemm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for libgnome (documentation)
  Gnomemm is a powerful C++ binding for the GNOME libraries.

Modified: desktop/unstable/libgnomeuimm2.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeuimm2.6/debian/changelog?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomeuimm2.6/debian/changelog (original)
+++ desktop/unstable/libgnomeuimm2.6/debian/changelog Mon Nov 26 17:23:17 2007
@@ -3,11 +3,11 @@
   * debian/control, debian/control.in
     + Add Homepage, Vcs-Browser and Vcs-Svn entries.
     + Fix wrong fields in -doc.
-    + Add Replaces: field in -doc with -dev << 2.20.0-1 for file overwriting,
-      without which might causes breakage when upgrading. Hence the urgency.
-      (Closes: #452158)
+    + Add Replaces: and Conflicts: field with -dev << 2.20.0-1 in -doc to
+      handle file moving, without which might causes breakage when upgrading.
+      Hence the urgency. (Closes: #452158)
 
- -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Wed, 21 Nov 2007 12:02:19 +0800
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org>  Tue, 27 Nov 2007 01:20:05 +0800
 
 libgnomeuimm2.6 (2.20.0-1) unstable; urgency=low
 

Modified: desktop/unstable/libgnomeuimm2.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeuimm2.6/debian/control?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomeuimm2.6/debian/control (original)
+++ desktop/unstable/libgnomeuimm2.6/debian/control Mon Nov 26 17:23:17 2007
@@ -57,6 +57,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libgnomeuimm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnomeuimm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for libgnomeui (documentation)
  libgnomeui is the library for the GNOME user interface

Modified: desktop/unstable/libgnomeuimm2.6/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomeuimm2.6/debian/control.in?rev=13598&op=diff
==============================================================================
--- desktop/unstable/libgnomeuimm2.6/debian/control.in (original)
+++ desktop/unstable/libgnomeuimm2.6/debian/control.in Mon Nov 26 17:23:17 2007
@@ -57,6 +57,7 @@
          doc-base,
          lynx | www-browser
 Suggests: libgtkmm-2.4-doc
+Conflicts: libgnomeuimm-2.6-dev (<< 2.20.0-1)
 Replaces: libgnomeuimm-2.6-dev (<< 2.20.0-1)
 Description: C++ wrappers for libgnomeui (documentation)
  libgnomeui is the library for the GNOME user interface




More information about the pkg-gnome-commits mailing list