Control: tags 790984 + patch pending
On Tue, 11 Aug 2015 at 00:39:53 +0200, Julien Cristau wrote:
> blitz::Timer::ivar_ gets renamed as part of the rebuild. While that
> looks like a private variable, it seems to be accessed by inlined
> methods, so I think that means libblitz0ldbl needs a rename.
I have uploaded a NMU to DELAYED/2. The only rdep is odin, which builds
successfully against the NMU.
Patch attached. Please let me know if I should reschedule or cancel this
(although this bug has now been RC for almost 2 weeks with no response,
so that seems somewhat unlikely).
Regards,
S
diffstat for blitz++-0.10 blitz++-0.10
changelog | 8 ++++++++
control | 8 ++++----
libblitz0.README.Debian | 20 --------------------
libblitz0ldbl.dirs | 1 -
libblitz0ldbl.docs | 1 -
libblitz0ldbl.lintian-overrides | 5 -----
libblitz0v5.README.Debian | 20 ++++++++++++++++++++
libblitz0v5.dirs | 1 +
libblitz0v5.docs | 1 +
rules | 4 ++--
10 files changed, 36 insertions(+), 33 deletions(-)
diff -Nru blitz++-0.10/debian/changelog blitz++-0.10/debian/changelog
--- blitz++-0.10/debian/changelog 2014-12-02 21:37:09.000000000 +0000
+++ blitz++-0.10/debian/changelog 2015-08-23 14:46:55.000000000 +0100
@@ -1,3 +1,11 @@
+blitz++ (1:0.10-3.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename library to libblitz0v5 for the libstdc++ transition
+ (Closes: #790984)
+
+ -- Simon McVittie <s...@debian.org> Sun, 23 Aug 2015 14:46:54 +0100
+
blitz++ (1:0.10-3.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru blitz++-0.10/debian/control blitz++-0.10/debian/control
--- blitz++-0.10/debian/control 2014-12-02 21:36:27.000000000 +0000
+++ blitz++-0.10/debian/control 2015-08-23 12:22:11.000000000 +0100
@@ -20,15 +20,15 @@
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/libblitz/trunk/
Homepage: http://oonumerics.org/blitz/
-Package: libblitz0ldbl
+Package: libblitz0v5
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Suggests: libblitz-doc
-Conflicts: libblitz0
+Conflicts: libblitz0, libblitz0ldbl
Provides: libblitz0
-Replaces: libblitz0
+Replaces: libblitz0, libblitz0ldbl
Description: C++ template class library for scientific computing
Blitz++ offers a high level of abstraction,
but performance which rivals Fortran. The
@@ -39,7 +39,7 @@
Package: libblitz0-dev
Architecture: any
Section: libdevel
-Depends: libblitz0ldbl (= ${binary:Version}),
+Depends: libblitz0v5 (= ${binary:Version}),
${misc:Depends}
Recommends: libblitz-doc
Conflicts: libblitz-dev,
diff -Nru blitz++-0.10/debian/libblitz0ldbl.dirs blitz++-0.10/debian/libblitz0ldbl.dirs
--- blitz++-0.10/debian/libblitz0ldbl.dirs 2008-05-29 07:21:53.000000000 +0100
+++ blitz++-0.10/debian/libblitz0ldbl.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru blitz++-0.10/debian/libblitz0ldbl.docs blitz++-0.10/debian/libblitz0ldbl.docs
--- blitz++-0.10/debian/libblitz0ldbl.docs 2008-05-29 07:21:53.000000000 +0100
+++ blitz++-0.10/debian/libblitz0ldbl.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README
diff -Nru blitz++-0.10/debian/libblitz0ldbl.lintian-overrides blitz++-0.10/debian/libblitz0ldbl.lintian-overrides
--- blitz++-0.10/debian/libblitz0ldbl.lintian-overrides 2008-05-29 07:21:53.000000000 +0100
+++ blitz++-0.10/debian/libblitz0ldbl.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# Development of libblitz seems to have been stalled and thus it seems
-# to make less sense to add a version to the package name if there are
-# no new versions to expect. This will change until new versions show
-# up on the horizont
-libblitz0ldbl: package-name-doesnt-match-sonames libblitz0
diff -Nru blitz++-0.10/debian/libblitz0.README.Debian blitz++-0.10/debian/libblitz0.README.Debian
--- blitz++-0.10/debian/libblitz0.README.Debian 2008-05-29 07:21:53.000000000 +0100
+++ blitz++-0.10/debian/libblitz0.README.Debian 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-blitz++ for DEBIAN
-
-This is the blitz++ (c++) numerical library for Debian.
-
-In some places, the package is called blitz, in others blitz++.
-For instance, the headers are in /usr/include/blitz .
-
-If you have installed the libblitz-doc package you will
-find some examples in /usr/share/doc/libblitz-doc/examples.
-There is a Makefile.examples to build and test all examples.
-
-The benchmark directory has not been installed here, because it
-tests blitz++ against FORTRAN 90, which is not available for debian.
-
-Packaged by
-John Lapeyre <lape...@physics.arizona.edu> Thu, 10 Sep 1998 15:58:31 -0700
-Took over by
-Konstantinos Margaritis <mar...@debian.org> Thu, 20 Apr 2000 12:45:08 +0300
-Group maintained since
-Andreas Tille <ti...@debian.org> Sun, 29 Apr 2007 17:06:38 +0200
diff -Nru blitz++-0.10/debian/libblitz0v5.dirs blitz++-0.10/debian/libblitz0v5.dirs
--- blitz++-0.10/debian/libblitz0v5.dirs 1970-01-01 01:00:00.000000000 +0100
+++ blitz++-0.10/debian/libblitz0v5.dirs 2008-05-29 07:21:53.000000000 +0100
@@ -0,0 +1 @@
+usr/lib
diff -Nru blitz++-0.10/debian/libblitz0v5.docs blitz++-0.10/debian/libblitz0v5.docs
--- blitz++-0.10/debian/libblitz0v5.docs 1970-01-01 01:00:00.000000000 +0100
+++ blitz++-0.10/debian/libblitz0v5.docs 2008-05-29 07:21:53.000000000 +0100
@@ -0,0 +1 @@
+README
diff -Nru blitz++-0.10/debian/libblitz0v5.README.Debian blitz++-0.10/debian/libblitz0v5.README.Debian
--- blitz++-0.10/debian/libblitz0v5.README.Debian 1970-01-01 01:00:00.000000000 +0100
+++ blitz++-0.10/debian/libblitz0v5.README.Debian 2008-05-29 07:21:53.000000000 +0100
@@ -0,0 +1,20 @@
+blitz++ for DEBIAN
+
+This is the blitz++ (c++) numerical library for Debian.
+
+In some places, the package is called blitz, in others blitz++.
+For instance, the headers are in /usr/include/blitz .
+
+If you have installed the libblitz-doc package you will
+find some examples in /usr/share/doc/libblitz-doc/examples.
+There is a Makefile.examples to build and test all examples.
+
+The benchmark directory has not been installed here, because it
+tests blitz++ against FORTRAN 90, which is not available for debian.
+
+Packaged by
+John Lapeyre <lape...@physics.arizona.edu> Thu, 10 Sep 1998 15:58:31 -0700
+Took over by
+Konstantinos Margaritis <mar...@debian.org> Thu, 20 Apr 2000 12:45:08 +0300
+Group maintained since
+Andreas Tille <ti...@debian.org> Sun, 29 Apr 2007 17:06:38 +0200
diff -Nru blitz++-0.10/debian/rules blitz++-0.10/debian/rules
--- blitz++-0.10/debian/rules 2014-10-02 15:51:39.000000000 +0100
+++ blitz++-0.10/debian/rules 2015-08-23 14:46:52.000000000 +0100
@@ -3,7 +3,7 @@
# 2011 Andreas Tille <ti...@debian.org>
libname=libblitz
-pkgname=$(libname)0ldbl
+pkgname=$(libname)0v5
docname=$(libname)-doc
PREFIX = /usr
@@ -49,7 +49,7 @@
override_dh_install:
dh_install
- d-shlibmove --ldbl --commit \
+ d-shlibmove --v5 --commit \
--exclude-la \
--movedev "debian/tmp/usr/lib/pkgconfig/blitz.pc" usr/lib/pkgconfig \
lib/.libs/libblitz.so
