[coinor-osi] 02/02: 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-osi.

commit da18e0b80138c8e35e2425ef5e56717de8af6951
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Tue Sep 2 21:27:20 2014 -0400

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

diff --git a/debian/changelog b/debian/changelog
index 0abd18d..d479e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+coinor-osi (0.106.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
+
+ -- Miles Lubin <miles.lubin at gmail.com>  Tue, 02 Sep 2014 21:22:25 -0400
+
 coinor-osi (0.106.4-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index ccbc62a..6443f26 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Miles Lubin <miles.lubin at gmail.com>
 Build-Depends: debhelper (>= 9), doxygen, graphviz,
- coinor-libcoinutils-dev (>= 2.9.4), pkg-config, zlib1g-dev, libbz2-dev
+ coinor-libcoinutils-dev (>= 2.9.15), pkg-config, zlib1g-dev, libbz2-dev, autotools-dev
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/coinor-osi.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/coinor-osi.git
diff --git a/debian/patches/series b/debian/patches/series
index 54ac58f..3a8876a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-shlibdeps.patch
 fix-addlibs-file.patch
diff --git a/debian/patches/shlibdeps.patch b/debian/patches/shlibdeps.patch
deleted file mode 100644
index eebaf17..0000000
--- a/debian/patches/shlibdeps.patch
+++ /dev/null
@@ -1,13 +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/Osi/Makefile.in
-+++ b/src/Osi/Makefile.in
-@@ -361,6 +361,7 @@
- 
- # This is for libtool
- libOsi_la_LDFLAGS = $(LT_LDFLAGS)
-+libOsi_la_LIBADD = $(OSILIB_LIBS)
- 
- # Here list all include flags.
- AM_CPPFLAGS = $(COINUTILS_CFLAGS)
diff --git a/debian/rules b/debian/rules
index be8ec61..00e0933 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,12 @@ 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 --
 	$(RM) debian/tmp/usr/share/coin/doc/Osi/LICENSE
 
 %:
-	dh $@ 
+	dh $@ --with autotools_dev
 

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