Bug#791001: nmu diff for clhep 2.1.4.1-1.2

Julien Cristau jcristau at debian.org
Mon Aug 17 19:04:35 UTC 2015


Dear maintainer,

I've prepared a NMU for clhep, to deal with the libstdc++ transition,
and will shortly upload it to the 1-day delayed queue.  Please find the
debdiff below.

Cheers,
Julien

>From d287ea2812f689081253aedb8e6ac29dfe6af397 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Sun, 16 Aug 2015 17:33:27 +0200
Subject: [PATCH] Rename library packages for g++5 ABI transition (closes:
 791001).

---
 debian/changelog             | 7 +++++++
 debian/control               | 6 ++++--
 debian/libclhep2.1.install   | 1 -
 debian/libclhep2.1v5.install | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 debian/libclhep2.1.install
 create mode 100644 debian/libclhep2.1v5.install

diff --git a/debian/changelog b/debian/changelog
index 1de3786..a9d7eee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clhep (2.1.4.1-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition (closes: 791001).
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 16 Aug 2015 17:33:27 +0200
+
 clhep (2.1.4.1-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 82c00a0..0e10ecf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,13 @@ Homepage: http://proj-clhep.web.cern.ch/proj-clhep/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/clhep.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/clhep.git;a=summary
 
-Package: libclhep2.1
+Package: libclhep2.1v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libclhep2.1
+Replaces: libclhep2.1
 Description: CLHEP: A Class Library for High Energy Physics
  CLHEP provides a set of HEP-specific foundation and utility classes such
  as random generators, physics vectors, geometry and linear algebra.
@@ -23,7 +25,7 @@ Description: CLHEP: A Class Library for High Energy Physics
 Package: libclhep-dev
 Architecture: any
 Section: libdevel
-Depends: libclhep2.1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libclhep2.1v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: clhep-doc
 Description: CLHEP: A Class Library for High Energy Physics - development
  CLHEP provides a set of HEP-specific foundation and utility classes such
diff --git a/debian/libclhep2.1.install b/debian/libclhep2.1.install
deleted file mode 100644
index 88b7ef7..0000000
--- a/debian/libclhep2.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libCLHEP.so.*
diff --git a/debian/libclhep2.1v5.install b/debian/libclhep2.1v5.install
new file mode 100644
index 0000000..88b7ef7
--- /dev/null
+++ b/debian/libclhep2.1v5.install
@@ -0,0 +1 @@
+usr/lib/*/libCLHEP.so.*
-- 
2.5.0



More information about the debian-science-maintainers mailing list