[SCM] gdal branch, master, updated. upstream/1.8.0-11-g47a0a61

Francesco Paolo Lovergine frankie at debian.org
Wed Mar 16 10:29:08 UTC 2011


The following commit has been merged in the master branch:
commit 840b80cee7c40960e0cf07aeed04a458c6bfe3ed
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 16 09:47:18 2011 +0100

    Changed clean up for perl stuff.

diff --git a/debian/changelog b/debian/changelog
index 489c2fe..4692570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ gdal (1.8.0-1) experimental; urgency=low
   * Added libepsilon support.
   * Now debian/copyright has moved to DEP5 format and revised on the basis of
     the GDAL LICENSE file.
+  * Swig generated stuff for perl is now removed just before building, not
+    at clean time to be more nice against git-bp.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Mar 2011 17:55:24 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 16 Mar 2011 09:46:02 +0100
 
 gdal (1.7.3-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 9c67c4e..fe678e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,6 +110,7 @@ build-stamp:
 	
 	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
 	$(MAKE) lib-target apps-target 
+	rm -rf $(CURDIR)/swig/perl/*.c  $(CURDIR)/swig/perl/*.cpp
 	$(MAKE) -C $(CURDIR)/swig/perl generate build
 	$(MAKE) -C $(CURDIR)/swig/ruby generate build
 	
@@ -135,7 +136,6 @@ clean:
 	
 	[ ! -f GDALmake.opt ] || $(MAKE) distclean
 	rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
-	rm -rf $(CURDIR)/swig/perl/*.c  $(CURDIR)/swig/perl/*.cpp
 	rm -f GDALmake.opt-*
 	rm -rf $(CURDIR)/man/man1
 	rm -rf $(CURDIR)/debian/tmp $(CURDIR)/debian/python-tmp

-- 
GDAL/OGR library and tools



More information about the Pkg-grass-devel mailing list