[gmp-ecm] 01/01: debianization: d/control revision: fix #819802

[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 308b15483e14217655d07a230785e660b51a97e6
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Apr 2 17:59:40 2016 +0200

    debianization: d/control revision: fix #819802
---
 debian/changelog                                   |  8 +++---
 debian/control                                     | 30 +++++-----------------
 ...ecm1-dev-common.docs => libecm-dev-common.docs} |  0
 ...-common.examples => libecm-dev-common.examples} |  0
 ...ev-common.install => libecm-dev-common.install} |  0
 debian/{libecm1-dev.install => libecm-dev.install} |  0
 debian/libecm1-dev-common.lintian-overrides        |  2 --
 debian/libecm1-dev.lintian-overrides               |  2 --
 debian/rules                                       |  2 +-
 9 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4a1a9c1..29df79b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-gmp-ecm (7.0+ds-2~1) UNRELEASED; urgency=medium
+gmp-ecm (7.0+ds-2) unstable; urgency=medium
 
   * Debianization:
     - debian/control:
-      - lib Recoomends field, discard (Closes: #819696).
+      - lib Recommends field, discard (Closes: #819696);
+      - lib Conflicts field, discard (Closes: #819802);
+      - Provides/Breaks/Conflicts policy, revisit.
 
- -- Jerome Benoit <calculus at rezozer.net>  Fri, 01 Apr 2016 02:00:42 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 02 Apr 2016 15:54:49 +0000
 
 gmp-ecm (7.0+ds-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e287b97..49d5a6c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9),
- autotools-dev, gnulib, m4 [amd64 kfreebsd-amd64], dh-autoreconf, libtool,
+ autotools-dev, gnulib, m4, dh-autoreconf, libtool,
  libgmp-dev (>= 2:6.0)
-Build-Depends-Indep:
+#Build-Depends-Indep:
 Standards-Version: 3.9.7
 Homepage: http://ecm.gforge.inria.fr/
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gmp-ecm.git
@@ -43,7 +43,6 @@ Package: libecm1
 Provides: libecm
 Section: libs
 Architecture: any
-Conflicts: libecm
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
@@ -66,15 +65,11 @@ Description: factor integers using the Elliptic Curve Method -- lib
  .
  This package provides the shared library.
 
-Package: libecm1-dev
-Provides: libecm-dev
+Package: libecm-dev
 Section: libdevel
 Architecture: any
-Replaces: libecm-dev (<= 6.4.4-2)
-Conflicts: libecm-dev (<= 6.4.4-2)
-#Conflicts: libecm-dev
 Depends:
- libecm1 (= ${binary:Version}), libecm1-dev-common (= ${source:Version}),
+ libecm1 (= ${binary:Version}), libecm-dev-common (= ${source:Version}),
  libgmp-dev, ${misc:Depends}
 Multi-Arch: same
 Description: factor integers using the Elliptic Curve Method -- libdev
@@ -97,14 +92,13 @@ Description: factor integers using the Elliptic Curve Method -- libdev
  This package provides the static library and symbolic links needed
  for development.
 
-Package: libecm1-dev-common
-Provides: libecm-dev-common
+Package: libecm-dev-common
 Section: libdevel
 Architecture: all
 Replaces: libecm-dev (<= 6.4.4-2)
-Conflicts: libecm-dev (<= 6.4.4-2), libecm-dev-common
+Breaks: libecm-dev (<= 6.4.4-2)
 Depends: ${misc:Depends}
-Recommends: libecm1-dev (=${binary:Version})
+Recommends: libecm-dev (=${binary:Version})
 Multi-Arch: foreign
 Description: factor integers using the Elliptic Curve Method -- header
  gmp-ecm is a free implementation of the Elliptic Curve Method (ECM)
@@ -124,13 +118,3 @@ Description: factor integers using the Elliptic Curve Method -- header
  information about ecmnet.
  .
  This package provides the header needed by developers.
-
-Package: libecm-dev
-Section: oldlibs
-Priority: extra
-Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libecm1-dev (>= ${source:Version}), ${misc:Depends}
-Multi-Arch: foreign
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
diff --git a/debian/libecm1-dev-common.docs b/debian/libecm-dev-common.docs
similarity index 100%
rename from debian/libecm1-dev-common.docs
rename to debian/libecm-dev-common.docs
diff --git a/debian/libecm1-dev-common.examples b/debian/libecm-dev-common.examples
similarity index 100%
rename from debian/libecm1-dev-common.examples
rename to debian/libecm-dev-common.examples
diff --git a/debian/libecm1-dev-common.install b/debian/libecm-dev-common.install
similarity index 100%
rename from debian/libecm1-dev-common.install
rename to debian/libecm-dev-common.install
diff --git a/debian/libecm1-dev.install b/debian/libecm-dev.install
similarity index 100%
rename from debian/libecm1-dev.install
rename to debian/libecm-dev.install
diff --git a/debian/libecm1-dev-common.lintian-overrides b/debian/libecm1-dev-common.lintian-overrides
deleted file mode 100644
index 2f47eb2..0000000
--- a/debian/libecm1-dev-common.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Breaks appears too weak during upgrade tests with piuparts(1)
-libecm1-dev-common: conflicts-with-version libecm-dev (<= 6.4.4-2)
diff --git a/debian/libecm1-dev.lintian-overrides b/debian/libecm1-dev.lintian-overrides
deleted file mode 100644
index 179097e..0000000
--- a/debian/libecm1-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Breaks appears too weak during upgrade tests with piuparts(1)
-libecm1-dev: conflicts-with-version libecm-dev (<= 6.4.4-2)
diff --git a/debian/rules b/debian/rules
index 60ace5c..1db5962 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_install-indep:
 	$(MAKE) -C _build install-data-am DESTDIR=$(CURDIR)/debian/tmp
 
 override_dh_installdocs:
-	dh_installdocs -plibecm1-dev --link-doc=libecm1-dev-common
+	dh_installdocs -plibecm-dev --link-doc=libecm-dev-common
 	dh_installdocs --remaining-packages
 
 override_dh_compress-indep:

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