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

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Thu May 28 14:10:09 2015
New Revision: 44828

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44828
Log:
Make gnome-applets-data break/replace netspeed, because of a file
conflict. Netspeed is now integrated into gnome-applets.

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=44828&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/changelog	[utf-8] Thu May 28 14:10:09 2015
@@ -6,6 +6,8 @@
   * Remove dependency on gnome-icon-theme. It has been superseded by
     adwaita-icon-theme, which is pulled in by libgtk-3-common anyway.
   * Update applets list in the package description.
+  * Make gnome-applets-data break/replace netspeed, because of a file
+    conflict. Netspeed is now integrated into gnome-applets.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 28 May 2015 16:20:48 +0300
 

Modified: desktop/experimental/gnome-applets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control?rev=44828&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control	[utf-8] Thu May 28 14:10:09 2015
@@ -49,6 +49,8 @@
 Package: gnome-applets-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: netspeed (<< 0.16-4)
+Replaces: netspeed (<< 0.16-4)
 Description: Various applets for the GNOME panel - data files
  This package contains data files (pixmaps, icons, documentations) needed by
  the gnome-applets package.

Modified: desktop/experimental/gnome-applets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-applets/debian/control.in?rev=44828&op=diff
==============================================================================
--- desktop/experimental/gnome-applets/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-applets/debian/control.in	[utf-8] Thu May 28 14:10:09 2015
@@ -45,6 +45,8 @@
 Package: gnome-applets-data
 Architecture: all
 Depends: ${misc:Depends}
+Breaks: netspeed (<< 0.16-4)
+Replaces: netspeed (<< 0.16-4)
 Description: Various applets for the GNOME panel - data files
  This package contains data files (pixmaps, icons, documentations) needed by
  the gnome-applets package.