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

sebastic pushed a commit to branch wheezy-backports
in repository mapserver.

commit d3ce00f5bcb4e0771f6c02aaa4a4fb2ece5fa9ff
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jul 19 19:10:34 2013 +0200

    Use minimal dh rules.
---
 debian/rules | 185 ++++++++++++++++++-----------------------------------------
 1 file changed, 55 insertions(+), 130 deletions(-)

diff --git a/debian/rules b/debian/rules
index 68b765f..9156b14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,22 +21,11 @@ CFLAGS+=$(LDFLAGS)
 # mapscript.so for ruby1.9.1 fails to build with -Werror=format-security
 RUBY_CPPFLAGS=$(subst -Werror=format-security,,$(CFLAGS))
  
-package=mapserver
-
-version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
-version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
-CURDIR := $(shell pwd)
 PYVERS=$(shell pyversions -r debian/control)
 RUBYVERS=1.8 1.9.1
 PHP5API=$(shell php-config5 --phpapi)
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
-# Configure config :
-# Not using non free libpdf
-# Explicit disable direct goetiff support, 
-# it's better to use gdal geotiff support for stability reasons
-
-
 COMMON_CONFIG= --prefix=/usr \
                --with-gd=/usr \
                --with-freetype=/usr \
@@ -57,72 +46,23 @@ COMMON_CONFIG=      --prefix=/usr \
                --with-php \
                --with-cairo
 
-rstoptions=--stylesheet=mapscript.css --link-stylesheet 
-
 MS_CFLAGS=$(CFLAGS)
 MS_CXXFLAGS=$(MS_CFLAGS)
 MS_CPPFLAGS=$(CPPFLAGS)
 MS_LDFLAGS=$(LDFLAGS)
 
-configure-stamp:
-       dh_testdir
-       ./configure $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" 
CXXFLAGS="$(MS_CXXFLAGS)" CPPFLAGS="$(MS_CPPFLAGS)" LDFLAGS="$(MS_LDFLAGS)"
-
-       touch configure-stamp
-
-# This is the correct, policy-compliant build target
-#build: build-indep build-arch
+%:
+       dh $@
 
-# This is the incorrect, non-policy compliant build target
-# it is nessecary because the auto-builders use build, but don't install 
Build-Depends-Indep
-build: build-arch
+override_dh_clean
+       dh_clean
 
-build-indep: build-indep-stamp
-build-indep-stamp:
-       dh_testdir
-       touch build-indep-stamp
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
-       dh_testdir
-
-       # Create man pages from DocBook XML
-       for x in $(MANPAGES) ; do \
-         docbook2x-man $$x ; \
-         mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
-       done
-
-       # Build binary lib
-       $(MAKE) mapscriptvars || touch mapscriptvars
-       $(MAKE)  
-
-       # Build Perl mapscript
-       cd $(CURDIR)/mapscript/perl && \
-         perl Makefile.PL INSTALLDIRS=vendor \
-         && $(MAKE) LD_RUN_PATH="" OPTIMIZE="$(CFLAGS) -W -Wall"
-
-       # Build python
-       cd $(CURDIR)/mapscript/python && \
-         set -e; for python in $(PYVERS); do CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" $$python setup.py build; done
-
-       # Build ruby
-       cd $(CURDIR)/mapscript/ruby && set -e ; \
-         for v in $(RUBYVERS) ; do \
-           ruby$$v extconf.rb --with-cppflags="$(RUBY_CPPFLAGS) " && $(MAKE) 
&& \
-             mv mapscript.so ruby$$v-mapscript.so ; \
-         done
-
-       touch build-arch-stamp
-
-
-# This is needed to do 'make clean', but will be removed by the clean
-# targets.  The end result is that 'debuild clean' only can execute
-# once.  Hack around this problem by faking the creation when make fail.
-
-clean-first-build:
        dh_testdir
 
        -$(RM) configure-stamp build-arch-stamp build-indep-stamp
+       -$(RM) install-arch-stamp install-indep-stamp
+
+       [ ! -f Makefile ] || $(MAKE) distclean
 
        -$(RM) tile4ms
        [ ! -f $(CURDIR)/Makefile ] || $(MAKE) mapscriptvars 
@@ -148,28 +88,40 @@ clean-first-build:
        -$(RM) config.log config.status
 
        -$(RM) debian/.#* .#*
