[DebianGIS-dev] r1748 - packages/gpsdrive/trunk/debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-08-06 23:19:13 +0000 (Wed, 06 Aug 2008)
New Revision: 1748

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/control
Log:
Remove Conflict, gpsdrive was already added with a versioned dependency.


Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog	2008-08-06 22:42:50 UTC (rev 1747)
+++ packages/gpsdrive/trunk/debian/changelog	2008-08-06 23:19:13 UTC (rev 1748)
@@ -1,12 +1,12 @@
 gpsdrive (2.10~pre4-5) UNRELEASED; urgency=low
 
-  * Add missing Conflicts/Replaces to the gpsdrive-data package
+  * Add missing Replaces to the gpsdrive-data package
     and add a dependency on gpsdrive. (Closes: #493892)
   * Update Suggests and README.Debian to postgresql-8.3-postgis.
   * Remove make install for map-icons in debian/rules.
   * Added Vcs-* fields to debian/control. 
 
- -- Andreas Putzo <andreas at putzo.net>  Wed, 06 Aug 2008 22:39:36 +0000
+ -- Andreas Putzo <andreas at putzo.net>  Wed, 06 Aug 2008 23:18:07 +0000
 
 gpsdrive (2.10~pre4-4) unstable; urgency=low
 

Modified: packages/gpsdrive/trunk/debian/control
===================================================================
--- packages/gpsdrive/trunk/debian/control	2008-08-06 22:42:50 UTC (rev 1747)
+++ packages/gpsdrive/trunk/debian/control	2008-08-06 23:19:13 UTC (rev 1748)
@@ -27,7 +27,6 @@
 Package: gpsdrive-data
 Architecture: all
 Depends: gpsdrive (>= 2.10~pre4-5)
-Conflicts: gpsdrive (<= 2.10~pre4-4)
 Replaces: gpsdrive (<= 2.10~pre4-4)
 Description: Car naviagion system
  Map-based navigation system that displays the current