r19200 - in /desktop/unstable/gnome-build/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Mar 23 16:07:21 2009
New Revision: 19200

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19200
Log:
libgbf-1-dev conflicts with libgbf-1-0. Closes: #515224.

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

Modified: desktop/unstable/gnome-build/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-build/debian/changelog?rev=19200&op=diff
==============================================================================
--- desktop/unstable/gnome-build/debian/changelog (original)
+++ desktop/unstable/gnome-build/debian/changelog Mon Mar 23 16:07:21 2009
@@ -1,3 +1,9 @@
+gnome-build (2.24.1-2) UNRELEASED; urgency=low
+
+  * libgbf-1-dev conflicts with libgbf-1-0. Closes: #515224.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 23 Mar 2009 17:06:41 +0100
+
 gnome-build (2.24.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gnome-build/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-build/debian/control?rev=19200&op=diff
==============================================================================
--- desktop/unstable/gnome-build/debian/control (original)
+++ desktop/unstable/gnome-build/debian/control Mon Mar 23 16:07:21 2009
@@ -20,7 +20,8 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: libgbf-dev
-Conflicts: libgbf-dev
+Conflicts: libgbf-dev,
+           libgbf-1-0
 Description: GNOME Development Framework - development files
  Provides a development and debug framework for tools designed around the
  GNOME desktop environment.

Modified: desktop/unstable/gnome-build/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-build/debian/control.in?rev=19200&op=diff
==============================================================================
--- desktop/unstable/gnome-build/debian/control.in (original)
+++ desktop/unstable/gnome-build/debian/control.in Mon Mar 23 16:07:21 2009
@@ -20,7 +20,8 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: libgbf-dev
-Conflicts: libgbf-dev
+Conflicts: libgbf-dev,
+           libgbf-1-0
 Description: GNOME Development Framework - development files
  Provides a development and debug framework for tools designed around the
  GNOME desktop environment.