+       -$(RM) -f debian/*.debhelper.log
+       -$(RM) -rf $(CURDIR)/debian/files
+
+override_dh_auto_configure:
+       dh_auto_configure -- $(COMMON_CONFIG) CFLAGS="$(MS_CFLAGS)" 
CXXFLAGS="$(MS_CXXFLAGS)" CPPFLAGS="$(MS_CPPFLAGS)" LDFLAGS="$(MS_LDFLAGS)"
 
-clean: clean-first-build
+override_dh_auto_build:
        dh_testdir
-       dh_prep
-       -$(RM) install-arch-stamp install-indep-stamp
-       -$(RM) -rf $(CURDIR)/debian/files
-       [ ! -f Makefile ] || $(MAKE) distclean
-       rm -f debian/*.debhelper.log
-
-install-indep: install-indep-stamp
-install-indep-stamp: build-indep
-       dh_testdir -i
-       dh_testroot -i
-       dh_installdirs -i
-       dh_install -i
-       touch install-indep-stamp
-
-install-arch: install-arch-stamp
-install-arch-stamp: build-arch
-       dh_testdir -a
-       dh_testroot -a
-       dh_installdirs -a
+
+       # Create man pages from DocBook XML
+       for x in $(MANPAGES) ; do \
+         docbook2x-man $$x ; \
+         mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
+       done
+
+       dh_auto_build
+
+       # Perl mapscript
+       cd $(CURDIR)/mapscript/perl && \
+         perl Makefile.PL INSTALLDIRS=vendor \
+         && $(MAKE) LD_RUN_PATH="" OPTIMIZE="$(CFLAGS) -W -Wall"
+
+       # Python mapscript
+       cd $(CURDIR)/mapscript/python && \
+         set -e; for python in $(PYVERS); do CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)" $$python setup.py build; done
+
+       # Ruby mapscript
+       cd $(CURDIR)/mapscript/ruby && set -e ; \
+         for v in $(RUBYVERS) ; do \
+           ruby$$v extconf.rb --with-cppflags="$(RUBY_CPPFLAGS) " && $(MAKE) 
&& \
+             mv mapscript.so ruby$$v-mapscript.so ; \
+         done
+
+override_dh_auto_install:
        dh_auto_install
 
        # Perl mapscript
@@ -213,50 +165,23 @@ install-arch-stamp: build-arch
        -mkdir -p debian/tmp/usr/include/mapserver/
        install -m755 *.h debian/tmp/usr/include/mapserver/
 
-       touch install-arch-stamp
-
-binary-indep: install-indep
-       dh_testdir -i
-       dh_testroot -i
-       dh_installchangelogs -i HISTORY.TXT
-       dh_installdocs -i
-       dh_installexamples -i
-       dh_installdebconf -i
-       dh_installman
-       dh_compress -i -X.xml -X.xsd -X.xsl
-       dh_link -i
-       dh_lintian -i
-       dh_fixperms -i
-       dh_installdeb -i
-       dh_gencontrol -i
-       dh_md5sums -i
-       dh_builddeb -i
-
-binary-arch: install-arch
-       dh_testdir -a
-       dh_testroot -a
-       dh_install --autodest --list-missing 
-       dh_installchangelogs -a HISTORY.TXT
-       dh_installdocs -a
-       dh_installexamples -a
+override_dh_installchangelogs:
+       dh_installchangelogs HISTORY.TXT
+
+override_dh_installexamples:
+       dh_installexamples
+
        chmod a-x 
debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
-       dh_installdebconf -a
-       dh_installman
-       dh_python2 -ppython-mapscript
-       dh_compress -a
-       dh_link -a
-       dh_lintian -a
-       dh_strip -a
-       dh_fixperms -a
-       dh_makeshlibs -a -Xphp_mapscript
-       dh_installdeb -a
-       dh_shlibdeps -a
-       dh_perl -plibmapscript-perl
-       dh_gencontrol -a
-       dh_md5sums -a
-       dh_builddeb -a
 
-binary: binary-indep binary-arch
+override_dh_install:
+       dh_install --autodest --list-missing
 
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary 
install install-indep install-arch
+override_dh_compress:
+       dh_compress -X.xml -X.xsd -X.xsl
+
+override_dh_python2:
+       dh_python2 -ppython-mapscript
+
+override_dh_perl:
+       dh_perl -plibmapscript-perl
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/mapserver.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