[gmp-ecm] 01/01: Imported Debian patch 6.4.4+ds-2 (libdev transition stabilization)

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository gmp-ecm.

commit afe443b06e964f293c70c24750ff3d5ff0fd6436
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Jul 16 18:07:33 2015 +0200

    Imported Debian patch 6.4.4+ds-2 (libdev transition stabilization)
---
 debian/changelog                            |  6 ++++++
 debian/control                              | 11 ++++++-----
 debian/libecm0-dev-common.lintian-overrides |  2 ++
 debian/libecm0-dev.lintian-overrides        |  2 ++
 debian/libecm0.lintian-overrides            |  3 ---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e71e72..6a12320 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gmp-ecm (6.4.4+ds-2) unstable; urgency=medium
+
+  * RC bug fix release (Closes: 792549), stabilize libdev transition.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 16 Jul 2015 16:07:37 +0000
+
 gmp-ecm (6.4.4+ds-1) unstable; urgency=medium
 
   * New maintainer (Closes: #771880).
diff --git a/debian/control b/debian/control
index 1260c1c..4149a1d 100644
--- a/debian/control
+++ b/debian/control
@@ -41,10 +41,10 @@ Package: libecm0
 Provides: libecm
 Section: libs
 Architecture: any
+Conflicts: libecm
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: gmp-ecm (=${binary:Version})
-Conflicts: libecm
 Multi-Arch: same
 Description: factor integers using the Elliptic Curve Method -- lib
  gmp-ecm is a free implementation of the Elliptic Curve Method (ECM)
@@ -70,11 +70,11 @@ Provides: libecm-dev
 Section: libdevel
 Architecture: any
 Replaces: libecm-dev (<= 6.4.4-2)
-Breaks: libecm-dev (<= 6.4.4-2)
+Conflicts: libecm-dev (<= 6.4.4-2)
+#Conflicts: libecm-dev
 Depends:
  libecm0 (= ${binary:Version}), libecm0-dev-common (= ${source:Version}),
  libgmp-dev, ${misc:Depends}
-#Conflicts: libecm-dev
 Multi-Arch: same
 Description: factor integers using the Elliptic Curve Method -- libdev
  gmp-ecm is a free implementation of the Elliptic Curve Method (ECM)
@@ -100,9 +100,10 @@ Package: libecm0-dev-common
 Provides: libecm-dev-common
 Section: libdevel
 Architecture: all
+Replaces: libecm-dev (<= 6.4.4-2)
+Conflicts: libecm-dev (<= 6.4.4-2), libecm-dev-common
 Depends: ${misc:Depends}
 Recommends: libecm0-dev (=${binary:Version})
-Conflicts: libecm-dev-common
 Multi-Arch: foreign
 Description: factor integers using the Elliptic Curve Method -- header
  gmp-ecm is a free implementation of the Elliptic Curve Method (ECM)
@@ -128,8 +129,8 @@ Provides: libecm-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libecm0 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libecm-dbg
+Depends: libecm0 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: factor integers using the Elliptic Curve Method -- debug
  gmp-ecm is a free implementation of the Elliptic Curve Method (ECM)
diff --git a/debian/libecm0-dev-common.lintian-overrides b/debian/libecm0-dev-common.lintian-overrides
new file mode 100644
index 0000000..55e9054
--- /dev/null
+++ b/debian/libecm0-dev-common.lintian-overrides
@@ -0,0 +1,2 @@
+# Breaks appears too weak during upgrade tests with piuparts(1)
+libecm0-dev-common: conflicts-with-version libecm-dev (<= 6.4.4-2)
diff --git a/debian/libecm0-dev.lintian-overrides b/debian/libecm0-dev.lintian-overrides
new file mode 100644
index 0000000..98569b1
--- /dev/null
+++ b/debian/libecm0-dev.lintian-overrides
@@ -0,0 +1,2 @@
+# Breaks appears too weak during upgrade tests with piuparts(1)
+libecm0-dev: conflicts-with-version libecm-dev (<= 6.4.4-2)
diff --git a/debian/libecm0.lintian-overrides b/debian/libecm0.lintian-overrides
index 7aa6e06..5c555bc 100644
--- a/debian/libecm0.lintian-overrides
+++ b/debian/libecm0.lintian-overrides
@@ -14,6 +14,3 @@ libecm0: shlib-calls-exit
 # The issue was discussed with the upstream maintainer.
 # -- Jerome Benoit <calculus at rezozer.net>  Fri, 29 May 2015
 libecm0: no-symbols-control-file
-
-# WIP
-# libecm0: shlib-with-executable-stack

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