Bug#796715: coinor-osi: working diff

2015-08-25 Thread Miles Lubin
On Tue, Aug 25, 2015 at 3:46 AM, Rene Engelhard r...@debian.org wrote:
 Either you can upload it yourself or I can do a team upload, whatever you
 prefer.

Thanks for figuring this out, I don't currently have the time to work
through the transition. Team upload would be appreciated.

Best,
Miles



Bug#796715: coinor-osi: working diff

2015-08-25 Thread Rene Engelhard
tag 796715 + pending
thanks

Hi,

On Tue, Aug 25, 2015 at 12:05:05PM -0600, Miles Lubin wrote:
 On Tue, Aug 25, 2015 at 3:46 AM, Rene Engelhard r...@debian.org wrote:
  Either you can upload it yourself or I can do a team upload, whatever you
  prefer.
 
 Thanks for figuring this out, I don't currently have the time to work
 through the transition. Team upload would be appreciated.

Ok. Done. (The Third version).

Regards,

Rene



Bug#796715: coinor-osi: working diff

2015-08-25 Thread Rene Engelhard
Hi again,

 I looked at this one given it's a r-dep of coinmp and thus other coin-* stuff,
 which in turn is one of LibreOffice Calc :) and prepared the following patch.

 Unfortunately, this then fails its tests.
 (I guess that's why you tagged the bug help? There's no explanation, so..)
 [...]
 
 No idea what that means, maybe it needs other COIN stuff also be rebuilt
 first?

Indeed, I forgot to upgrade the already NMUed coinutils. With that it works.

So here's a new patch with the build-dependency bumped.

Either you can upload it yourself or I can do a team upload, whatever you
prefer.

Regards,

Rene
diff -Nru coinor-osi-0.106.9/debian/changelog coinor-osi-0.106.9/debian/changelog
--- coinor-osi-0.106.9/debian/changelog	2014-09-04 13:54:26.0 +0200
+++ coinor-osi-0.106.9/debian/changelog	2015-08-25 11:36:43.0 +0200
@@ -1,3 +1,11 @@
+coinor-osi (0.106.9-2) unstable; urgency=medium
+
+  * libstdc++6 transtion: rename coinor-libosi1 to coinor-libosi1v5
+(closes: #796715)
+  * bump coinor-libcoinutils-dev build-dep
+
+ -- Rene Engelhard r...@debian.org  Tue, 25 Aug 2015 11:36:35 +0200
+
 coinor-osi (0.106.9-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru coinor-osi-0.106.9/debian/coinor-libosi1.install coinor-osi-0.106.9/debian/coinor-libosi1.install
--- coinor-osi-0.106.9/debian/coinor-libosi1.install	2013-09-18 09:45:42.0 +0200
+++ coinor-osi-0.106.9/debian/coinor-libosi1.install	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/lib*.so.*
diff -Nru coinor-osi-0.106.9/debian/coinor-libosi1.lintian-overrides coinor-osi-0.106.9/debian/coinor-libosi1.lintian-overrides
--- coinor-osi-0.106.9/debian/coinor-libosi1.lintian-overrides	2013-09-18 09:45:42.0 +0200
+++ coinor-osi-0.106.9/debian/coinor-libosi1.lintian-overrides	1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-coinor-libosi1: package-name-doesnt-match-sonames libOsi1 libOsiCommonTests1
diff -Nru coinor-osi-0.106.9/debian/coinor-libosi1v5.install coinor-osi-0.106.9/debian/coinor-libosi1v5.install
--- coinor-osi-0.106.9/debian/coinor-libosi1v5.install	1970-01-01 01:00:00.0 +0100
+++ coinor-osi-0.106.9/debian/coinor-libosi1v5.install	2013-09-18 09:45:42.0 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/lib/*/lib*.so.*
diff -Nru coinor-osi-0.106.9/debian/coinor-libosi1v5.lintian-overrides coinor-osi-0.106.9/debian/coinor-libosi1v5.lintian-overrides
--- coinor-osi-0.106.9/debian/coinor-libosi1v5.lintian-overrides	1970-01-01 01:00:00.0 +0100
+++ coinor-osi-0.106.9/debian/coinor-libosi1v5.lintian-overrides	2013-09-18 09:45:42.0 +0200
@@ -0,0 +1 @@
+coinor-libosi1: package-name-doesnt-match-sonames libOsi1 libOsiCommonTests1
diff -Nru coinor-osi-0.106.9/debian/control coinor-osi-0.106.9/debian/control
--- coinor-osi-0.106.9/debian/control	2014-09-04 13:54:26.0 +0200
+++ coinor-osi-0.106.9/debian/control	2015-08-25 11:36:07.0 +0200
@@ -4,15 +4,16 @@
 Maintainer: Debian Science Team debian-science-maintain...@lists.alioth.debian.org
 Uploaders: Miles Lubin miles.lu...@gmail.com
 Build-Depends: debhelper (= 9), doxygen, graphviz,
- coinor-libcoinutils-dev (= 2.9.15), pkg-config, zlib1g-dev, libbz2-dev, autotools-dev
+ coinor-libcoinutils-dev (= 2.9.15-3.1), 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
 Homepage: https://projects.coin-or.org/Osi
 
-Package: coinor-libosi1
+Package: coinor-libosi1v5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: coinor-libosi1
 Description: COIN-OR Open Solver Interface
  Osi (Open Solver Interface) provides an abstract C++ base class to a generic
  linear programming (LP) solver, along with derived classes for specific
@@ -29,7 +30,7 @@
 Package: coinor-libosi-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libosi1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libosi1v5 (= ${binary:Version})
 Description: COIN-OR Open Solver Interface (developer files)
  Osi (Open Solver Interface) provides an abstract C++ base class to a generic
  linear programming (LP) solver, along with derived classes for specific
@@ -60,7 +61,7 @@
 Package: coinor-libosi1-dbg
 Section: debug
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libosi1 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, coinor-libosi1v5 (= ${binary:Version})
 Description: COIN-OR Open Solver Interface (debug symbols)
  Osi (Open Solver Interface) provides an abstract C++ base class to a generic
  linear programming (LP) solver, along with derived classes for specific