[ppl] 64/68: Imported Debian patch 1:1.1-6

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ppl.

commit 64be67bb8dae3e6831ed7073621947332874cba4
Author: Michael Tautschnig <mt at debian.org>
Date:   Tue Aug 25 21:24:30 2015 +0100

    Imported Debian patch 1:1.1-6
---
 debian/changelog              | 14 +++++++++++++-
 debian/control                |  6 ++++--
 debian/libppl-dev.maintscript |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3e033b..a58fedb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ppl (1:1.1-6) unstable; urgency=low
+
+  * Re-adopting the package. Closes: #791996.
+  * libppl-dev.maintscript: Perform the symlink_to_dir migration of
+    /usr/share/doc/libppl-dev. The symlink dates back to the package in lenny
+    as the libppl-dev package did not exist in squeeze or wheezy.
+    Closes: #788455.
+  * libppl-dev: Update Breaks+Conflicts to match Replaces+Provides.
+  * Thanks Andreas Beckmann <anbe at debian.org> for those two patches.
+
+ -- Michael Tautschnig <mt at debian.org>  Tue, 25 Aug 2015 21:24:30 +0100
+
 ppl (1:1.1-5) unstable; urgency=medium
 
   * QA upload.
@@ -44,7 +56,7 @@ ppl (1:1.1~pre8-1) experimental; urgency=low
 
  -- Matthias Klose <doko at debian.org>  Thu, 09 May 2013 13:16:42 +0200
 
-ppl (1:1.0-7) medium; urgency=low
+ppl (1:1.0-7) unstable; urgency=low
 
   * Fix typo in libppl-doc dependencies.
   * Proper fix to build with both gmp 5.0 and 5.1.
diff --git a/debian/control b/debian/control
index 51ed2de..542c21b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ppl
 Section: libs
 Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
+Maintainer: Michael Tautschnig <mt at debian.org>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 6.0.7~), dh-autoreconf,
  libgmp-dev, swi-prolog [!hurd-i386], chrpath,
@@ -33,8 +33,10 @@ Section: libdevel
 Depends: libppl13 (= ${binary:Version}), libppl-c4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: libppl-c-dev, libppl0.12-dev
 Recommends: libgmp3-dev (>= 4.1.3)
+# B+R: libppl6 can be removed after stretch was released
 Replaces: libppl6, libppl7 (<< 0.10~pre27-4), libppl9, libppl0.12-dev
-Conflicts: libppl0.10-dev, libppl0.11-dev
+Breaks: libppl6, libppl7 (<< 0.10~pre27-4), libppl9
+Conflicts: libppl0.10-dev, libppl0.11-dev, libppl0.12-dev
 Suggests: libppl-doc
 Description: Parma Polyhedra Library (development)
  The Parma Polyhedra Library (PPL) is a C++ library for the
diff --git a/debian/libppl-dev.maintscript b/debian/libppl-dev.maintscript
new file mode 100644
index 0000000..262881b
--- /dev/null
+++ b/debian/libppl-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/libppl-dev libppl6 1:1.1-5~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git