[SCM] dans-gdal-scripts branch, master, updated. upstream/0.18-15-gd18f024
Francesco Paolo Lovergine
frankie at debian.org
Thu Dec 12 10:42:48 UTC 2013
The following commit has been merged in the master branch:
commit 9af0aad076000088d9c5da041fe0bb650ac9ada8
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Dec 12 11:04:49 2013 +0100
Proper use of dh_autotools-dev_*config helpers.
diff --git a/debian/changelog b/debian/changelog
index cd104bc..06077b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dans-gdal-scripts (0.18-3) unstable; urgency=medium
* Now using libgdal-dev b-d.
* Policy bumped to 3.9.4 (no changes required).
+ * Now using dh helpers to restore/update config.{guess,sub} in debian/rules.
-- Francesco Paolo Lovergine <frankie at debian.org> Thu, 12 Dec 2013 10:56:10 +0100
diff --git a/debian/rules b/debian/rules
index 7244dc9..6618dcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,34 +16,21 @@ endif
config.status: configure
dh_testdir
- # Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- mv config.sub config.sub.original && cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- mv config.guess config.guess.original && cp -f /usr/share/misc/config.guess config.guess
-endif
+ dh_autotools-dev_updateconfig
dh_auto_configure
build: build-stamp
build-stamp: config.status
dh_testdir
-
- # Add here commands to compile the package.
dh_auto_build
touch $@
clean:
dh_testdir
dh_testroot
-
- # Add here commands to clean up after the build process.
dh_auto_clean
- rm -f config.sub config.guess
- mv config.sub.original config.sub
- mv config.guess.original config.guess
- cp -f
+ dh_autotools-dev_restoreconfig
dh_clean
install: build
@@ -51,7 +38,6 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
# Add here commands to install the package into debian/dans-gdal-scripts.
dh_auto_install
--
GDAL contributed tools by Geographic Information Network of Alaska
More information about the Pkg-grass-devel
mailing list