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

commit 842cf890bcabf7f9486e40d3463d7827c0b4e6ed
Author: Miles Lubin <miles.lubin at gmail.com>
Date:   Wed Sep 3 18:48:19 2014 -0400

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

diff --git a/debian/changelog b/debian/changelog
index 6936251..84895af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+coinor-symphony (5.6.0-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:43:05 -0400
+
 coinor-symphony (5.5.6-1) unstable; urgency=low
 
   * Move manpage to coinor-symphony (Closes: #730261).
diff --git a/debian/control b/debian/control
index 91a25b8..1fe69f5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,10 @@ Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Miles Lubin <miles.lubin at gmail.com>
 Build-Depends: chrpath,
-               coinor-libcgl-dev (>= 0.58.2),
-               coinor-libclp-dev (>= 1.15.3),
-               coinor-libcoinutils-dev (>= 2.9.4),
-               coinor-libosi-dev (>= 0.106.1),
+               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-latex,
                graphviz,
@@ -15,7 +15,8 @@ Build-Depends: chrpath,
                libbz2-dev,
                liblapack-dev,
                pkg-config,
-               zlib1g-dev
+               zlib1g-dev,
+               autotools-dev
 Standards-Version: 3.9.5
 Homepage: https://projects.coin-or.org/SYMPHONY
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/coinor-symphony.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 5bb940d..0000000
--- a/debian/patches/shlibdeps.patch
+++ /dev/null
@@ -1,54 +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
-@@ -137,7 +137,7 @@
- 	"$(DESTDIR)$(includecoindir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libSym_la_LIBADD =
-+libSym_la_LIBADD = $(SYMPHONYLIB_LIBS)
- am__libSym_la_SOURCES_DIST = ../include/SymConfig.h \
- 	../include/sym_constants.h ../include/sym_macros.h \
- 	../include/sym_types.h ../include/sym_cg.h \
-@@ -2681,7 +2681,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = OsiSym
-+SUBDIRS = 
- 
- ##############################################################################
- ##############################################################################
---- a/src/OsiSym/Makefile.in
-+++ b/src/OsiSym/Makefile.in
-@@ -74,7 +74,7 @@
- am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
--libOsiSym_la_LIBADD =
-+libOsiSym_la_LIBADD = ../libSym.la $(SYMPHONYLIB_LIBS)
- am_libOsiSym_la_OBJECTS = OsiSymSolverInterface.lo SymWarmStart.lo
- libOsiSym_la_OBJECTS = $(am_libOsiSym_la_OBJECTS)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -348,7 +348,7 @@
- RANLIB = @RANLIB@
- ROOT_NODE_ONLY_FALSE = @ROOT_NODE_ONLY_FALSE@
- ROOT_NODE_ONLY_TRUE = @ROOT_NODE_ONLY_TRUE@
--RPATH_FLAGS = @RPATH_FLAGS@
-+RPATH_FLAGS = 
- SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
- SAMPLE_CFLAGS_INSTALLED = @SAMPLE_CFLAGS_INSTALLED@
- SAMPLE_DATA = @SAMPLE_DATA@
-@@ -483,7 +483,7 @@
- ########################################################################
- #                          Subdirectories                              #
- ########################################################################
--SUBDIRS = src $(am__append_1)
-+SUBDIRS = src src/OsiSym $(am__append_1)
- 
- ########################################################################
- #             Additional files to be included in tarball               #
diff --git a/debian/rules b/debian/rules
index 070d80b..8009adb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ override_dh_auto_build:
 	cd Doc && ( latex man ; latex man ; dvipdfm man )
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static
+	dh_auto_configure -- --enable-static --enable-dependency-linking
 
 override_dh_auto_install:
 	dh_auto_install --
@@ -19,4 +19,4 @@ override_dh_clean:
 	dh_clean --exclude=Makefile.orig
 
 %:
-	dh $@ 
+	dh $@ --with autotools_dev

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