r15338 - in /desktop/unstable/glib2.0/debian: changelog control control.in

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Mar 20 15:42:24 2008
New Revision: 15338

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15338
Log:
Drop nautilus conflicts as it triggers a bug in the APT resolver on
  dist-upgrade.

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/control
    desktop/unstable/glib2.0/debian/control.in

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=15338&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Thu Mar 20 15:42:24 2008
@@ -1,3 +1,10 @@
+glib2.0 (2.16.1-3) UNRELEASED; urgency=low
+
+  * Drop nautilus conflicts as it triggers a bug in the APT resolver on
+    dist-upgrade.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 20 Mar 2008 16:42:00 +0100
+
 glib2.0 (2.16.1-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=15338&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control (original)
+++ desktop/unstable/glib2.0/debian/control Thu Mar 20 15:42:24 2008
@@ -23,8 +23,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: libglib2.0-data
-Conflicts: libpango1.0-0 (<< 1.11),
-           nautilus (<< 2.20)
+Conflicts: libpango1.0-0 (<< 1.11)
 Description: The GLib library of C routines
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose

Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=15338&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in (original)
+++ desktop/unstable/glib2.0/debian/control.in Thu Mar 20 15:42:24 2008
@@ -23,8 +23,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends}
 Recommends: @DATA_PKG@
-Conflicts: libpango1.0-0 (<< 1.11),
-           nautilus (<< 2.20)
+Conflicts: libpango1.0-0 (<< 1.11)
 Description: The GLib library of C routines
  GLib is a library containing many useful C routines for things such
  as trees, hashes, lists, and strings.  It is a useful general-purpose