[SCM] dans-gdal-scripts branch, master, updated. upstream/0.18-26-g8f9d90a

Francesco Paolo Lovergine frankie at debian.org
Tue Dec 17 12:05:32 UTC 2013 

The following commit has been merged in the master branch:
commit da00824666b6496b1f82e738452c464a9f7ee6ff
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Dec 17 12:10:12 2013 +0100

    Fixed for missing binaries.

diff --git a/debian/changelog b/debian/changelog
index 97f0004..423f022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dans-gdal-scripts (0.23-2) unstable; urgency=medium
 
-  * Added missing dans-gdal-scripts.install to truly install binaries.
+  * Added missing dans-gdal-scripts binaries due to wrong attributes in configure.
+  * Revised debian/rules to use dh auto rules.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 17 Dec 2013 11:46:09 +0100
 
diff --git a/debian/dans-gdal-scripts.install b/debian/dans-gdal-scripts.install
deleted file mode 100644
index 1df36c6..0000000
--- a/debian/dans-gdal-scripts.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/debian/patches/autotools b/debian/patches/autotools
index 26ffbb2..6e33be4 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -1,6 +1,7 @@
-diff -urN dans-gdal-scripts-0.23/aclocal.m4 /tmp/dans-gdal-scripts/aclocal.m4
---- dans-gdal-scripts-0.23/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/aclocal.m4	2013-12-16 10:24:54.956797318 +0100
+Index: dans-gdal-scripts/aclocal.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/aclocal.m4	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,1086 @@
 +# generated automatically by aclocal 1.14 -*- Autoconf -*-
 +
@@ -1088,18 +1089,20 @@ diff -urN dans-gdal-scripts-0.23/aclocal.m4 /tmp/dans-gdal-scripts/aclocal.m4
 +]) # _AM_PROG_TAR
 +
 +m4_include([m4/boost.m4])
-diff -urN dans-gdal-scripts-0.23/autogen.sh /tmp/dans-gdal-scripts/autogen.sh
---- dans-gdal-scripts-0.23/autogen.sh	2013-07-21 23:46:07.000000000 +0200
-+++ /tmp/dans-gdal-scripts/autogen.sh	2013-12-16 10:37:38.881673063 +0100
+Index: dans-gdal-scripts/autogen.sh
+===================================================================
+--- dans-gdal-scripts.orig/autogen.sh	2013-12-17 11:52:13.000000000 +0100
++++ dans-gdal-scripts/autogen.sh	2013-12-17 11:52:13.000000000 +0100
 @@ -6,4 +6,4 @@
  autoheader
  aclocal -I m4
  autoconf
 -automake --add-missing
 +automake --add-missing --copy
-diff -urN dans-gdal-scripts-0.23/config.h.in /tmp/dans-gdal-scripts/config.h.in
---- dans-gdal-scripts-0.23/config.h.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/config.h.in	2013-12-16 10:26:23.683220203 +0100
+Index: dans-gdal-scripts/config.h.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/config.h.in	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,120 @@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
@@ -1221,9 +1224,10 @@ diff -urN dans-gdal-scripts-0.23/config.h.in /tmp/dans-gdal-scripts/config.h.in
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +#undef size_t
-diff -urN dans-gdal-scripts-0.23/configure /tmp/dans-gdal-scripts/configure
---- dans-gdal-scripts-0.23/configure	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/configure	2013-12-16 10:26:28.643355672 +0100
+Index: dans-gdal-scripts/configure
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/configure	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,6347 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -7572,9 +7576,10 @@ diff -urN dans-gdal-scripts-0.23/configure /tmp/dans-gdal-scripts/configure
 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 +fi
 +
-diff -urN dans-gdal-scripts-0.23/depcomp /tmp/dans-gdal-scripts/depcomp
---- dans-gdal-scripts-0.23/depcomp	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/depcomp	2013-12-16 10:37:49.769970610 +0100
+Index: dans-gdal-scripts/depcomp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/depcomp	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,791 @@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
@@ -8367,9 +8372,10 @@ diff -urN dans-gdal-scripts-0.23/depcomp /tmp/dans-gdal-scripts/depcomp
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -urN dans-gdal-scripts-0.23/install-sh /tmp/dans-gdal-scripts/install-sh
---- dans-gdal-scripts-0.23/install-sh	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/install-sh	2013-12-16 10:37:49.369959676 +0100
+Index: dans-gdal-scripts/install-sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/install-sh	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,527 @@
 +#!/bin/sh
 +# install - install a program, script, or datafile
@@ -8898,9 +8904,10 @@ diff -urN dans-gdal-scripts-0.23/install-sh /tmp/dans-gdal-scripts/install-sh
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -urN dans-gdal-scripts-0.23/Makefile.in /tmp/dans-gdal-scripts/Makefile.in
---- dans-gdal-scripts-0.23/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/Makefile.in	2013-12-16 10:37:49.613966343 +0100
+Index: dans-gdal-scripts/Makefile.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/Makefile.in	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,790 @@
 +# Makefile.in generated by automake 1.14 from Makefile.am.
 +# @configure_input@
@@ -9692,9 +9699,10 @@ diff -urN dans-gdal-scripts-0.23/Makefile.in /tmp/dans-gdal-scripts/Makefile.in
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
-diff -urN dans-gdal-scripts-0.23/missing /tmp/dans-gdal-scripts/missing
---- dans-gdal-scripts-0.23/missing	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/missing	2013-12-16 10:37:49.389960219 +0100
+Index: dans-gdal-scripts/missing
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/missing	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,215 @@
 +#! /bin/sh
 +# Common wrapper for a few potentially missing GNU programs.
@@ -9911,9 +9919,10 @@ diff -urN dans-gdal-scripts-0.23/missing /tmp/dans-gdal-scripts/missing
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-diff -urN dans-gdal-scripts-0.23/src/Makefile.in /tmp/dans-gdal-scripts/src/Makefile.in
---- dans-gdal-scripts-0.23/src/Makefile.in	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dans-gdal-scripts/src/Makefile.in	2013-12-16 10:37:49.953975628 +0100
+Index: dans-gdal-scripts/src/Makefile.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ dans-gdal-scripts/src/Makefile.in	2013-12-17 11:52:13.000000000 +0100
 @@ -0,0 +1,748 @@
 +# Makefile.in generated by automake 1.14 from Makefile.am.
 +# @configure_input@
diff --git a/debian/rules b/debian/rules
index dd6b9dd..93a71b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,56 +17,14 @@ endif
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
-config.status: configure
-	dh_testdir
+%:
+	dh $@
+
+override_dh_auto_configure:
 	dh_autotools-dev_updateconfig
+	chmod a+x $(CURDIR)/configure
 	dh_auto_configure
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp:  config.status 
-	dh_testdir
-	dh_auto_build
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	dh_auto_clean	
+override_dh_auto_clean:
 	dh_autotools-dev_restoreconfig
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-	# Add here commands to install the package into debian/dans-gdal-scripts.
-	dh_auto_install
-	
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_installman debian/dans-gdal-scripts.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+	dh_auto_clean

-- 
GDAL contributed tools by Geographic Information Network of Alaska

More information about the Pkg-grass-devel mailing list