[DebianGIS-dev] r1353 - packages/gdal/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-01-25 14:37:35 +0000 (Fri, 25 Jan 2008)
New Revision: 1353

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/libgdal1-1.5.0.files
   packages/gdal/trunk/debian/rules
Log:
Solving conflicts with 1.4 series


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2008-01-25 13:29:00 UTC (rev 1352)
+++ packages/gdal/trunk/debian/changelog	2008-01-25 14:37:35 UTC (rev 1353)
@@ -1,10 +1,7 @@
-gdal (1.5.0-2) UNRELEASED; urgency=low
+gdal (1.5.0-2) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * Added conflicts/replaces against libgdal1-1.4.0. This is of course largely
-    non optimal, a proper new package is required to move arch-independent and 
-    version agnostic files out in order to have multiple library versions 
-    co-existing on the system. This is a goal for next releases.
+  * Moved /usr/share/gdal -> /usr/share/gdal15 in order to avoid conflicting
+    with previous upstream version.
     (closes: #462525)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 25 Jan 2008 14:25:21 +0100

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control	2008-01-25 13:29:00 UTC (rev 1352)
+++ packages/gdal/trunk/debian/control	2008-01-25 14:37:35 UTC (rev 1353)
@@ -21,8 +21,8 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: proj
-Conflicts: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2, libgdal1-1.4.0
-Replaces: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2, libgdal1-1.4.0
+Conflicts: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2
+Replaces: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2
 Description: Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the

Modified: packages/gdal/trunk/debian/libgdal1-1.5.0.files
===================================================================
--- packages/gdal/trunk/debian/libgdal1-1.5.0.files	2008-01-25 13:29:00 UTC (rev 1352)
+++ packages/gdal/trunk/debian/libgdal1-1.5.0.files	2008-01-25 14:37:35 UTC (rev 1353)
@@ -1,2 +1,2 @@
 usr/lib/libgdal1.5.0.so.*
-usr/share/gdal
+usr/share/gdal15

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules	2008-01-25 13:29:00 UTC (rev 1352)
+++ packages/gdal/trunk/debian/rules	2008-01-25 14:37:35 UTC (rev 1353)
@@ -92,7 +92,7 @@
 		(cd pymod && $(MAKE) clean); \
 		$(MAKE) py-target; \
 		$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
-			INST_DATA="\$$(prefix)/share/gdal"  \
+			INST_DATA="\$$(prefix)/share/gdal15"  \
 			INST_PYMOD="\$$(prefix)"`awk -F '/usr' '/INST_PYMOD/ {print $$2}' GDALmake.opt` ; \
 	done