[clp] 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 clp.

commit 8d1126ca57c2d9fe37bc2bf09efa5cf02251caf6
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 3 16:55:35 2014 -0400

    bump (same changes as coinutils)
---
 debian/changelog               |  9 +++++++++
 debian/control                 |  7 ++++---
 debian/patches/series          |  1 -
 debian/patches/shlibdeps.patch | 25 -------------------------
 debian/rules                   |  4 ++--
 5 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef7830c..b65c3e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+clp (1.15.10-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 16:51:30 -0400
+
 clp (1.15.5-1) unstable; urgency=low
 
   * Move manpage to coinor-clp (Closes: #729778)
diff --git a/debian/control b/debian/control
index 0131fe3..59017f8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,16 @@ 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-libcoinutils-dev (>= 2.9.4),
-               coinor-libosi-dev (>= 0.106.1),
+Build-Depends: coinor-libcoinutils-dev (>= 2.9.15),
+               coinor-libosi-dev (>= 0.106.9),
                debhelper (>= 9),
                doxygen,
                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/clp.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/clp.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 60a7b6e..0000000
--- a/debian/patches/shlibdeps.patch
+++ /dev/null
@@ -1,25 +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
-@@ -128,7 +128,7 @@
- 	"$(DESTDIR)$(includecoindir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libClp_la_LIBADD =
-+libClp_la_LIBADD = $(CLPLIB_LIBS)
- am__libClp_la_SOURCES_DIST = ClpConfig.h ClpCholeskyBase.cpp \
- 	ClpCholeskyBase.hpp ClpCholeskyDense.cpp ClpCholeskyDense.hpp \
- 	ClpConstraint.cpp ClpConstraint.hpp ClpConstraintLinear.cpp \
---- a/src/OsiClp/Makefile.in
-+++ b/src/OsiClp/Makefile.in
-@@ -64,7 +64,7 @@
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libOsiClp_la_LIBADD =
-+libOsiClp_la_LIBADD = $(OSICLPLIB_LIBS)
- am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
- libOsiClp_la_OBJECTS = $(am_libOsiClp_la_OBJECTS)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
diff --git a/debian/rules b/debian/rules
index cc9dd33..25ee7b6 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/clp.git