[postgis] 02/02: Add Conficts on postgresql-9.5-postgis-2.2-scripts to 2.3-scripts package.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository postgis.

commit 10477b980ffb3bf7c242835d38c8b38229ab1285
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 8 21:17:07 2016 +0200

    Add Conficts on postgresql-9.5-postgis-2.2-scripts to 2.3-scripts package.
---
 debian/changelog  | 6 ++++++
 debian/control    | 1 +
 debian/control.in | 1 +
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a8eaba0..321d3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgis (2.3.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Add Conficts on postgresql-9.5-postgis-2.2-scripts to 2.3-scripts package.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 08 Sep 2016 21:15:56 +0200
+
 postgis (2.3.0~beta1+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.
diff --git a/debian/control b/debian/control
index 0b629bd..a0db6cf 100644
--- a/debian/control
+++ b/debian/control
@@ -123,6 +123,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Recommends: postgresql-9.5-postgis-2.3
 Breaks: postgresql-9.5-postgis-scripts (<< 2.2.2+dfsg-3~)
+Conflicts: postgresql-9.5-postgis-2.2-scripts
 Replaces: postgresql-9.5-postgis-scripts (<< 2.2.2+dfsg-3~)
 Description: Geographic objects support for PostgreSQL 9.5 -- scripts
  PostGIS adds support for geographic objects to the PostgreSQL
diff --git a/debian/control.in b/debian/control.in
index 4a0b100..fc03efe 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -123,6 +123,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Recommends: postgresql-PGVERSION-postgis-2.3
 Breaks: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
+Conflicts: postgresql-PGVERSION-postgis-2.2-scripts
 Replaces: postgresql-PGVERSION-postgis-scripts (<< 2.2.2+dfsg-3~)
 Description: Geographic objects support for PostgreSQL PGVERSION -- 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