tags 684433 + pending
thanks

Dear maintainer,

I've prepared an NMU for gdal (versioned as 1.9.0-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Beatles: When I'm Sixty-Four
diff -Nru gdal-1.9.0/debian/changelog gdal-1.9.0/debian/changelog
--- gdal-1.9.0/debian/changelog	2012-06-05 14:29:19.000000000 +0200
+++ gdal-1.9.0/debian/changelog	2012-09-18 17:26:01.000000000 +0200
@@ -1,3 +1,13 @@
+gdal (1.9.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS when ruby1.9.1 installed": force building with ruby1.8:
+    set variables in debian/rules and new patch force-ruby1.8 to ruby1.8.
+    Thanks to C├ędric Boutillier for reviewing and testing this patch.
+    (Closes: #684433)
+
+ -- gregor herrmann <gre...@debian.org>  Tue, 18 Sep 2012 17:25:11 +0200
+
 gdal (1.9.0-3) unstable; urgency=low
 
   * Now b-depending on Ruby 1.8 explicitly. 
diff -Nru gdal-1.9.0/debian/patches/force-ruby1.8 gdal-1.9.0/debian/patches/force-ruby1.8
--- gdal-1.9.0/debian/patches/force-ruby1.8	1970-01-01 01:00:00.000000000 +0100
+++ gdal-1.9.0/debian/patches/force-ruby1.8	2012-09-18 17:24:53.000000000 +0200
@@ -0,0 +1,34 @@
+Description: force building with ruby 1.8
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/684433
+Forwarded: no
+Author: gregor herrmann <gre...@debian.org>
+Last-Update: 2012-09-18
+
+--- a/swig/ruby/RubyMakefile.mk
++++ b/swig/ruby/RubyMakefile.mk
+@@ -13,18 +13,18 @@
+ 
+ BINDING = ruby
+ GDAL_ROOT = ../..
+-RUBY = ruby
++RUBY = ruby1.8
+ 
+ include $(GDAL_ROOT)/GDALmake.opt
+ 
+ RUBY_MODULES_LIN = gdal.so ogr.so gdalconst.so osr.so  # Linux, Solaris, ...
+ RUBY_MODULES_MAC = gdal.bundle ogr.bundle gdalconst.bundle osr.bundle # Darwin
+ 
+-RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']")
+-RUBY_ARCH_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] + '/' + Config::CONFIG['arch'] unless Config::CONFIG['rubyhdrdir'].nil?")
+-RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']")
+-RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
+-RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_INCLUDE_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']")
++RUBY_ARCH_INCLUDE_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] + '/' + Config::CONFIG['arch'] unless Config::CONFIG['rubyhdrdir'].nil?")
++RUBY_LIB_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['libdir']")
++RUBY_SO_NAME := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
++RUBY_EXTENSIONS_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+ INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
+ 
+ ifeq ($(RUBY_ARCH_INCLUDE_DIR),)
diff -Nru gdal-1.9.0/debian/patches/series gdal-1.9.0/debian/patches/series
--- gdal-1.9.0/debian/patches/series	2012-06-05 14:29:19.000000000 +0200
+++ gdal-1.9.0/debian/patches/series	2012-08-27 18:22:45.000000000 +0200
@@ -9,3 +9,4 @@
 mrsid-plugin
 symver
 spatialite
+force-ruby1.8
diff -Nru gdal-1.9.0/debian/rules gdal-1.9.0/debian/rules
--- gdal-1.9.0/debian/rules	2012-06-05 14:29:19.000000000 +0200
+++ gdal-1.9.0/debian/rules	2012-08-27 18:31:18.000000000 +0200
@@ -10,7 +10,8 @@
 
 PYVERS=$(shell pyversions -v -r debian/control)
 PYDEF=$(shell pyversions -dv)
-RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2)
+#RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2)
+RUBYDEF=1.8
 PERLDEF=$(shell perl -V:version|cut -d\' -f2)
 PERL_VENDOR_ARCH=$(shell perl -V:vendorarch|cut -d\' -f2)
 PERL_ARCH_NAME=$(shell perl -V:archname|cut -d\' -f2)

Attachment: signature.asc
Description: Digital signature

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to