This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qgis.
commit 8168b627532d0b0ec3b2aff1babcceba30d22c2e
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Dec 8 23:33:45 2014 +0100
Replace qgis-mapserver by qgis-server using Provides/Conflicts/Replaces.
---
debian/changelog | 1 +
debian/control | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9a1da69..a57da01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qgis (2.6.1-1~exp1) UNRELEASED; urgency=medium
* Add upstream metadata.
* Refresh patches.
* Update symbols for amd64.
+ * Replace qgis-mapserver by qgis-server using Provides/Conflicts/Replaces.
-- Bas Couwenberg <sebas...@xs4all.nl> Wed, 03 Dec 2014 13:03:31 +0100
diff --git a/debian/control b/debian/control
index 151148e..b98f8e4 100644
--- a/debian/control
+++ b/debian/control
@@ -315,11 +315,12 @@ Description: collection of data providers to QGIS -
architecture-independent fil
Package: qgis-server
Architecture: any
-Provides: qgis-mapserver
-Replaces: qgis-mapserver
Depends: qgis-providers (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
+Conflicts: qgis-mapserver
+Provides: qgis-mapserver
+Replaces: qgis-mapserver
Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/qgis.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
