[DebianGIS-dev] r1361 - packages/geos/trunk/debian

[kobold at alioth.debian.org]

Author: kobold
Date: 2008-01-28 16:43:27 +0000 (Mon, 28 Jan 2008)
New Revision: 1361

Modified:
   packages/geos/trunk/debian/control
Log:
updates.


Modified: packages/geos/trunk/debian/control
===================================================================
--- packages/geos/trunk/debian/control	2008-01-28 16:42:14 UTC (rev 1360)
+++ packages/geos/trunk/debian/control	2008-01-28 16:43:27 UTC (rev 1361)
@@ -12,11 +12,7 @@
 Package: libgeos-dev
 Section: libdevel
 Architecture: any
-<<<<<<< .mine
-Depends: libgeos-3.0.0 (= ${Source-Version}), libgeos-c1 (= ${Source-Version})
-=======
-Depends: libgeos3 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
->>>>>>> .r1359
+Depends: libgeos-3.0.0 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
 Suggests: libgdal-doc
 Description: Geometry engine for GIS - Development files
  GEOS provides a spatial object model and fundamental geometric