[dans-gdal-scripts] 09/12: Add patch headers to autotools patch, s/dpatch/quilt/g in README.source.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Feb 13 20:10:25 UTC 2015 

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

sebastic pushed a commit to branch master
in repository dans-gdal-scripts.

commit 4127d01d6469725a17eb054cc13ff80a8b445196
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 13 20:44:14 2015 +0100

    Add patch headers to autotools patch, s/dpatch/quilt/g in README.source.
---
 debian/README.source     |  4 ++--
 debian/changelog         |  1 +
 debian/patches/autotools | 57 ++++++++++++++++++------------------------------
 3 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 93a78cf..997983f 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,12 +1,12 @@
 GDAL source for Debian
 ----------------------
 
-This package uses dpatch to manage all modifications to the upstream
+This package uses quilt to manage all modifications to the upstream
 source. Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
 
 To get detailed instructions on how to apply the series of patches
-and modify them, please read /usr/share/doc/dpatch/README.source.
+and modify them, please read /usr/share/doc/quilt/README.source.
 
 Note that the package depends on boost, but its use is very lightweight,
 so no breakages are expected at every new release.
diff --git a/debian/changelog b/debian/changelog
index 2c49a99..9bdc8cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dans-gdal-scripts (0.23-3) UNRELEASED; urgency=medium
   * Bump debhelper compatibility to 9.
   * Enable parallel builds.
   * Add gbp.conf to use pristine-tar by default.
+  * Add patch headers to autotools patch, s/dpatch/quilt/g in README.source.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 13 Feb 2015 20:23:03 +0100
 
diff --git a/debian/patches/autotools b/debian/patches/autotools
index 6e33be4..cb50da2 100644
--- a/debian/patches/autotools
+++ b/debian/patches/autotools
@@ -1,7 +1,8 @@
-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
+Description: Add autotools to pre-run autoconfiscation.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+
+--- /dev/null
++++ b/aclocal.m4
 @@ -0,0 +1,1086 @@
 +# generated automatically by aclocal 1.14 -*- Autoconf -*-
 +
@@ -1089,20 +1090,16 @@ Index: dans-gdal-scripts/aclocal.m4
 +]) # _AM_PROG_TAR
 +
 +m4_include([m4/boost.m4])
-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
+--- a/autogen.sh
++++ b/autogen.sh
 @@ -6,4 +6,4 @@
  autoheader
  aclocal -I m4
  autoconf
 -automake --add-missing
 +automake --add-missing --copy
-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
+--- /dev/null
++++ b/config.h.in
 @@ -0,0 +1,120 @@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
@@ -1224,10 +1221,8 @@ Index: dans-gdal-scripts/config.h.in
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +#undef size_t
-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
+--- /dev/null
++++ b/configure
 @@ -0,0 +1,6347 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -7576,10 +7571,8 @@ Index: dans-gdal-scripts/configure
 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 +fi
 +
-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
+--- /dev/null
++++ b/depcomp
 @@ -0,0 +1,791 @@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
@@ -8372,10 +8365,8 @@ Index: dans-gdal-scripts/depcomp
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-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
+--- /dev/null
++++ b/install-sh
 @@ -0,0 +1,527 @@
 +#!/bin/sh
 +# install - install a program, script, or datafile
@@ -8904,10 +8895,8 @@ Index: dans-gdal-scripts/install-sh
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-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
+--- /dev/null
++++ b/Makefile.in
 @@ -0,0 +1,790 @@
 +# Makefile.in generated by automake 1.14 from Makefile.am.
 +# @configure_input@
@@ -9699,10 +9688,8 @@ Index: 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:
-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
+--- /dev/null
++++ b/missing
 @@ -0,0 +1,215 @@
 +#! /bin/sh
 +# Common wrapper for a few potentially missing GNU programs.
@@ -9919,10 +9906,8 @@ Index: dans-gdal-scripts/missing
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
-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
+--- /dev/null
++++ b/src/Makefile.in
 @@ -0,0 +1,748 @@
 +# Makefile.in generated by automake 1.14 from Makefile.am.
 +# @configure_input@

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

More information about the Pkg-grass-devel mailing list