r10884 - in /desktop/unstable/gnome-icon-theme/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed May  9 08:33:09 2007
New Revision: 10884

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10884
Log:
* Include gnome-mime-application-vnd.ms-word links for 22x22 and 24x24
* Conflict with gnome-panel < 2.18 and gnome-themes-extras < 
  0.9.0.deb0.1 (closes: #422933).

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

Modified: desktop/unstable/gnome-icon-theme/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/changelog?rev=10884&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/changelog (original)
+++ desktop/unstable/gnome-icon-theme/debian/changelog Wed May  9 08:33:09 2007
@@ -5,10 +5,12 @@
     closes: #421383.
 
   [ Josselin Mouette ]
-  * Include gnome-mime-application-vnd.ms-word links for 22x22 and 24x24 
+  * Include gnome-mime-application-vnd.ms-word links for 22x22 and 24x24
     sizes.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 30 Apr 2007 15:18:02 +0200
+  * Conflict with gnome-panel < 2.18 and gnome-themes-extras < 
+    0.9.0.deb0.1 (closes: #422933).
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 09 May 2007 10:32:35 +0200
 
 gnome-icon-theme (2.18.0-2) unstable; urgency=low
 

Modified: desktop/unstable/gnome-icon-theme/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/control?rev=10884&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/control (original)
+++ desktop/unstable/gnome-icon-theme/debian/control Wed May  9 08:33:09 2007
@@ -21,6 +21,7 @@
          librsvg2-common
 Replaces: kdebase (<< 4:3.2.2-1),
           gnome-panel-data (<= 2.9.91-1)
+Conflicts: gnome-panel (<< 2.18), gnome-themes-extras (<< 0.9.0.deb0.1)
 Enhances: nautilus (>= 2.2)
 Description: GNOME Desktop icon theme
  This package contains the default icon theme used by the GNOME desktop.

Modified: desktop/unstable/gnome-icon-theme/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/control.in?rev=10884&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/control.in (original)
+++ desktop/unstable/gnome-icon-theme/debian/control.in Wed May  9 08:33:09 2007
@@ -21,6 +21,7 @@
          librsvg2-common
 Replaces: kdebase (<< 4:3.2.2-1),
           gnome-panel-data (<= 2.9.91-1)
+Conflicts: gnome-panel (<< 2.18), gnome-themes-extras (<< 0.9.0.deb0.1)
 Enhances: nautilus (>= 2.2)
 Description: GNOME Desktop icon theme
  This package contains the default icon theme used by the GNOME desktop.