This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository geos.

commit eba99296445c2ae74c568794458d066a465e4c25
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sun Feb 16 21:45:00 2014 +0100

    Use minimal dh rules with autoreconf for retooling.
---
 debian/changelog  |   2 +
 debian/control    |   2 +-
 debian/control.in |   2 +-
 debian/rules      | 152 +++++++++++++++++-------------------------------------
 4 files changed, 50 insertions(+), 108 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6624e2f..ec5d107 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ geos (3.4.2-2) UNRELEASED; urgency=low
   * Add myself to Uploaders.
   * Restructure control file with cme, changes: Vcs-* fields.
   * Rename libgeos-ruby1.8 to ruby-geos, according to Ruby packaging policy.
+  * Use minimal dh rules with autoreconf for retooling.
+    (closes: #733585)
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Sun, 16 Feb 2014 20:11:38 +0100
 
diff --git a/debian/control b/debian/control
index a6b1262..3fb3b50 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                swig,
                ruby,
                ruby-all-dev,
-               autotools-dev
+               dh-autoreconf
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/geos.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/geos.git
diff --git a/debian/control.in b/debian/control.in
index b939ac1..404f977 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                swig,
                ruby,
                ruby-all-dev,
-               autotools-dev
+               dh-autoreconf
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/geos.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/geos.git
diff --git a/debian/rules b/debian/rules
index 3c5671d..47ce472 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -19,139 +14,84 @@ VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.in|cut -d= 
-f2)
 VER_MINOR=$(shell grep ^VERSION_MINOR configure.in|cut -d= -f2)
 VER_PATCH=$(shell grep ^VERSION_PATCH configure.in|cut -d= -f2|cut -dr -f1)
 VER=$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
+
 ifeq (..,$(VER))
 $(error configure.in not found or version cannot be guessed)
 else
 $(info Guessed geos version is $(VER))
 endif
 
-CFLAGS = -Wall -g
 CXX = g++ -fpermissive
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
 # catch both armel and armhf 
 ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE)))
        CONFFLAGS += --disable-inline
 endif
 
 debian/control: 
-               @sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@
-
-config.status: debian/control 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
-       CXX="$(CXX)" CFLAGS="$(CFLAGS)" ./configure \
-        --host=$(DEB_HOST_GNU_TYPE) \
-        --build=$(DEB_BUILD_GNU_TYPE) \
-        --enable-ruby \
-               --prefix=/usr \
-        --mandir=\$${prefix}/share/man \
-        --infodir=\$${prefix}/share/info $(CONFFLAGS)
+       @sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@
+
+%:
+       dh $@ --with autoreconf
+
+override_dh_clean:
+       dh_clean
+
+       rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs 
debian/libgeos++-dev.install
+
+override_dh_auto_configure: debian/control
+       dh_auto_configure -- \
+               --host=$(DEB_HOST_GNU_TYPE) \
+               --build=$(DEB_BUILD_GNU_TYPE) \
+               --enable-ruby \
+               --mandir=\$${prefix}/share/man \
+               --infodir=\$${prefix}/share/info \
+               $(CONFFLAGS) \
+               CXX="$(CXX)" \
+               $(shell dpkg-buildflags --export=configure)
+
        cp debian/libgeos-c++.install debian/libgeos-$(VER).install
        cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs
 
-#Architecture
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp:  config.status
-       # Add here commands to compile the arch part of the package.
-       CXX="$(CXX)" CFLAGS="$(CFLAGS)" $(MAKE)
-       touch $@
+override_dh_auto_build-arch:
+       dh_auto_build --arch
 
-build-indep: build-indep-stamp
-build-indep-stamp:  config.status
-       # Add here commands to compile the indep part of the package.
+override_dh_auto_build-indep:
        $(MAKE) -C doc doxygen-html
-       touch $@
-
-clean: 
-       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_clean 
-       rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs 
debian/libgeos++-dev.install
 
-install: install-indep install-arch
-install-indep:
-       dh_testdir
-       dh_testroot
-       dh_prep -i
-       dh_installdirs -i
+override_dh_install-arch:
+       # add C++ headers to C++ dev package install file
+       cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install
+       find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | 
sed -e 's/^debian\/tmp\///' >>debian/libgeos++-dev.install
+
+       dh_install --same-arch
+
+       # remove the library from the -dev package
+       rm -f $(CURDIR)/debian/libgeos-dev/usr/lib/libgeos-*.so
+
+override_dh_install-indep:
        dh_install -i
-       # debian/libgeos-doc
+
        # Install doxygen html files
        install -m 644 doc/doxygen_docs/html/* 
debian/libgeos-doc/usr/share/doc/libgeos-doc/html
+
        # Install example program source
        install -m 644 doc/example.cpp 
debian/libgeos-doc/usr/share/doc/libgeos-doc/examples
        install -m 644 debian/Makefile.example 
debian/libgeos-doc/usr/share/doc/libgeos-doc/examples/Makefile
 
-install-arch:
-       dh_testdir
-       dh_testroot
-       dh_prep -s
-       dh_installdirs -s
-       # Add here commands to install the arch part of the package into
-       # debian/tmp.
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-       
-       # add C++ headers to C++ dev package install file
-       cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install
-       find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | 
sed -e 's/^debian\/tmp\///' >>debian/libgeos++-dev.install
-       
-       dh_install -s --sourcedir=debian/tmp
+override_dh_installman:
        dh_installman -plibgeos-dev debian/geos-config.1
-       # remove the library from the -dev package
-       rm -f $(CURDIR)/debian/libgeos-dev/usr/lib/libgeos-*.so
 
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_installman
-       dh_link
+override_dh_strip:
        dh_strip --dbg-package=libgeos-dbg
-       dh_compress
-       dh_fixperms
+
+override_dh_makeshlibs:
        dh_makeshlibs -V
-       dh_installdeb
-       dh_shlibdeps
+
+override_dh_gencontrol:
        for i in $$(grep ^Package: debian/control|cut -d' ' -f2); do \
-                       echo "geos:Version=$(VER)" >> $$i.substvars; \
+               echo "geos:Version=$(VER)" >> $$i.substvars; \
        done
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
 
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-       $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+       dh_gencontrol
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install install-indep 
install-arch debian/control

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/geos.git

_______________________________________________
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