[postgis] 01/01: It should have been a Conflicts: rather than just Breaks: Correct.

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository postgis.

commit e221678acd2b17fa4bdc156b0f3619b821c56adf
Author: Markus Wanner <markus at bluegap.ch>
Date:   Fri May 23 08:57:43 2014 +0200

    It should have been a Conflicts: rather than just Breaks: Correct.
---
 debian/changelog  | 6 +++---
 debian/control    | 2 +-
 debian/control.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a197fa7..55f37c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,9 @@ postgis (2.1.3+dfsg-3) UNRELEASED; urgency=low
 
   * In patch use-debian-maven: Also drop the version requirement for the
     maven-javadoc-plugin.
-  * Add a Breaks: liblwgeom-2.1.2 due to the attempted quick security fix
-    in 2.1.3+dfsg-2, which shipped liblwgeom-2.1.3.so in a package named
-    liblwgeom-2.1.2.
+  * Add a Conflicts: liblwgeom-2.1.2 due to the attempted quick security
+    fix in 2.1.3+dfsg-2, which shipped liblwgeom-2.1.3.so in a package
+    named liblwgeom-2.1.2.
 
  -- Markus Wanner <markus at bluegap.ch>  Thu, 22 May 2014 17:59:05 +0200
 
diff --git a/debian/control b/debian/control
index 52ca37d..3fed5b1 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Package: liblwgeom-2.1.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: liblwgeom-2.1.2 (= 2.1.3+dfsg-1)
+Conflicts: liblwgeom-2.1.2 (= 2.1.3+dfsg-1)
 Description: PostGIS "Lightweight Geometry" library
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"
diff --git a/debian/control.in b/debian/control.in
index 644c638..0d66497 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -90,7 +90,7 @@ Package: liblwgeom-2.1.3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: liblwgeom-2.1.2 (= 2.1.3+dfsg-1)
+Conflicts: liblwgeom-2.1.2 (= 2.1.3+dfsg-1)
 Description: PostGIS "Lightweight Geometry" library
  PostGIS adds support for geographic objects to the PostgreSQL
  object-relational database. In effect, PostGIS "spatially enables"

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