[DebianGIS-dev] r1989 - in packages/gdal/branches/1.5/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-03-06 20:54:37 +0000 (Fri, 06 Mar 2009)
New Revision: 1989

Modified:
   packages/gdal/branches/1.5/debian/changelog
   packages/gdal/branches/1.5/debian/patches/rubymakefile.dpatch
Log:
Updating from trunk


Modified: packages/gdal/branches/1.5/debian/changelog
===================================================================
--- packages/gdal/branches/1.5/debian/changelog	2009-03-06 20:53:21 UTC (rev 1988)
+++ packages/gdal/branches/1.5/debian/changelog	2009-03-06 20:54:37 UTC (rev 1989)
@@ -1,8 +1,10 @@
-gdal (1.5.4-3) UNRELEASED; urgency=low
+gdal (1.5.4-3) unstable; urgency=low
 
   * NOT RELEASED YET
+  * From trunk: fixed rubymakefile.dpatch to work with libtool 2.2.
+    (closes: #518495)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 10 Feb 2009 20:47:35 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 06 Mar 2009 20:23:47 +0100
 
 gdal (1.5.4-2) unstable; urgency=low
 

Modified: packages/gdal/branches/1.5/debian/patches/rubymakefile.dpatch
===================================================================
--- packages/gdal/branches/1.5/debian/patches/rubymakefile.dpatch	2009-03-06 20:53:21 UTC (rev 1988)
+++ packages/gdal/branches/1.5/debian/patches/rubymakefile.dpatch	2009-03-06 20:54:37 UTC (rev 1989)
@@ -5,15 +5,15 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gdal-1.4.3~/swig/ruby/RubyMakefile.mk gdal-1.4.3/swig/ruby/RubyMakefile.mk
---- gdal-1.4.3~/swig/ruby/RubyMakefile.mk	2007-11-15 18:06:32.000000000 +0100
-+++ gdal-1.4.3/swig/ruby/RubyMakefile.mk	2007-11-16 10:52:00.000000000 +0100
+diff -urNad gdal-1.5.4~/swig/ruby/RubyMakefile.mk gdal-1.5.4/swig/ruby/RubyMakefile.mk
+--- gdal-1.5.4~/swig/ruby/RubyMakefile.mk	2009-02-23 14:52:10.000000000 +0100
++++ gdal-1.5.4/swig/ruby/RubyMakefile.mk	2009-03-06 20:22:49.000000000 +0100
 @@ -25,7 +25,9 @@
  INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
  
  RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
 -LDFLAGS += -shared -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -shared -L$(RUBY_LIB_DIR)
++LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
 +CFLAGS += -fPIC -DPIC
 +CXXFLAGS += -fPIC -DPIC
  RUBY_LIB := -l$(RUBY_SO_NAME)