r32092 - in /desktop/unstable/gconf/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Dec 15 00:14:01 2011
New Revision: 32092

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32092
Log:
Remove obsolete Conflicts and Replaces

Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/control
    desktop/unstable/gconf/debian/control.in

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=32092&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Dec 15 00:14:01 2011
@@ -1,6 +1,9 @@
 gconf (3.2.3-2) UNRELEASED; urgency=low
 
-  * debian/libgconf2-dev.install: Remove libtool .la files.
+  * debian/libgconf2-dev.install:
+    - Remove libtool .la files.
+  * debian/control.in:
+    - Remove obsolete Conflicts and Replaces.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 15 Dec 2011 01:09:39 +0100
 

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=32092&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Thu Dec 15 00:14:01 2011
@@ -45,7 +45,6 @@
          ${python:Depends}
 Recommends: libgtk-3-0
 Suggests: gconf-defaults-service
-Conflicts: libgconf2-4 (<< 2.12.0-2)
 Description: GNOME configuration database system (support tools)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the
@@ -61,7 +60,6 @@
 Depends: ${misc:Depends},
          dbus,
          ucf
-Replaces: gconf2 (<< 2.12.0-2)
 Description: GNOME configuration database system (common files)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the
@@ -115,8 +113,7 @@
          libglib2.0-dev (>= 2.25.9),
          libdbus-1-dev (>= 1.0.0),
          gconf2 (= ${binary:Version})
-Replaces: gconf2 (<< 2.12.0-2), 
-          gir-repository-dev (<< 0.6.5-7)
+Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: GNOME configuration database system (development)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=32092&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Thu Dec 15 00:14:01 2011
@@ -40,7 +40,6 @@
          ${python:Depends}
 Recommends: libgtk-3-0
 Suggests: gconf-defaults-service
-Conflicts: libgconf2-4 (<< 2.12.0-2)
 Description: GNOME configuration database system (support tools)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the
@@ -56,7 +55,6 @@
 Depends: ${misc:Depends},
          dbus,
          ucf
-Replaces: gconf2 (<< 2.12.0-2)
 Description: GNOME configuration database system (common files)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the
@@ -110,8 +108,7 @@
          libglib2.0-dev (>= 2.25.9),
          libdbus-1-dev (>= 1.0.0),
          gconf2 (= ${binary:Version})
-Replaces: gconf2 (<< 2.12.0-2), 
-          gir-repository-dev (<< 0.6.5-7)
+Replaces: gir-repository-dev (<< 0.6.5-7)
 Description: GNOME configuration database system (development)
  GConf is a configuration database system for storing application
  preferences. It supports default or mandatory settings set by the