Package: geos
Version: 3.4.2-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
Some upcoming ports (eg. ppc64el) require a new version of libtool.m4,
not just config.{sub,guess}. By using autoreconf instead of
autotools-dev, geos can get these libtool changes for free.
A couple of packaging tweaks were necessary to get geos to build with
dh-autoreconf.
* Build with dh-autoreconf for new libtool.
* debian/{control,rules}: Use dh-autoreconf.
* debian/rules: Update debian/control in clean rather than build*,
otherwise it triggers a re-configure mid-build.
* debian/patches/libruby: Patch Makefile.am too, not just Makefile.in.
diff -Nru geos-3.4.2/debian/changelog geos-3.4.2/debian/changelog
diff -Nru geos-3.4.2/debian/control geos-3.4.2/debian/control
--- geos-3.4.2/debian/control 2013-12-07 01:25:12.000000000 +1100
+++ geos-3.4.2/debian/control 2013-12-30 16:56:00.000000000 +1100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-de...@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev, autotools-dev
+Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev, dh-autoreconf
Build-Conflicts: ruby1.9.1, ruby1.9.1-dev
Standards-Version: 3.9.3
Homepage: http://trac.osgeo.org/geos/
diff -Nru geos-3.4.2/debian/control.in geos-3.4.2/debian/control.in
--- geos-3.4.2/debian/control.in 2013-12-07 01:25:12.000000000 +1100
+++ geos-3.4.2/debian/control.in 2013-12-30 16:56:00.000000000 +1100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-de...@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev, autotools-dev
+Build-Depends: debhelper (>= 9), doxygen, swig, ruby1.8, ruby1.8-dev, dh-autoreconf
Build-Conflicts: ruby1.9.1, ruby1.9.1-dev
Standards-Version: 3.9.3
Homepage: http://trac.osgeo.org/geos/
diff -Nru geos-3.4.2/debian/patches/libruby geos-3.4.2/debian/patches/libruby
--- geos-3.4.2/debian/patches/libruby 2013-12-07 01:25:12.000000000 +1100
+++ geos-3.4.2/debian/patches/libruby 2013-12-30 16:04:00.000000000 +1100
@@ -1,7 +1,7 @@
-Index: geos/swig/ruby/Makefile.in
+Index: geos-3.4.2/swig/ruby/Makefile.in
===================================================================
---- geos.orig/swig/ruby/Makefile.in 2013-12-06 09:09:30.741373190 +0100
-+++ geos/swig/ruby/Makefile.in 2013-12-06 15:23:44.520742796 +0100
+--- geos-3.4.2.orig/swig/ruby/Makefile.in 2013-08-26 01:10:45.000000000 +1000
++++ geos-3.4.2/swig/ruby/Makefile.in 2013-12-30 15:48:46.000000000 +1100
@@ -334,7 +334,7 @@
# Build Ruby module as shared library
@ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la
@@ -11,3 +11,16 @@
# Only need to grab the capi header files
@ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = -I$(top_builddir)/capi
+Index: geos-3.4.2/swig/ruby/Makefile.am
+===================================================================
+--- geos-3.4.2.orig/swig/ruby/Makefile.am 2013-08-26 01:10:32.000000000 +1000
++++ geos-3.4.2/swig/ruby/Makefile.am 2013-12-30 16:02:28.593115812 +1100
+@@ -22,7 +22,7 @@
+ # Build Ruby module as shared library
+ rubyextensiondir_LTLIBRARIES = geos.la
+ geos_la_SOURCES = geos_wrap.cxx
+-geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME)
++geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
+
+ # Only need to grab the capi header files
+ geos_la_CPPFLAGS = -I$(top_builddir)/capi
diff -Nru geos-3.4.2/debian/rules geos-3.4.2/debian/rules
--- geos-3.4.2/debian/rules 2013-12-07 01:25:12.000000000 +1100
+++ geos-3.4.2/debian/rules 2013-12-30 16:36:58.000000000 +1100
@@ -44,17 +44,10 @@
debian/control:
@sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@
-config.status: debian/control configure
+config.status: configure
dh_testdir
# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- mv config.sub config.sub.bak
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- mv config.guess config.guess.bak
- cp -f /usr/share/misc/config.guess config.guess
-endif
+ dh_autoreconf
CXX="$(CXX)" CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -80,12 +73,11 @@
$(MAKE) -C doc doxygen-html
touch $@
-clean:
+clean: debian/control
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
- [ -f config.sub.bak ] && mv config.sub.bak config.sub || true
- [ -f config.guess.bak ] && mv config.guess.bak config.guess || true
+ dh_autoreconf_clean
dh_clean
rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs debian/libgeos++-dev.install
