[coinor-cgl] 02/03: bump (same changes as coinutils)

[Miles Lubin]

This is an automated email from the git hooks/post-receive script.

mlubin-guest pushed a commit to branch master
in repository coinor-cgl.

commit 940afeae7291711fb13f905e74a905c512970fc0
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 3 17:49:33 2014 -0400

    bump (same changes as coinutils)
---
 debian/changelog                     | 10 ++++++++++
 debian/control                       |  5 +++--
 debian/patches/missing-headers.patch | 14 --------------
 debian/patches/series                |  2 --
 debian/patches/shlibdeps.patch       | 14 --------------
 debian/rules                         |  4 ++--
 6 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b61e66..2bd91bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+coinor-cgl (0.58.9-1) unstable; urgency=low
+
+  * New upstream version.
+  * Use dh_autotools-dev to update config.{sub,guess} for new ports.
+    - Thanks to Adam Conrad
+  * Remove shlibdeps patch incorporated upstream with configure option
+  * Remove missing-headers patch incorporated upstream
+
+ -- Miles Lubin <miles.lubin at gmail.com>  Wed, 03 Sep 2014 17:45:03 -0400
+
 coinor-cgl (0.58.4-1) experimental; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 2f4c34a..44a0dba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,15 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Miles Lubin <miles.lubin at gmail.com>
-Build-Depends: coinor-libclp-dev (>= 1.15.3),
+Build-Depends: coinor-libclp-dev (>= 1.15.10),
                debhelper (>= 9),
                doxygen-latex,
                graphviz,
                libbz2-dev,
                liblapack-dev,
                pkg-config,
-               zlib1g-dev
+               zlib1g-dev,
+               autotools-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/coinor-cgl.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/coinor-cgl.git
diff --git a/debian/patches/missing-headers.patch b/debian/patches/missing-headers.patch
deleted file mode 100644
index 8a827b2..0000000
--- a/debian/patches/missing-headers.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Miles Lubin <miles.lubin at gmail.com>
-Description: Install missing header file
-Bug: https://projects.coin-or.org/Cgl/ticket/39
---- a/src/CglZeroHalf/Makefile.in
-+++ b/src/CglZeroHalf/Makefile.in
-@@ -376,7 +376,7 @@
- # Here list all the header files that are required by a user of the library,
- # and that therefore should be installed in 'include/coin'
- includecoindir = $(includedir)/coin
--includecoin_HEADERS = CglZeroHalf.hpp
-+includecoin_HEADERS = CglZeroHalf.hpp Cgl012cut.hpp
- all: all-am
- 
- .SUFFIXES:
diff --git a/debian/patches/series b/debian/patches/series
index a0f6837..3a8876a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-missing-headers.patch
 fix-addlibs-file.patch
-shlibdeps.patch
diff --git a/debian/patches/shlibdeps.patch b/debian/patches/shlibdeps.patch
deleted file mode 100644
index d31aa07..0000000
--- a/debian/patches/shlibdeps.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Miles Lubin <miles.lubin at gmail.com>
-Description: Properly set shared library dependencies
-Bug: https://projects.coin-or.org/BuildTools/ticket/105
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -376,7 +376,7 @@
- 
- # We want to have all the sublibraries from the Cgl subprojects collected into
- # this library
--libCgl_la_LIBADD = $(CGL_SUBLIBS)
-+libCgl_la_LIBADD = $(CGL_SUBLIBS) $(CGLLIB_LIBS)
- 
- # Since automake is not doing this on its own, we need to declare the
- # dependencies to the subdirectory libraries here
diff --git a/debian/rules b/debian/rules
index 5502445..f347850 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ override_dh_auto_build:
 	ln -s /usr/share/javascript/jquery/jquery.js doxydoc/html
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static --enable-dot
+	dh_auto_configure -- --enable-static --enable-dot --enable-dependency-linking
 
 override_dh_auto_install:
 	dh_auto_install --
@@ -19,4 +19,4 @@ override_dh_auto_install:
 
 
 %:
-	dh $@ 
+	dh $@ --with autotools_dev 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/coinor-cgl.git