Control: tags 791007 + patch pending

On Tue, 11 Aug 2015 at 21:54:06 +0200, Julien Cristau wrote:
> As far as I can tell coinor-ipopt does expose changed std::things
> through its API, so the coinor-libipopt1 package needs a rename.
> 
> A possible patch is available at
> https://launchpad.net/ubuntu/+source/coinor-ipopt/3.11.9-2ubuntu1

I've uploaded a NMU to DELAYED/2 heavily based on that patch. See attached.
Please let me know if I should reschedule or cancel this.

Regards,
    S
diffstat for coinor-ipopt-3.11.9 coinor-ipopt-3.11.9

 changelog                            |   10 ++++++++++
 coinor-libipopt1.install             |    1 -
 coinor-libipopt1.lintian-overrides   |    2 --
 coinor-libipopt1v5.install           |    1 +
 coinor-libipopt1v5.lintian-overrides |    2 ++
 control                              |   12 ++++++++----
 rules                                |    2 +-
 7 files changed, 22 insertions(+), 8 deletions(-)

diff -Nru coinor-ipopt-3.11.9/debian/changelog coinor-ipopt-3.11.9/debian/changelog
--- coinor-ipopt-3.11.9/debian/changelog	2014-10-01 13:42:17.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/changelog	2015-08-30 15:53:15.000000000 +0100
@@ -1,3 +1,13 @@
+coinor-ipopt (3.11.9-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Incorporate library rename, from Ubuntu (Closes: #791007)
+
+  [ Steve Langasek ]
+  * Rename library packages for g++5 ABI transition.
+
+ -- Simon McVittie <s...@debian.org>  Sun, 30 Aug 2015 15:53:14 +0100
+
 coinor-ipopt (3.11.9-2) unstable; urgency=low
 
   * Link against sequential MUMPS instead of parallel (Closes: #763621)
diff -Nru coinor-ipopt-3.11.9/debian/coinor-libipopt1.install coinor-ipopt-3.11.9/debian/coinor-libipopt1.install
--- coinor-ipopt-3.11.9/debian/coinor-libipopt1.install	2014-10-01 13:42:17.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/coinor-libipopt1.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/lib*.so.*
diff -Nru coinor-ipopt-3.11.9/debian/coinor-libipopt1.lintian-overrides coinor-ipopt-3.11.9/debian/coinor-libipopt1.lintian-overrides
--- coinor-ipopt-3.11.9/debian/coinor-libipopt1.lintian-overrides	2014-10-01 13:42:17.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/coinor-libipopt1.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# All the coinor packages preced the library package name with coinor-
-coinor-libipopt1: package-name-doesnt-match-sonames libipopt1
diff -Nru coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.install coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.install
--- coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.install	1970-01-01 01:00:00.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.install	2015-08-28 11:16:51.000000000 +0100
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
diff -Nru coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.lintian-overrides coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.lintian-overrides
--- coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/coinor-libipopt1v5.lintian-overrides	2015-08-28 11:19:11.000000000 +0100
@@ -0,0 +1,2 @@
+# All the coinor packages preced the library package name with coinor-
+coinor-libipopt1v5: package-name-doesnt-match-sonames libipopt1
diff -Nru coinor-ipopt-3.11.9/debian/control coinor-ipopt-3.11.9/debian/control
--- coinor-ipopt-3.11.9/debian/control	2014-10-01 13:42:17.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/control	2015-08-30 13:44:13.000000000 +0100
@@ -11,10 +11,12 @@
 Vcs-Git: https://github.com/ghorn/debian-coinor-ipopt.git
 Vcs-Browser: https://github.com/ghorn/debian-coinor-ipopt.git
 
-Package: coinor-libipopt1
+Package: coinor-libipopt1v5
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: coinor-libipopt1
+Replaces: coinor-libipopt1
 Description: Interior-Point Optimizer, for large-scale nonlinear optimization
  Ipopt is an open-source solver for large-scale nonlinear continuous
  optimization. It can be used from modeling environments, such as AMPL,
@@ -32,7 +34,7 @@
 Package: coinor-libipopt-dev
 Section: libdevel
 Architecture: any
-Depends: coinor-libipopt1 (= ${binary:Version}), libmumps-seq-dev, ${shlibs:Depends}, ${misc:Depends}
+Depends: coinor-libipopt1v5 (= ${binary:Version}), libmumps-seq-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: Interior-Point Optimizer - header files
  Ipopt is an open-source solver for large-scale nonlinear continuous
  optimization. It can be used from modeling environments, such as AMPL,
@@ -65,10 +67,12 @@
  .
  This package contains the documentation.
 
-Package: coinor-libipopt1-dbg
+Package: coinor-libipopt1v5-dbg
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libipopt1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libipopt1v5 (= ${binary:Version})
+Conflicts: coinor-libipopt1-dbg
+Replaces: coinor-libipopt1-dbg
 Description: Interior-Point Optimizer - debugging symbols
  Ipopt is an open-source solver for large-scale nonlinear continuous
  optimization. It can be used from modeling environments, such as AMPL,
diff -Nru coinor-ipopt-3.11.9/debian/rules coinor-ipopt-3.11.9/debian/rules
--- coinor-ipopt-3.11.9/debian/rules	2014-10-01 13:42:17.000000000 +0100
+++ coinor-ipopt-3.11.9/debian/rules	2015-08-30 13:47:04.000000000 +0100
@@ -10,7 +10,7 @@
 							 --with-mumps-lib='-ldmumps_seq'
 DEB_MAKE_CHECK_TARGET = test
 
-binary-install/coinor-libipopt1:: debian/stamp-binary-install-coinor-libipopt1
+binary-install/coinor-libipopt1v5:: debian/stamp-binary-install-coinor-libipopt1
 debian/stamp-binary-install-coinor-libipopt1:
 	find debian/tmp -name libipopt.la -delete
 	touch $@

Reply via email to