r29758 - in /desktop/experimental/gnome-applets/debian: changelog control control.in

[jordi at users.alioth.debian.org]

Author: jordi
Date: Tue Sep 27 08:59:57 2011
New Revision: 29758

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29758
Log:
* Don't recommend deskbar-applet or gnome-netstatus-applet.
* Remove obsolete Conflicts/Replaces/Provides for trashapplet.

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

Modified: desktop/experimental/gnome-applets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/changelog?rev=29758&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/changelog [utf-8] Tue Sep 27 08:59:57 2011
@@ -20,7 +20,11 @@
   * 02_link_X11.patch: Dropped, merged upstream
   * 03_mixer_gtk3.patch: Dropped, merged upstream
 
- -- Jeremy Bicha <jbicha at ubuntu.com>  Mon, 26 Sep 2011 00:39:25 -0400
+  [ Jordi Mallach ]
+  * Don't recommend deskbar-applet or gnome-netstatus-applet.
+  * Remove obsolete Conflicts/Replaces/Provides for trashapplet.
+
+ -- Jordi Mallach <jordi at iti.upv.es>  Tue, 27 Sep 2011 10:58:58 +0200
 
 gnome-applets (2.91.4~20110321-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=29758&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control [utf-8] Tue Sep 27 08:59:57 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sebastien Bacher <seb128 at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.90~),
                dh-autoreconf,
                debhelper (>= 5.0.13),
@@ -48,12 +48,11 @@
                libupower-glib-dev (>= 0.9.4)
 Standards-Version: 3.9.2
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/experimental/gnome-applets
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-applets/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/gnome-applets
 
 Package: gnome-applets-data
 Architecture: all
 Depends: ${misc: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.
@@ -74,14 +73,9 @@
          gir1.2-gdkpixbuf-2.0,
          gir1.2-gconf-2.0,
          gir1.2-panelapplet-4.0
-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,
-            deskbar-applet,
             cpufrequtils,
             policykit-1-gnome
 Suggests: tomboy

Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=29758&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control.in [utf-8] Tue Sep 27 08:59:57 2011
@@ -48,7 +48,6 @@
 Package: gnome-applets-data
 Architecture: all
 Depends: ${misc: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.
@@ -69,14 +68,9 @@
          gir1.2-gdkpixbuf-2.0,
          gir1.2-gconf-2.0,
          gir1.2-panelapplet-4.0
-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,
-            deskbar-applet,
             cpufrequtils,
             policykit-1-gnome
 Suggests: tomboy