r29302 - in /desktop/unstable/gnome-applets/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jul 31 21:43:09 2011
New Revision: 29302

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29302
Log:
* debian/control.in:
  - Remove old Conflicts/Replaces for trashapplet.

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

Modified: desktop/unstable/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/changelog?rev=29302&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/changelog [utf-8] Sun Jul 31 21:43:09 2011
@@ -7,6 +7,8 @@
 
   [ Michael Biebl ]
   * debian/watch: Track .bz2 tarballs.
+  * debian/control.in:
+    - Remove old Conflicts/Replaces for trashapplet.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 31 Jul 2011 23:40:11 +0200
 

Modified: desktop/unstable/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control?rev=29302&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control [utf-8] Sun Jul 31 21:43:09 2011
@@ -59,7 +59,6 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends}
-Replaces: trashapplet
 Description: Various applets for the GNOME panel - data files
  This package contains data files (pixmaps, icons, documentations) needed by
  the gnome-applets package.
@@ -76,10 +75,7 @@
          gstreamer0.10-plugins-good [kfreebsd-any],
          ${python:Depends},
          gvfs
-Conflicts: trashapplet
-Replaces: trashapplet,
-          gnome-applets-data (<< 2.30.0-4)
-Provides: trashapplet
+Replaces: gnome-applets-data (<< 2.30.0-4)
 Recommends: gnome-system-monitor,
             gnome-media,
             gnome-netstatus-applet,

Modified: desktop/unstable/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-applets/debian/control.in?rev=29302&op=diff
==============================================================================
--- desktop/unstable/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-applets/debian/control.in [utf-8] Sun Jul 31 21:43:09 2011
@@ -54,7 +54,6 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python:Depends}
-Replaces: trashapplet
 Description: Various applets for the GNOME panel - data files
  This package contains data files (pixmaps, icons, documentations) needed by
  the gnome-applets package.
@@ -71,10 +70,7 @@
          gstreamer0.10-plugins-good [kfreebsd-any],
          ${python:Depends},
          gvfs
-Conflicts: trashapplet
-Replaces: trashapplet,
-          gnome-applets-data (<< 2.30.0-4)
-Provides: trashapplet
+Replaces: gnome-applets-data (<< 2.30.0-4)
 Recommends: gnome-system-monitor,
             gnome-media,
             gnome-netstatus-applet,