diff -Nru genparse-0.8.7/debian/changelog genparse-0.8.7/debian/changelog --- genparse-0.8.7/debian/changelog 2011-04-21 12:16:01.000000000 +0000 +++ genparse-0.8.7/debian/changelog 2011-10-02 06:36:22.000000000 +0000 @@ -1,3 +1,25 @@ +genparse (0.8.7-4) unstable; urgency=low + + * debian/control + - (Build-Depends): Add autoconf and automake. + Change openjdk-6-jdk to default-jdk. Patch thanks to + Petr Salinger (Bug#590014). + * debian/copyright + - (Format): Update URL (lintian). + * debian/debian-save-restore.mk + - Update. Use PACKAGE suffix for saved files. + * debian/patches + - (10): Rename from 40. + - (12): New. Correct include option in Makefile.am which causes + autoreconf(1) to exit with error. + * debian/rules + - (FILE_LIST_PRESERVE): Add autoreconf modified files. + - (override_dh_auto_configure): Run autoreconf(1) to make patch by + Petr Salinger effective (Closes: #590014). + Copy fresh config.* files. + + -- Jari Aalto Sun, 02 Oct 2011 09:36:06 +0300 + genparse (0.8.7-3) unstable; urgency=low * debian/control diff -Nru genparse-0.8.7/debian/control genparse-0.8.7/debian/control --- genparse-0.8.7/debian/control 2011-04-22 17:28:21.000000000 +0000 +++ genparse-0.8.7/debian/control 2011-10-02 06:36:22.000000000 +0000 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Jari Aalto -Build-Depends: debhelper (>= 8), bison, flex, texinfo, doxygen, libcunit1-dev, junit, libcppunit-dev, openjdk-6-jdk, install-info, texi2html, man2html, doxygen-latex +Build-Depends: debhelper (>= 8), automake, autoconf, bison, flex, texinfo, doxygen, libcunit1-dev, junit, libcppunit-dev, default-jdk, install-info, texi2html, man2html, doxygen-latex Standards-Version: 3.9.2 Vcs-Browser: http://git.debian.org/?p=collab-maint/genparse.git Vcs-Git: git://git.debian.org/git/collab-maint/genparse.git diff -Nru genparse-0.8.7/debian/copyright genparse-0.8.7/debian/copyright --- genparse-0.8.7/debian/copyright 2011-04-21 11:43:25.000000000 +0000 +++ genparse-0.8.7/debian/copyright 2011-10-02 06:36:22.000000000 +0000 @@ -1,4 +1,5 @@ -Format: http://dep.debian.net/deps/dep5 +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +X-Format: http://dep.debian.net/deps/dep5 Upstream-Name: genparse Upstream-Contact: Michael Geng , Source: http://freshmeat.net/projects/genparse @@ -22,8 +23,6 @@ 2004 Andrew Pollock 2001-2003 Luca Filipozzi 1999-2001 James R. Van Zandt -X-Debianized-By: - James R. Van Zandt on 1999-06-20 18:24:18-0400 Sun. License: GPL-2+ License: GPL-2+ diff -Nru genparse-0.8.7/debian/debian-save-restore.mk genparse-0.8.7/debian/debian-save-restore.mk --- genparse-0.8.7/debian/debian-save-restore.mk 2010-03-20 08:54:59.000000000 +0000 +++ genparse-0.8.7/debian/debian-save-restore.mk 2011-10-02 06:36:22.000000000 +0000 @@ -1,8 +1,8 @@ -# debian-autotools.mk -- Common settings for Autotoolsx +# debian-save-restore.mk -- Save and restore original files # # Copyright # -# Copyright (C) 2008-2010 Jari Aalto +# Copyright (C) 2008-2011 Jari Aalto # # License # @@ -24,8 +24,14 @@ # This is GNU makefile part, that defines common variables, # targets and macros to be used from debian/rules. # +# Bugs +# +# Due to shell "word" handling concept, file or directory names +# with spaces cannot be saved or restored. +# # Usage (format 3.0) # +# PACKAGE = # FILE_LIST_PRESERVE = # # override_dh_clean: @@ -39,13 +45,14 @@ # $(file-state-save) # # -# binary-arch: +# override_dh_auto_build +# dh_auto_build # $(file-state-restore) -# ... define file-state-save # save files suffix=.original; \ + [ ! "$(PACKAGE)" ] || suffix=$$suffix.$(PACKAGE) ; \ for file in $(FILE_LIST_PRESERVE); \ do \ backup=/tmp/$$(echo $$file | sed 's,/,%,g')$$suffix; \ @@ -58,6 +65,7 @@ define file-state-restore-copy # restore files suffix=.original; \ + [ ! "$(PACKAGE)" ] || suffix=$$suffix.$(PACKAGE) ; \ for file in $(FILE_LIST_PRESERVE); \ do \ backup=/tmp/$$(echo $$file | sed 's,/,%,g')$$suffix; \ @@ -74,6 +82,7 @@ define file-state-restore # restore files suffix=.original; \ + [ ! "$(PACKAGE)" ] || suffix=$$suffix.$(PACKAGE) ; \ for file in $(FILE_LIST_PRESERVE); \ do \ backup=/tmp/$$(echo $$file | sed 's,/,%,g')$$suffix; \ diff -Nru genparse-0.8.7/debian/patches/10-no-java.patch genparse-0.8.7/debian/patches/10-no-java.patch --- genparse-0.8.7/debian/patches/10-no-java.patch 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.8.7/debian/patches/10-no-java.patch 2011-10-02 06:36:22.000000000 +0000 @@ -0,0 +1,29 @@ +From ed536d3ead518ba60de52d0313dffae687ed368c Mon Sep 17 00:00:00 2001 +From: Jari Aalto +Date: Tue, 12 Oct 2010 19:03:52 +0300 +Subject: [PATCH] configure.ac: (HAVE_GCJ): Disable. See Bug #590014 +Organization: Private +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jari Aalto +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cf9faff..b6c2862 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ dnl check for gcj + if test -z "$ac_cv_prog_GCJ"; then + AC_MSG_WARN([gcj not found. You can build Genparse anyway but not the Java examples.]) + else +- HAVE_GCJ="yes" ++ : # [Debian disable] HAVE_GCJ="yes" + fi + AM_CONDITIONAL(HAVE_GCJ, test "$HAVE_GCJ") + +-- +1.7.1 + diff -Nru genparse-0.8.7/debian/patches/12-amflags.patch genparse-0.8.7/debian/patches/12-amflags.patch --- genparse-0.8.7/debian/patches/12-amflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ genparse-0.8.7/debian/patches/12-amflags.patch 2011-10-02 06:36:22.000000000 +0000 @@ -0,0 +1,27 @@ +From da01fcfc921a6d9abfe949f53ba56ea9d3aa19c8 Mon Sep 17 00:00:00 2001 +From: Jari Aalto +Date: Fri, 30 Sep 2011 21:25:25 +0300 +Subject: [PATCH] Makefile.am: Remove include +Organization: Private +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + + +Signed-off-by: Jari Aalto +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5ac7668..81a32f8 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,4 +2,4 @@ EXTRA_DIST = genparse.gp + + SUBDIRS = gnulib src doc examples tests + +-ACLOCAL_AMFLAGS = -I /usr/share/autoconf-archive -I gnulib/m4 ++ACLOCAL_AMFLAGS = -I gnulib/m4 +-- +1.7.6.3 + diff -Nru genparse-0.8.7/debian/patches/40-no-java.patch genparse-0.8.7/debian/patches/40-no-java.patch --- genparse-0.8.7/debian/patches/40-no-java.patch 2010-10-12 16:05:45.000000000 +0000 +++ genparse-0.8.7/debian/patches/40-no-java.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From ed536d3ead518ba60de52d0313dffae687ed368c Mon Sep 17 00:00:00 2001 -From: Jari Aalto -Date: Tue, 12 Oct 2010 19:03:52 +0300 -Subject: [PATCH] configure.ac: (HAVE_GCJ): Disable. See Bug #590014 -Organization: Private -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jari Aalto ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index cf9faff..b6c2862 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,7 +24,7 @@ dnl check for gcj - if test -z "$ac_cv_prog_GCJ"; then - AC_MSG_WARN([gcj not found. You can build Genparse anyway but not the Java examples.]) - else -- HAVE_GCJ="yes" -+ : # [Debian disable] HAVE_GCJ="yes" - fi - AM_CONDITIONAL(HAVE_GCJ, test "$HAVE_GCJ") - --- -1.7.1 - diff -Nru genparse-0.8.7/debian/patches/series genparse-0.8.7/debian/patches/series --- genparse-0.8.7/debian/patches/series 2011-04-23 10:48:30.000000000 +0000 +++ genparse-0.8.7/debian/patches/series 2011-10-02 06:36:22.000000000 +0000 @@ -1 +1,2 @@ -40-no-java.patch +10-no-java.patch +12-amflags.patch diff -Nru genparse-0.8.7/debian/rules genparse-0.8.7/debian/rules --- genparse-0.8.7/debian/rules 2010-03-20 09:18:06.000000000 +0000 +++ genparse-0.8.7/debian/rules 2011-10-02 06:36:22.000000000 +0000 @@ -7,7 +7,7 @@ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr -# Changed by the build process: files are deleted etc. +# Changed by the build process: files deleted and autoreconf FILE_LIST_PRESERVE = \ config.in \ configure \ @@ -46,15 +46,40 @@ tests/ccheck/uintmax_clp.c \ tests/ccheck/ulong_clp.c \ tests/cppcheck/default_clp.cc \ - tests/cppcheck/longmembers_clp.cc + tests/cppcheck/longmembers_clp.cc \ + INSTALL \ + Makefile.in \ + aclocal.m4 \ + depcomp \ + doc/Makefile.in \ + doc/mdate-sh \ + doc/texinfo.tex \ + examples/Makefile.in \ + gnulib/Makefile.in \ + gnulib/lib/Makefile.in \ + install-sh \ + missing \ + mkinstalldirs \ + src/Makefile.in \ + tests/Makefile.in \ + tests/ccheck/Makefile.in \ + tests/cppcheck/Makefile.in \ + tests/javacheck/Makefile.in \ + tests/misc/Makefile.in \ + ylwrap include debian/debian-save-restore.mk override_dh_clean: $(file-state-save) dh_clean + rm -f config.guess config.sub override_dh_auto_configure: + # See patch 10. We have to regenerate ./configure + cp -vf /usr/share/misc/config.sub . + cp -vf /usr/share/misc/config.guess . + autoreconf -vfi CFLAGS="$(CFLAGS)" ./configure $(CONF_FLAGS) binary-arch: build install