[postgis] 02/03: Declare Conflicts: -2.3-scripts in -2.4-scripts.

[Christoph Berg]

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

myon pushed a commit to branch experimental
in repository postgis.

commit 78535b29b2624b03505371adecb2dddc72410538
Author: Christoph Berg <myon at debian.org>
Date:   Wed Sep 13 22:39:48 2017 +0200

    Declare Conflicts: -2.3-scripts in -2.4-scripts.
---
 debian/changelog  | 1 +
 debian/control    | 3 ++-
 debian/control.in | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03e126b..4c4ddbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ postgis (2.4.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
   * Clarify -scripts package description; the SQL files are also necessary for
     the initial installation.
   * debian/rules: Fix rdfind invocation to find SQL file duplicates properly.
+  * Declare Conflicts: -2.3-scripts in -2.4-scripts.
 
  -- Christoph Berg <myon at debian.org>  Mon, 11 Sep 2017 20:54:16 +0200
 
diff --git a/debian/control b/debian/control
index e0489a2..15ed17b 100644
--- a/debian/control
+++ b/debian/control
@@ -152,7 +152,8 @@ Depends: ${perl:Depends},
          ${misc:Depends}
 Recommends: postgresql-9.6-postgis-2.4
 Breaks: postgresql-9.6-postgis-scripts (<< 2.2.2+dfsg-3~)
-Conflicts: postgresql-9.6-postgis-2.2-scripts
+Conflicts: postgresql-9.6-postgis-2.2-scripts,
+           postgresql-9.6-postgis-2.3-scripts
 Replaces: postgresql-9.6-postgis-scripts (<< 2.2.2+dfsg-3~)
 Description: Geographic objects support for PostgreSQL 9.6 -- SQL scripts
  PostGIS adds support for geographic objects to the PostgreSQL
diff --git a/debian/control.in b/debian/control.in
index db01a85..18b1b3e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -152,7 +152,8 @@ Depends: ${perl:Depends},
          ${misc:Depends}
 Recommends: postgresql-PGVERSION-postgis-2.4
 Breaks: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
-Conflicts: postgresql-PGVERSION-postgis-2.2-scripts
+Conflicts: postgresql-PGVERSION-postgis-2.2-scripts,
+           postgresql-PGVERSION-postgis-2.3-scripts
 Replaces: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
 Description: Geographic objects support for PostgreSQL PGVERSION -- SQL scripts
  PostGIS adds support for geographic objects to the PostgreSQL

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