r35922 - in /packages/libgtkdatabox/trunk/debian: changelog control

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Oct 22 08:47:26 2009
New Revision: 35922

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35922
Log:
Really close the same file in different packages problem

Modified:
    packages/libgtkdatabox/trunk/debian/changelog
    packages/libgtkdatabox/trunk/debian/control

Modified: packages/libgtkdatabox/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/changelog?rev=35922&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/changelog (original)
+++ packages/libgtkdatabox/trunk/debian/changelog Thu Oct 22 08:47:26 2009
@@ -1,3 +1,21 @@
+libgtkdatabox (1:0.9.1.1-3) unstable; urgency=low
+
+  * debian/control: added conflicts to older versions not
+    yet providing libgtkdatabox-libglade which really
+    Closes: #551424, #551423
+
+ -- Andreas Tille <tille at debian.org>  Thu, 22 Oct 2009 10:23:24 +0200
+
+libgtkdatabox (1:0.9.1.1-2) unstable; urgency=low
+
+  * debian/control:
+    Package: libgtkdatabox-*-libglade
+      Provides: libgtkdatabox-libglade
+      Conflicts: libgtkdatabox-libglade
+    Closes: #551424
+
+ -- Andreas Tille <tille at debian.org>  Sun, 18 Oct 2009 22:29:41 +0200
+
 libgtkdatabox (1:0.9.1.1-1) unstable; urgency=low
 
   * New upstream version

Modified: packages/libgtkdatabox/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/debian/control?rev=35922&op=diff
==============================================================================
--- packages/libgtkdatabox/trunk/debian/control (original)
+++ packages/libgtkdatabox/trunk/debian/control Thu Oct 22 08:47:26 2009
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 7), cdbs, autotools-dev, d-shlibs (>= 0.40),
  libgtk2.0-dev (>= 2.12.2), libcairo2-dev, libpango1.0-dev, gtk-doc-tools,
  libglade2-dev, libgladeui-1-dev, quilt
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/libgtkdatabox/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/libgtkdatabox/trunk/
 Homepage: http://sourceforge.net/projects/gtkdatabox
@@ -60,6 +60,8 @@
 Package: libgtkdatabox-0.9.1-1-glade
 Section: libs
 Architecture: any
+Provides: libgtkdatabox-glade
+Conflicts: libgtkdatabox-glade, libgtkdatabox-0.9.0-1-glade
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A Gtk+ library to display large amounts of numerical data
  One or more data sets of thousands of data points (X and Y coordinate) may be 
@@ -81,6 +83,8 @@
 Package: libgtkdatabox-0.9.1-1-libglade
 Section: libs
 Architecture: any
+Provides: libgtkdatabox-libglade
+Conflicts: libgtkdatabox-libglade, libgtkdatabox-0.9.0-1-libglade
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A Gtk+ library to display large amounts of numerical data
  One or more data sets of thousands of data points (X and Y coordinate) may be