r12935 - in /desktop/unstable/gtk+2.0/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Oct  1 10:56:41 2007
New Revision: 12935

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12935
Log:
* Conflict with glabels << 2.1.3-3 to prevent a segmentation fault 
  from showing up.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/control
    desktop/unstable/gtk+2.0/debian/control.in

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=12935&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Mon Oct  1 10:56:41 2007
@@ -10,7 +10,11 @@
     to testing until the wxwidgets2.6 fix is there too; see #441766 and
     friends.
 
- -- Loic Minier <lool at dooz.org>  Sun, 30 Sep 2007 03:31:22 +0200
+  [ Josselin Mouette ]
+  * Conflict with glabels << 2.1.3-3 to prevent a segmentation fault 
+    from showing up.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 01 Oct 2007 12:56:09 +0200
 
 gtk+2.0 (2.12.0-2) unstable; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=12935&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control (original)
+++ desktop/unstable/gtk+2.0/debian/control Mon Oct  1 10:56:41 2007
@@ -91,7 +91,8 @@
            libginspx0 (<< 20050529-1.1),
            scim-bridge-client-gtk (<< 0.4.10-1.1),
            iiimgcf (<= 11.4.1870-7),
-           libwxgtk2.6-0 (<< 2.6.3.2.2-1)
+           libwxgtk2.6-0 (<< 2.6.3.2.2-1),
+           glabels (<< 2.1.3-3)
 Replaces: libgtk2.0-0png3
 Recommends: hicolor-icon-theme,
             ${misc:Depends},

Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=12935&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in (original)
+++ desktop/unstable/gtk+2.0/debian/control.in Mon Oct  1 10:56:41 2007
@@ -91,7 +91,8 @@
            libginspx0 (<< 20050529-1.1),
            scim-bridge-client-gtk (<< 0.4.10-1.1),
            iiimgcf (<= 11.4.1870-7),
-           libwxgtk2.6-0 (<< 2.6.3.2.2-1)
+           libwxgtk2.6-0 (<< 2.6.3.2.2-1),
+           glabels (<< 2.1.3-3)
 Replaces: libgtk2.0-0png3
 Recommends: hicolor-icon-theme,
             ${misc:Depends},