[hdf4] 01/05: Add Conflicts to -dev packages instead of Breaks/Replaces.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository hdf4.

commit f8b67cd7a5d4bd2743c19cbc6ddd6c32ffe71857
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 1 17:53:12 2016 +0200

    Add Conflicts to -dev packages instead of Breaks/Replaces.
---
 debian/changelog  | 7 +++++++
 debian/control    | 8 ++++----
 debian/control.in | 8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4fdafed..072b991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libhdf4 (4.2.12-1~exp2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Add Conflicts to -dev packages instead of Breaks/Replaces.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Jul 2016 17:52:48 +0200
+
 libhdf4 (4.2.12-1~exp1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 04fce31..4d15ad8 100644
--- a/debian/control
+++ b/debian/control
@@ -80,6 +80,7 @@ Depends: libhdf4-0 (= ${binary:Version}),
          libjpeg-dev,
          ${misc:Depends}
 Breaks: libhdf4g-dev (<< 4.2r4-1)
+Conflicts: libhdf4-alt-dev
 Replaces: libhdf4g-dev (<< 4.2r4-1)
 Description: Hierarchical Data Format development files (embedded NetCDF)
  HDF is a multi-object file format for storing and transferring
@@ -144,10 +145,9 @@ Depends: libhdf4-0-alt (= ${binary:Version}),
          libjpeg-dev,
          libnetcdf-dev,
          ${misc:Depends}
-Breaks: libhdf4-dev (<< 4.11),
-        libhdf4g-dev (<< 4.2r4-1)
-Replaces: libhdf4-dev (<< 4.11),
-          libhdf4g-dev (<< 4.2r4-1)
+Breaks: libhdf4g-dev (<< 4.2r4-1)
+Conflicts: libhdf4-dev
+Replaces: libhdf4g-dev (<< 4.2r4-1)
 Description: Hierarchical Data Format development files (without NetCDF)
  HDF is a multi-object file format for storing and transferring
  graphical and numerical data mainly used in scientific computing. HDF
diff --git a/debian/control.in b/debian/control.in
index 76efa32..823c121 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -80,6 +80,7 @@ Depends: @PACKAGE at -0 (= ${binary:Version}),
          libjpeg-dev,
          ${misc:Depends}
 Breaks: @PACKAGE at g-dev (<< 4.2r4-1)
+Conflicts: @PACKAGE at -alt-dev
 Replaces: @PACKAGE at g-dev (<< 4.2r4-1)
 Description: Hierarchical Data Format development files (embedded NetCDF)
  HDF is a multi-object file format for storing and transferring
@@ -144,10 +145,9 @@ Depends: @PACKAGE at -@SOVER at -alt (= ${binary:Version}),
          libjpeg-dev,
          libnetcdf-dev,
          ${misc:Depends}
-Breaks: @PACKAGE at -dev (<< 4.11),
-        @PACKAGE at g-dev (<< 4.2r4-1)
-Replaces: @PACKAGE at -dev (<< 4.11),
-          @PACKAGE at g-dev (<< 4.2r4-1)
+Breaks: @PACKAGE at g-dev (<< 4.2r4-1)
+Conflicts: @PACKAGE at -dev
+Replaces: @PACKAGE at g-dev (<< 4.2r4-1)
 Description: Hierarchical Data Format development files (without NetCDF)
  HDF is a multi-object file format for storing and transferring
  graphical and numerical data mainly used in scientific computing. HDF

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