[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 c179fa8af0f6ee8d149fd447e0479c15199407de
Merge: 03f3b5886d8a052938baea4af8da88d0f36761b3 6b272f94461f761afd5589090a2391cfcf17f457
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 23 19:27:41 2013 +0200

    Merge branch 'master' of git://gitorious.org/drdanz-debian/libgtkdatabox
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index dd6b71d,9b5a6b5..8609f9b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,17 +1,25 @@@
 -libgtkdatabox (1:0.9.2.0-2) UNRELEASED; urgency=low
++libgtkdatabox (1:0.9.2.0-3) UNRELEASED; urgency=low
+ 
+   * Add 05_explicitly_link_libm.patch
+   * Add 06_gladeui-2.0.patch
+   * debian/control
+      - Add quilt to b-d
+      - Change b-d from libgladeui-1-dev to libgladeui-dev
+        Closes: #709242
+   * debian/rules
+      - build using dh --with quilt
+      - Fix installed files glade3 -> glade
+ 
+  -- Daniele E. Domenichelli <daniele.domenichelli at gmail.com>  Thu, 23 May 2013 09:08:21 +0200
+ 
 +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 --combined debian/control
index 29420e4,ff5aa64..64546be
--- a/debian/control
+++ b/debian/control
@@@ -12,9 -12,10 +12,10 @@@ Build-Depends: debhelper (>= 9)
                 libpango1.0-dev,
                 gtk-doc-tools,
                 libglade2-dev,
-                libgladeui-1-dev,
+                libgladeui-dev,
                 dh-linktree,
-                libjs-jquery
+                libjs-jquery,
+                quilt
  Standards-Version: 3.9.3
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libgtkdatabox.git
  Vcs-Git: git://anonscm.debian.org/debian-science/packages/libgtkdatabox.git
@@@ -118,7 -119,6 +119,7 @@@ Description: Gtk+ library to display la
  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