[coinor-cbc] 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-cbc.

commit 7e4d41d470f291f851539503335fb340e6903bcf
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 3 18:18:05 2014 -0400

    bump (same changes as coinutils)
---
 debian/changelog               |  9 +++++++++
 debian/control                 | 11 ++++++-----
 debian/patches/series          |  1 -
 debian/patches/shlibdeps.patch | 34 ----------------------------------
 debian/rules                   |  4 ++--
 5 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4df0b08..a80f144 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+coinor-cbc (2.8.12-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
+
+ -- Miles Lubin <miles.lubin at gmail.com>  Wed, 03 Sep 2014 18:14:02 -0400
+
 coinor-cbc (2.8.7-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 6b21095..3a37211 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,18 @@ 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-libcgl-dev (>=0.58.2),
-               coinor-libclp-dev (>= 1.15.3),
-               coinor-libcoinutils-dev (>= 2.9.4),
-               coinor-libosi-dev (>= 0.106.1),
+Build-Depends: coinor-libcgl-dev (>= 0.58.9),
+               coinor-libclp-dev (>= 1.15.10),
+               coinor-libcoinutils-dev (>= 2.9.15),
+               coinor-libosi-dev (>= 0.106.9),
                debhelper (>= 9),
                doxygen,
                graphviz,
                libblas-dev,
                libbz2-dev,
                pkg-config,
-               zlib1g-dev
+               zlib1g-dev,
+               autotools-dev
 Standards-Version: 3.9.5
 Homepage: https://projects.coin-or.org/Cbc
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/coinor-cbc.git
diff --git a/debian/patches/series b/debian/patches/series
index c3f3f3e..3a8876a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix-addlibs-file.patch
-shlibdeps.patch
diff --git a/debian/patches/shlibdeps.patch b/debian/patches/shlibdeps.patch
deleted file mode 100644
index 8ea565e..0000000
--- a/debian/patches/shlibdeps.patch
+++ /dev/null
@@ -1,34 +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
-@@ -88,7 +88,7 @@
- 	"$(DESTDIR)$(includecoindir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libCbc_la_LIBADD =
-+libCbc_la_LIBADD = $(CBCLIB_LIBS)
- am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \
- 	CbcBranchCut.lo CbcBranchDecision.lo \
- 	CbcBranchDefaultDecision.lo CbcBranchDynamic.lo \
-@@ -115,7 +115,7 @@
- 	CbcStrategy.lo CbcSubProblem.lo CbcThread.lo CbcTree.lo \
- 	CbcTreeLocal.lo
- libCbc_la_OBJECTS = $(am_libCbc_la_OBJECTS)
--libCbcSolver_la_LIBADD =
-+libCbcSolver_la_LIBADD = -lCbc $(CBCLIB_LIBS)
- am_libCbcSolver_la_OBJECTS = CbcCbcParam.lo Cbc_ampl.lo CbcLinked.lo \
- 	CbcLinkedUtils.lo unitTestClp.lo CbcSolver.lo \
- 	CbcSolverHeuristics.lo CbcSolverAnalyze.lo CbcMipStartIO.lo \
---- a/src/OsiCbc/Makefile.in
-+++ b/src/OsiCbc/Makefile.in
-@@ -74,7 +74,7 @@
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libOsiCbc_la_LIBADD =
-+libOsiCbc_la_LIBADD = $(CBCLIB_LIBS)
- am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
- libOsiCbc_la_OBJECTS = $(am_libOsiCbc_la_OBJECTS)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
diff --git a/debian/rules b/debian/rules
index d24957c..b4971f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,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-cbc-parallel --enable-dot
+	dh_auto_configure -- --enable-static --enable-cbc-parallel --enable-dot --enable-dependency-linking
 
 override_dh_auto_install:
 	dh_auto_install --
@@ -21,4 +21,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-cbc.git