Bug#797234: source-highlight, regina-normal and libstdc++6

2015-10-28 Thread Peter Eisentraut
On 10/24/15 1:44 PM, Benjamin Burton wrote:
>> That leaves the question: what to do with this bug?
> 
> FYI, if a rebuild *is* required then I presume it would be a simple rename 
> from libsource-highlight4 to libsource-highlight4v5; see the (tested) patch 
> below.  I’m happy to NMU this if the maintainer does not have time (which is 
> why the changelog entry reads as an NMU).

Works for me.



Bug#797234: source-highlight, regina-normal and libstdc++6

2015-10-24 Thread Benjamin Burton
> That leaves the question: what to do with this bug?

FYI, if a rebuild *is* required then I presume it would be a simple rename from 
libsource-highlight4 to libsource-highlight4v5; see the (tested) patch below.  
I’m happy to NMU this if the maintainer does not have time (which is why the 
changelog entry reads as an NMU).

- Ben.

diff -Nru source-highlight-3.1.8/debian/changelog 
source-highlight-3.1.8/debian/changelog
--- source-highlight-3.1.8/debian/changelog 2015-07-15 06:27:18.0 
+1000
+++ source-highlight-3.1.8/debian/changelog 2015-10-24 20:57:03.0 
+1000
@@ -1,3 +1,10 @@
+source-highlight (3.1.8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Rename library packages for g++5 transition (Closes: #797234)
+
+ -- Ben Burton   Sat, 24 Oct 2015 20:56:50 +1000
+
 source-highlight (3.1.8-1) unstable; urgency=low
 
   * New upstream release
diff -Nru source-highlight-3.1.8/debian/control 
source-highlight-3.1.8/debian/control
--- source-highlight-3.1.8/debian/control   2015-07-14 13:41:56.0 
+1000
+++ source-highlight-3.1.8/debian/control   2015-10-24 20:58:32.0 
+1000
@@ -21,7 +21,7 @@
 Package: libsource-highlight-dev
 Section: libdevel
 Architecture: any
-Depends: dpkg (>= 1.15.4) | install-info, libboost-dev, libsource-highlight4 
(= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: dpkg (>= 1.15.4) | install-info, libboost-dev, libsource-highlight4v5 
(= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Replaces: source-highlight (<< 3.1.4-1)
 Description: development files for source highlighting library
  These are the development files for the library that underlies the
@@ -30,10 +30,12 @@
  The library can be used by other C++ programs to get source code
  highlighting capabilities.
 
-Package: libsource-highlight4
+Package: libsource-highlight4v5
 Section: libs
 Architecture: any
 Depends: libsource-highlight-common, ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libsource-highlight4
+Replaces: libsource-highlight4
 Description: source highlighting library
  This is the library that underlies the source-highlight program
  suite.  It converts source code to a document with syntax
diff -Nru source-highlight-3.1.8/debian/libsource-highlight4.install 
source-highlight-3.1.8/debian/libsource-highlight4.install
--- source-highlight-3.1.8/debian/libsource-highlight4.install  2013-10-22 
22:58:26.0 +1000
+++ source-highlight-3.1.8/debian/libsource-highlight4.install  1970-01-01 
10:00:00.0 +1000
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff -Nru source-highlight-3.1.8/debian/libsource-highlight4v5.install 
source-highlight-3.1.8/debian/libsource-highlight4v5.install
--- source-highlight-3.1.8/debian/libsource-highlight4v5.install
1970-01-01 10:00:00.0 +1000
+++ source-highlight-3.1.8/debian/libsource-highlight4v5.install
2013-10-22 22:58:26.0 +1000
@@ -0,0 +1 @@
+usr/lib/lib*.so.*



Bug#797234: source-highlight, regina-normal and libstdc++6

2015-10-24 Thread Benjamin Burton
So: it turns out that the regina-normal build failure was not because of the 
libstdc++6 transition, but because source-highlight was built against an old 
version of libboost-regex.  It seems that between August and now, somebody has 
binNMUed source-highlight to use boost 1.58, and as a result the build failure 
for regina-normal has gone away (see the notes for #797292, which I have just 
closed).

That leaves the question: what to do with this bug?  I’m not sure whether 
libsource-highlight4 needs a rebuild with gcc5 - I do see lots of references to 
std::__cxx11::basic_string<…> in the output from “nm -gC”, but someone else 
would be better placed than me to give an opinion on whether this is enough for 
a rebuild.

- Ben.

--

A/Prof Benjamin Burton
Computational Geometry & Topology Group
School of Mathematics and Physics
The University of Queensland, Australia