This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository ncview.
commit 34e7a0873fe110b06e4b5f97d649cbc116a1d39f Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Apr 18 18:39:23 2015 +0200 Use minimal dh rules with autoreconf. --- debian/aclocal | 3 +++ debian/changelog | 2 +- debian/patches/autoreconf.patch | 38 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +++- 5 files changed, 46 insertions(+), 2 deletions(-) diff --git a/debian/aclocal b/debian/aclocal new file mode 100755 index 0000000..16f3c1a --- /dev/null +++ b/debian/aclocal @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +aclocal -I m4macros "$@" diff --git a/debian/changelog b/debian/changelog index 47951b3..0c7a0a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ ncview (2.1.5+ds1-1) UNRELEASED; urgency=medium fix version pattern to match all versions. * Update copyright file using copyright-format 1.0. * Bump debhelper compatibility to 9. - * Use minimal dh rules with autotools-dev. + * Use minimal dh rules with autoreconf. * Repack upstream sources to exclude automatically removed files. * Add patch to fix 'auxiliary' typo. * Switch to source format 3.0 (quilt). diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch new file mode 100644 index 0000000..1affd71 --- /dev/null +++ b/debian/patches/autoreconf.patch @@ -0,0 +1,38 @@ +Description: Modernize autotools for clean autoreconf. + The issues in question: + . + configure.in:39: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: + configure.in:39: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation + configure.in:33: installing './compile' + src/Makefile.am:21: warning: source file 'interface/interface.c' is in a subdirectory, + src/Makefile.am:21: but option 'subdir-objects' is disabled + automake: warning: possible forward-incompatibility. + automake: At least a source file is in a subdirectory, but the 'subdir-objects' + automake: automake option hasn't been enabled. For now, the corresponding output + automake: object file(s) will be placed in the top-level directory. However, + automake: this behaviour will change in future Automake versions: they will + automake: unconditionally cause object files to be placed in the same subdirectory + automake: of the corresponding sources. + automake: You are advised to start using 'subdir-objects' option throughout your + automake: project, to avoid future incompatibilities. +Author: Bas Couwenberg <sebas...@debian.org> + +--- a/configure.in ++++ b/configure.in +@@ -36,7 +36,7 @@ AC_HEADER_STDC + + + AC_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE([ncview],[ncview_version]) ++AM_INIT_AUTOMAKE + + AC_PATH_X + if test "x$no_x" == "xyes"; then +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,3 +1,5 @@ ++AUTOMAKE_OPTIONS = subdir-objects ++ + bin_PROGRAMS=ncview + noinst_PROGRAMS=geteuid + geteuid_SOURCES=geteuid.c diff --git a/debian/patches/series b/debian/patches/series index f12d83e..37c4c6b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ auxiliary-typo.patch manpage.patch +autoreconf.patch diff --git a/debian/rules b/debian/rules index 52e2be4..821e399 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,11 @@ # DH_VERBOSE := 1 +export ACLOCAL=debian/aclocal + %: dh $@ \ - --with autotools-dev \ + --with autoreconf \ --parallel override_dh_clean: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ncview.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