[SCM] saga branch, master, updated. 0e1239fab8d1301cbff8c85ec2f3c5608083f724

Johan Van de Wauw johan.vandewauw at gmail.com
Sat Mar 26 01:12:48 UTC 2011


The following commit has been merged in the master branch:
commit 0e1239fab8d1301cbff8c85ec2f3c5608083f724
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Sat Mar 26 02:10:22 2011 +0100

    Switch build system from cdbs to dh7
    
    in the mean time, update standards version to 3.9.1

diff --git a/debian/control b/debian/control
index a670668..4e261c5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Johan Van de Wauw <johan.vandewauw at gmail.com>, Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
- libogdi3.2-dev, libproj-dev|proj, libgrib2c-dev, debhelper (>=7), cdbs,
+ libogdi3.2-dev, libproj-dev|proj, libgrib2c-dev, debhelper (>= 7.0.50~),
  libqhull-dev, libhpdf-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://www.saga-gis.org/
 Vcs-Git: git://git.debian.org/pkg-grass/saga.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
diff --git a/debian/rules b/debian/rules
index ab0f8c2..a7abc35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-unicode --prefix=/usr
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-unicode
 VERSION := $(shell grep '^AC_INIT' configure.in | \
 	sed 's/AC_INIT(saga, \([0-9|\.]*\)\,.*)/\1/g')
 UPSTREAM_URL ?=$(shell uscan --dehs | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/\1/p')

-- 
Saga GIS



More information about the Pkg-grass-devel mailing list