[SCM] Gtk+ library to display large amounts of numerical data branch, master, updated. upstream/0.9.2.0-30-g7999692

[Andreas Tille]

The following commit has been merged in the master branch:
commit 03f3b5886d8a052938baea4af8da88d0f36761b3
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 18 12:29:25 2013 +0200

    Add proper conflicts betwen new -doc package and old -dev package containing the same files

diff --git a/debian/changelog b/debian/changelog
index e4afd53..dd6b71d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libgtkdatabox (1:0.9.2.0-2) unstable; urgency=low
+
+  * debian/control: Add proper conflicts betwen new -doc package and
+    old -dev package containing the same files
+    Closes: #708667
+
+ -- Andreas Tille <tille at debian.org>  Sat, 18 May 2013 12:26:31 +0200
+
 libgtkdatabox (1:0.9.2.0-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index e112ad4..29420e4 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,7 @@ Description: Gtk+ library to display large amounts of numerical data (glade lib)
 Package: libgtkdatabox-0.9.2-0-doc
 Section: doc
 Architecture: all
+Conflicts: libgtkdatabox-0.9.1-1-dev
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: Gtk+ library to display large amounts of numerical data (api doc)

-- 
Gtk+ library to display large amounts of numerical data