[DebianGIS-dev] r1282 - in packages/gdal/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-12-04 10:03:01 +0000 (Tue, 04 Dec 2007)
New Revision: 1282

Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/patches/swig.dpatch
Log:
Fixed swig.dpatch


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog	2007-12-04 09:28:05 UTC (rev 1281)
+++ packages/gdal/trunk/debian/changelog	2007-12-04 10:03:01 UTC (rev 1282)
@@ -2,8 +2,9 @@
 
   * New upstream version, which fixes an ABI breakage.
     (closes: #452355)
+  * Changed swig.dpatch because partially merged upstream.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 04 Dec 2007 10:22:19 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 04 Dec 2007 11:01:52 +0100
 
 gdal (1.4.3-1) unstable; urgency=low
 

Modified: packages/gdal/trunk/debian/patches/swig.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/swig.dpatch	2007-12-04 09:28:05 UTC (rev 1281)
+++ packages/gdal/trunk/debian/patches/swig.dpatch	2007-12-04 10:03:01 UTC (rev 1282)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gdal-1.4.3~/pymod/GNUmakefile gdal-1.4.3/pymod/GNUmakefile
---- gdal-1.4.3~/pymod/GNUmakefile	2007-11-15 16:59:03.000000000 +0100
-+++ gdal-1.4.3/pymod/GNUmakefile	2007-11-15 17:19:14.000000000 +0100
+diff -urNad gdal-1.4.4~/pymod/GNUmakefile gdal-1.4.4/pymod/GNUmakefile
+--- gdal-1.4.4~/pymod/GNUmakefile	2007-12-04 10:59:18.000000000 +0100
++++ gdal-1.4.4/pymod/GNUmakefile	2007-12-04 10:59:38.000000000 +0100
 @@ -27,7 +27,7 @@
  	$(RM) *.o *.$(SO_EXT) *.la
  
@@ -17,20 +17,3 @@
  
  $(GDALMODULE_SO):	$(OBJ) $(EXE_DEP_LIBS)
  	$(PY_LD_SHARED) $(OBJ) \
-diff -urNad gdal-1.4.3~/swig/GNUmakefile gdal-1.4.3/swig/GNUmakefile
---- gdal-1.4.3~/swig/GNUmakefile	2006-03-24 17:51:58.000000000 +0100
-+++ gdal-1.4.3/swig/GNUmakefile	2007-11-15 17:19:34.000000000 +0100
-@@ -23,10 +23,10 @@
- 	for dir in ${ALL_BINDINGS}; do (cd $$dir; make veryclean ); done
- 
- generate:
--	for dir in ${ALL_BINDINGS}; do (cd $$dir; make generate ); done
-+	for dir in ${ALL_BINDINGS}; do (cd $$dir; make generate ) || exit; done
- 
- build:
--	for dir in ${BINDINGS}; do (cd $$dir; make build ); done
-+	for dir in ${BINDINGS}; do (cd $$dir; make build ) || exit; done
- 
- install:
--	for dir in ${BINDINGS}; do (cd $$dir; make install ); done
-+	for dir in ${BINDINGS}; do (cd $$dir; make install ) || exit; done