[log4shib] 02/03: Undo g++5 ABI transition in order to build for jessie

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch debian/jessie-backports
in repository log4shib.

commit 52415812942044bf9de4bdea395a820569d2efbf
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Thu Aug 11 15:21:24 2016 +0200

    Undo g++5 ABI transition in order to build for jessie
    
    Revert "Rename library packages for g++5 ABI transition (closes: 791193)."
    
    This reverts commit c74236b2f4a5b2ca4ef78e42d6ba770ac7846163, but
    preserves the Debian changelog entry for the transition (1.0.8-1.1).
---
 debian/control                                          | 8 ++------
 debian/{liblog4shib1v5.install => liblog4shib1.install} | 0
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index da8db5b..a35fe8b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Homepage: https://wiki.shibboleth.net/confluence/display/OpenSAML/log4shib
 Vcs-Git: https://anonscm.debian.org/git/pkg-shibboleth/log4shib.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-shibboleth/log4shib.git
 
-Package: liblog4shib1v5
+Package: liblog4shib1
 Architecture: any
 Multi-Arch: same
 Pre-Depends:
@@ -26,10 +26,6 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs: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
@@ -47,7 +43,7 @@ Package: liblog4shib-dev
 Section: libdevel
 Architecture: any
 Depends:
- liblog4shib1v5 (= ${binary:Version}),
+ liblog4shib1 (= ${binary:Version}),
  ${misc:Depends},
 Suggests:
  liblog4shib-doc,
diff --git a/debian/liblog4shib1v5.install b/debian/liblog4shib1.install
similarity index 100%
rename from debian/liblog4shib1v5.install
rename to debian/liblog4shib1.install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/log4shib.git