r24792 - in /desktop/unstable/gnome-desktop/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Jul 17 02:44:38 2010
New Revision: 24792

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24792
Log:
* debian/control.in
  - Remove ancient Conflicts/Replaces which are no longer relevant.

Modified:
    desktop/unstable/gnome-desktop/debian/changelog
    desktop/unstable/gnome-desktop/debian/control
    desktop/unstable/gnome-desktop/debian/control.in

Modified: desktop/unstable/gnome-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/changelog?rev=24792&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/changelog [utf-8] Sat Jul 17 02:44:38 2010
@@ -6,6 +6,8 @@
     - Add debian/patches/series.
     - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk from debian/rules.
     - Refresh debian/patches/99_ltmain_as-needed.patch.
+  * debian/control.in
+    - Remove ancient Conflicts/Replaces which are no longer relevant.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 17 Jul 2010 04:30:00 +0200
 

Modified: desktop/unstable/gnome-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/control?rev=24792&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/control [utf-8] Sat Jul 17 02:44:38 2010
@@ -41,9 +41,6 @@
          python-gnome2,
          python-cairo,
          gnome-desktop-data (= ${source:Version})
-Conflicts: gnome-core (<< 1.5),
-           gnome-desktop-data (<< 2.12)
-Replaces: gnome-desktop-data (<< 2.12)
 Description: The GNOME about box
  Informative little about thing that lets us brag to our friends as our name
  scrolls by, and lets users click to load the GNOME home pages.
@@ -51,13 +48,6 @@
 Package: gnome-desktop-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: gnome-panel (<= 2.0.0),
-           gnome-core (<< 1.5),
-           gnome-help (<< 1.5),
-           gnome-about (<< 2.20.0-2)
-Replaces: gnome-control-center (<= 1:2.0.3.2-2),
-          gnome-core (<= 1.5),
-          gnome-panel-data (<= 2.0)
 Description: Common files for GNOME desktop apps
  This package includes some files that are shared between several GNOME
  apps (Pixmaps, .desktop files and internationalization files).

Modified: desktop/unstable/gnome-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/control.in?rev=24792&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/control.in [utf-8] Sat Jul 17 02:44:38 2010
@@ -36,9 +36,6 @@
          python-gnome2,
          python-cairo,
          gnome-desktop-data (= ${source:Version})
-Conflicts: gnome-core (<< 1.5),
-           gnome-desktop-data (<< 2.12)
-Replaces: gnome-desktop-data (<< 2.12)
 Description: The GNOME about box
  Informative little about thing that lets us brag to our friends as our name
  scrolls by, and lets users click to load the GNOME home pages.
@@ -46,13 +43,6 @@
 Package: gnome-desktop-data
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: gnome-panel (<= 2.0.0),
-           gnome-core (<< 1.5),
-           gnome-help (<< 1.5),
-           gnome-about (<< 2.20.0-2)
-Replaces: gnome-control-center (<= 1:2.0.3.2-2),
-          gnome-core (<= 1.5),
-          gnome-panel-data (<= 2.0)
 Description: Common files for GNOME desktop apps
  This package includes some files that are shared between several GNOME
  apps (Pixmaps, .desktop files and internationalization files).