Author: frankie
Date: 2008-03-27 14:57:14 +0000 (Thu, 27 Mar 2008)
New Revision: 1460
Modified:
packages/gdal-grass/trunk/debian/changelog
packages/gdal-grass/trunk/debian/dirs
packages/gdal-grass/trunk/debian/patches/path.dpatch
packages/gdal-grass/trunk/debian/rules
Log:
Final changes.
Modified: packages/gdal-grass/trunk/debian/changelog
===================================================================
--- packages/gdal-grass/trunk/debian/changelog 2008-03-27 14:03:04 UTC (rev
1459)
+++ packages/gdal-grass/trunk/debian/changelog 2008-03-27 14:57:14 UTC (rev
1460)
@@ -4,10 +4,10 @@
* Added Vcs-* fields to debian/control
* Policy bumped to 3.7.3
* [Lintian] Do a make distclean on clean only when Makefile exists.
- * Moved arch-dependent files into /usr/lib/gdal15/grass.
+ * Do not install files already installed by grass.
* Now using /usr/lib/gdal15plugins for shared libs.
* Added dpatch support.
- * Added patch path.dpatch to fix embedded gdal-grass path.
+ * Added patch path.dpatch to fix embedded Grass GISBASE path.
* Fixed targets in debian/rules.
* Added grass libs path to dh_shlibs call in debian/rules.
Modified: packages/gdal-grass/trunk/debian/dirs
===================================================================
--- packages/gdal-grass/trunk/debian/dirs 2008-03-27 14:03:04 UTC (rev
1459)
+++ packages/gdal-grass/trunk/debian/dirs 2008-03-27 14:57:14 UTC (rev
1460)
@@ -1,3 +1,2 @@
usr/lib
-usr/lib/gdal15
usr/lib/gdal15plugins
Modified: packages/gdal-grass/trunk/debian/patches/path.dpatch
===================================================================
--- packages/gdal-grass/trunk/debian/patches/path.dpatch 2008-03-27
14:03:04 UTC (rev 1459)
+++ packages/gdal-grass/trunk/debian/patches/path.dpatch 2008-03-27
14:57:14 UTC (rev 1460)
@@ -13,7 +13,7 @@
// we are outside a GRASS session
// TODO: use function instead of hardcoded path
- sprintf(fake_gisbase, "GISBASE=/usr/local/share/gdal/grass/" );
-+ sprintf(fake_gisbase, "GISBASE=/usr/lib/gdal15/grass/" );
++ sprintf(fake_gisbase, "GISBASE=/usr/lib/grass/" );
putenv( fake_gisbase );
hasGisbase = false;
} else {
Modified: packages/gdal-grass/trunk/debian/rules
===================================================================
--- packages/gdal-grass/trunk/debian/rules 2008-03-27 14:03:04 UTC (rev
1459)
+++ packages/gdal-grass/trunk/debian/rules 2008-03-27 14:57:14 UTC (rev
1460)
@@ -40,6 +40,8 @@
$(MAKE) install
AUTOLOAD_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15plugins \
GRASSTABLES_DIR=$(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15/grass
+ # removes redundant stuff already installed by grass
+ rm -rf $(CURDIR)/debian/$(PKGNAME)/usr/lib/gdal15
binary-indep: build install
# Do nothing
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
