[SCM] gdal branch, master, updated. upstream/1.10.0-200-g009bec6
Bas Couwenberg
sebastic at xs4all.nl
Mon Oct 14 03:20:54 UTC 2013
The following commit has been merged in the master branch:
commit 5b4918a508be52da6219629a44828da23f17019a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Oct 13 19:20:11 2013 +0200
Drop ruby extension for ruby1.8 removal transition.
diff --git a/debian/changelog b/debian/changelog
index 02039ea..394a7b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ gdal (1.10.1+dfsg-0~exp1) UNRELEASED; urgency=low
underscores anymore.
* Add patch to add a brief description to {gdal,ogr}_utilities documentation.
(closes: #421653)
+ * Drop ruby extension for ruby1.8 removal transition. See also: #684433.
+ (closes: #722383)
-- Bas Couwenberg <sebastic at xs4all.nl> Thu, 03 Oct 2013 23:19:27 +0200
diff --git a/debian/control b/debian/control
index 1e827a3..58c9961 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,6 @@ Build-Depends: debhelper (>= 9),
libcurl4-gnutls-dev,
libsqlite3-dev,
libogdi3.2-dev,
- ruby1.8,
- ruby1.8-dev,
chrpath,
swig,
patch,
@@ -89,7 +87,7 @@ Architecture: all
Section: libdevel
Depends: libgdal-dev,
${misc:Depends}
-Description: Geospatial Data Abstraction Library - Development files
+Description: Geospatial Data Abstraction Library - Transitional package
GDAL is a translator library for raster geospatial data formats.
As a library, it presents a single abstract data model to the
calling application for all supported formats. The related OGR
@@ -292,39 +290,6 @@ Description: Perl bindings to the Geospatial Data Abstraction Library
This package contains Perl bindings for GDAL/OGR library.
Homepage: http://map.hut.fi/doc/Geo-GDAL/html/
-Package: libgdal-ruby1.8
-Architecture: any
-Section: ruby
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Ruby 1.8 bindings to the Geospatial Data Abstraction Library
- GDAL is a translator library for raster geospatial data formats.
- As a library, it presents a single abstract data model to the
- calling application for all supported formats. The related OGR
- library (which lives within the GDAL source tree) provides
- a similar capability for simple features vector data.
- .
- GDAL supports 40+ popular data formats, including commonly used
- ones (GeoTIFF, JPEG, PNG and more) as well as the ones used in
- GIS and remote sensing software packages (ERDAS Imagine,
- ESRI Arc/Info, ENVI, PCI Geomatics). Also supported many remote
- sensing and scientific data distribution formats such as HDF,
- EOS FAST, NOAA L1B, NetCDF, FITS.
- .
- OGR library supports popular vector formats like ESRI Shapefile,
- TIGER data, S57, MapInfo File, DGN, GML and more.
- .
- This package contains ruby 1.8 bindings for GDAL/OGR library.
-
-Package: libgdal-ruby
-Architecture: any
-Section: ruby
-Depends: libgdal-ruby1.8,
- ${misc:Depends}
-Description: Ruby bindings to the Geospatial Data Abstraction Library
- This is a dummy package which depends on current ruby version
- to support GDAL/OGR library binding upgrades.
-
Package: libgdal-java
Architecture: any
Section: java
diff --git a/debian/libgdal-ruby1.8.install b/debian/libgdal-ruby1.8.install
deleted file mode 100644
index 59e85d1..0000000
--- a/debian/libgdal-ruby1.8.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ruby/*
diff --git a/debian/patches/force-ruby1.8 b/debian/patches/force-ruby1.8
deleted file mode 100644
index 3990bf1..0000000
--- a/debian/patches/force-ruby1.8
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: force building with ruby 1.8
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/684433
-Forwarded: no
-Author: gregor herrmann <gregoa at 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 --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile
deleted file mode 100644
index 59dfb42..0000000
--- a/debian/patches/rubymakefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/swig/ruby/RubyMakefile.mk
-+++ b/swig/ruby/RubyMakefile.mk
-@@ -41,7 +41,9 @@ LDFLAGS += -Xcompiler -bundle -L$(RUBY_L
- RUBY_LIB := -l$(RUBY_SO_NAME)
- else
- RUBY_MODULES=$(RUBY_MODULES_LIN)
--LDFLAGS += -Xcompiler -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)
- endif
-
-@@ -59,7 +61,7 @@ veryclean: clean
- $(INSTALL_DIR):
- mkdir -p $(DESTDIR)$(INSTALL_DIR)
-
--install: $(INSTALL_DIR)
-+install: $(INSTALL_DIR) $(RUBY_MODULES)
- for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done
-
- $(RUBY_MODULES_MAC): %.bundle: %_wrap.o
-@@ -69,10 +71,10 @@ $(RUBY_MODULES_LIN): %.so: %_wrap.o
- $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
-
- %.o: %.cpp
-- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-
- %.o: %.cxx
-- $(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-+ $(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
-
- %.o: %.c
- $(CC) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
diff --git a/debian/patches/series b/debian/patches/series
index b15f7be..4f47799 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
doc
ogdi
-rubymakefile
man
gdalpaths
hdf4
@@ -9,7 +8,6 @@ ecw-plugin
mrsid-plugin
symver
spatialite
-force-ruby1.8
java.opt
java-make
paramters-typo
diff --git a/debian/rules b/debian/rules
index 95a32ae..50e41c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,6 @@
PYVERS=$(shell pyversions -v -r debian/control) $(shell py3versions -v -r)
PYDEF=$(shell pyversions -dv)
-RUBYDEF=$(shell ruby --version|cut -d' ' -f2|cut -d. -f1,2)
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)
@@ -27,7 +26,6 @@ versions:
@echo Swig version: $(SWIGVER)
@echo Python default: $(PYDEF)
@echo Python versions: $(PYVERS)
- @echo Ruby default: $(RUBYDEF)
@echo Perl default: $(PERLDEF)
#
@@ -80,7 +78,7 @@ configure-stamp:
--with-pg \
--with-mysql \
--with-perl \
- --with-ruby \
+ --with-ruby=no \
--with-java=/usr/lib/jvm/default-java \
--with-python \
--with-odbc \
@@ -114,7 +112,6 @@ build-stamp: configure-stamp
$(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
$(MAKE) -C $(CURDIR)/swig/java clean generate build
# It needs pre-installing just after the building due to intermediate cleaning.
@@ -137,7 +134,7 @@ clean:
dh_testroot
[ ! -f GDALmake.opt ] || $(MAKE) distclean
- rm -rf $(CURDIR)/swig/ruby/.libs $(CURDIR)/swig/perl/*.bs
+ rm -rf $(CURDIR)/swig/perl/*.bs
rm -rf $(CURDIR)/swig/java/*.so $(CURDIR)/swig/java/*.o $(CURDIR)/swig/java/build/ $(CURDIR)/swig/java/*.jar $(CURDIR)/swig/java/.libs
rm -rf $(CURDIR)/.libs
rm -f GDALmake.opt-*
@@ -156,7 +153,7 @@ install: build
dh_installdirs
cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
- $(MAKE) install BINDINGS="perl ruby java" DESTDIR=$(CURDIR)/debian/tmp \
+ $(MAKE) install BINDINGS="perl java" DESTDIR=$(CURDIR)/debian/tmp \
INST_DATA="\$$(prefix)/share/gdal/$(GDAL_MAJOR).$(GDAL_MINOR)"
$(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
@@ -184,12 +181,10 @@ install: build
# removing embedded rpath in main lib
-find $(CURDIR)/debian/tmp/usr/lib -type f -name "*.so*" -exec chrpath --delete {} \;
- # moves ruby/perl stuff the right dirs
+ # moves perl stuff the right dirs
install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/perl5/auto
- install -o root -g root -d $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)
mv $(CURDIR)/debian/tmp$(PERL_PATH)/auto/* $(CURDIR)/debian/tmp/usr/lib/perl5/auto/.
mv $(CURDIR)/debian/tmp$(PERL_PATH)/Geo $(CURDIR)/debian/tmp/usr/lib/perl5/.
- mv $(CURDIR)/debian/tmp/usr/local/lib/site_ruby/$(RUBYDEF)/* $(CURDIR)/debian/tmp/usr/lib/ruby/$(RUBYDEF)/.
# copy sample programs for python-gdal
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/doc/python-gdal/examples
--
GDAL/OGR library and tools
More information about the Pkg-grass-devel
mailing list