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

[kobold at alioth.debian.org]

Author: kobold
Date: 2008-01-28 16:42:14 +0000 (Mon, 28 Jan 2008)
New Revision: 1360

Added:
   packages/geos/trunk/debian/libgeos-3.0.0.dirs
   packages/geos/trunk/debian/libgeos-3.0.0.install
Removed:
   packages/geos/trunk/debian/libgeos3.dirs
   packages/geos/trunk/debian/libgeos3.install
Modified:
   packages/geos/trunk/debian/changelog
   packages/geos/trunk/debian/control
Log:
* Renamed binary package libgeos2c2a to libgeos-3.0.0 for C++ ABI transition.

Modified: packages/geos/trunk/debian/changelog
===================================================================
--- packages/geos/trunk/debian/changelog	2008-01-28 13:31:42 UTC (rev 1359)
+++ packages/geos/trunk/debian/changelog	2008-01-28 16:42:14 UTC (rev 1360)
@@ -10,13 +10,10 @@
 
   [ Fabio Tranchitella ]
   * New upstream release. (Closes: #458893, #456089)
-  * Renamed binary package libgeos2c2a to libgeos3 for C++ ABI transition.
+  * Renamed binary package libgeos2c2a to libgeos-3.0.0 for C++ ABI transition.
 
-  [ Francesco Paolo Lovergine ]
-  * 
+ -- Fabio Tranchitella <kobold at debian.org>  Mon, 28 Jan 2008 17:42:00 +0100
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 28 Jan 2008 14:27:57 +0100
-
 geos (2.2.3-4) unstable; urgency=low
 
   [ Fabio Tranchitella ]

Modified: packages/geos/trunk/debian/control
===================================================================
--- packages/geos/trunk/debian/control	2008-01-28 13:31:42 UTC (rev 1359)
+++ packages/geos/trunk/debian/control	2008-01-28 16:42:14 UTC (rev 1360)
@@ -12,7 +12,11 @@
 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
 Suggests: libgdal-doc
 Description: Geometry engine for GIS - Development files
  GEOS provides a spatial object model and fundamental geometric
@@ -43,7 +47,7 @@
  This package contains the C library. A C++ library is provided
  by the libgeos* package.
 
-Package: libgeos3
+Package: libgeos-3.0.0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

Copied: packages/geos/trunk/debian/libgeos-3.0.0.dirs (from rev 1357, packages/geos/trunk/debian/libgeos3.dirs)
===================================================================
--- packages/geos/trunk/debian/libgeos-3.0.0.dirs	                        (rev 0)
+++ packages/geos/trunk/debian/libgeos-3.0.0.dirs	2008-01-28 16:42:14 UTC (rev 1360)
@@ -0,0 +1 @@
+usr/lib

Copied: packages/geos/trunk/debian/libgeos-3.0.0.install (from rev 1358, packages/geos/trunk/debian/libgeos3.install)
===================================================================
--- packages/geos/trunk/debian/libgeos-3.0.0.install	                        (rev 0)
+++ packages/geos/trunk/debian/libgeos-3.0.0.install	2008-01-28 16:42:14 UTC (rev 1360)
@@ -0,0 +1 @@
+usr/lib/libgeos-3*

Deleted: packages/geos/trunk/debian/libgeos3.dirs
===================================================================
--- packages/geos/trunk/debian/libgeos3.dirs	2008-01-28 13:31:42 UTC (rev 1359)
+++ packages/geos/trunk/debian/libgeos3.dirs	2008-01-28 16:42:14 UTC (rev 1360)
@@ -1 +0,0 @@
-usr/lib

Deleted: packages/geos/trunk/debian/libgeos3.install
===================================================================
--- packages/geos/trunk/debian/libgeos3.install	2008-01-28 13:31:42 UTC (rev 1359)
+++ packages/geos/trunk/debian/libgeos3.install	2008-01-28 16:42:14 UTC (rev 1360)
@@ -1 +0,0 @@
-usr/lib/libgeos-3*