Bug#791193: nmu diff for log4shib 1.0.8-1.1

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


Dear maintainer,

I've prepared a NMU for log4shib, 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 383d27b255c49bcdd57524e868f5082d1d129938 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau at debian.org>
Date: Sun, 16 Aug 2015 17:46:01 +0200
Subject: [PATCH] Rename library packages for g++5 ABI transition (closes:
 791193).

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

diff --git a/debian/changelog b/debian/changelog
index 8524406..2e71350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+log4shib (1.0.8-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename library packages for g++5 ABI transition (closes: 791193).
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 16 Aug 2015 17:46:01 +0200
+
 log4shib (1.0.8-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e46c657..aa91ecf 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,13 @@ Homepage: https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
 Vcs-Git: git://anonscm.debian.org/pkg-shibboleth/log4shib.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shibboleth/log4shib.git
 
-Package: liblog4shib1
+Package: liblog4shib1v5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: liblog4shib1
+Replaces: liblog4shib1
 Description: log4j-style configurable logging library for C++ (runtime)
  log4shib provides a library of C++ classes for flexible logging to
  files, syslog, and other destinations.  It is modeled after the log4j
@@ -31,7 +33,7 @@ Description: log4j-style configurable logging library for C++ (runtime)
 Package: liblog4shib-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, liblog4shib1 (= ${binary:Version})
+Depends: ${misc:Depends}, liblog4shib1v5 (= ${binary:Version})
 Suggests: liblog4shib-doc
 Description: log4j-style configurable logging library for C++ (development)
  log4shib provides a library of C++ classes for flexible logging to
diff --git a/debian/liblog4shib1.install b/debian/liblog4shib1.install
deleted file mode 100644
index 3ddde58..0000000
--- a/debian/liblog4shib1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff --git a/debian/liblog4shib1v5.install b/debian/liblog4shib1v5.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/liblog4shib1v5.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
-- 
2.5.0



More information about the Pkg-shibboleth-devel mailing list