--- automake1.9-nonfree-1.9.6.orig/m4/gcj.m4 +++ automake1.9-nonfree-1.9.6/m4/gcj.m4 @@ -8,7 +8,7 @@ # with or without modifications, as long as this notice is preserved. AC_DEFUN([AM_PROG_GCJ],[ -AC_CHECK_PROGS(GCJ, gcj, gcj) +AC_CHECK_PROGS(GCJ, [gcj gcj-3.2 gcj-3.1 gcj-3.0 gcj-2.95], gcj) test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH]) if test "x${GCJFLAGS-unset}" = xunset; then GCJFLAGS="-g -O2" --- automake1.9-nonfree-1.9.6.orig/tests/txinfo13.test +++ automake1.9-nonfree-1.9.6/tests/txinfo13.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. # # This file is part of GNU Automake. # @@ -18,8 +18,9 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -# Check for subdir Texinfo. -# PR/343 +# Check for subdir Texinfo (PR/343) +# Also make sure we do not distribute too much foo.info* files (Report +# from Vincent Lefevre) required='makeinfo tex texi2dvi-o' . ./defs || exit 1 @@ -34,6 +35,8 @@ installcheck-local: test -f $(infodir)/main.info +check-local: + test ! -f $(srcdir)/subdir/main.info.bak END mkdir subdir @@ -53,6 +56,7 @@ I'm included. END +touch subdir/main.info.bak $ACLOCAL $AUTOMAKE --add-missing @@ -64,3 +68,4 @@ $MAKE distcheck test -f ../subdir/main.info test ! -f subdir/main.info +test -f ../subdir/main.info.bak --- automake1.9-nonfree-1.9.6.orig/automake.in +++ automake1.9-nonfree-1.9.6/automake.in @@ -2752,7 +2752,7 @@ next if $outfile; $outfile = $1; - if ($outfile =~ /\.(.+)$/ && $1 ne 'info') + if ($outfile =~ /\.([^.]+)$/ && $1 ne 'info') { error ("$filename:$.", "output `$outfile' has unrecognized extension"); --- automake1.9-nonfree-1.9.6.orig/doc/automake.texi +++ automake1.9-nonfree-1.9.6/doc/automake.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header -@setfilename automake.info -@settitle automake +@setfilename automake-1.9.info +@settitle automake-1.9 @setchapternewpage off @c %**end of header @@ -34,12 +34,12 @@ @dircategory Software development @direntry -* automake: (automake). Making Makefile.in's. +* automake-1.9: (automake-1.9). Making Makefile.in's. @end direntry @dircategory Individual utilities @direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. +* aclocal-1.9: (automake-1.9)Invoking aclocal. Generating aclocal.m4. @end direntry @titlepage --- automake1.9-nonfree-1.9.6.orig/lib/am/texinfos.am +++ automake1.9-nonfree-1.9.6/lib/am/texinfos.am @@ -1,7 +1,7 @@ ## automake - create Makefile.in from Makefile.am ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -## 2003, 2004, 2005 Free Software Foundation, Inc. +## 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -238,11 +238,14 @@ $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ if test -f $$base; then d=.; else d=$(srcdir); fi; \ - for file in $$d/$$base*; do \ + base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ + for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ + if test -f $$file; then \ ## Strip leading '$$d/'. - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f $(distdir)/$$relfile || \ - cp -p $$file $(distdir)/$$relfile; \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ + else :; fi; \ done; \ done endif %?LOCAL-TEXIS% --- automake1.9-nonfree-1.9.6.orig/debian/changelog +++ automake1.9-nonfree-1.9.6/debian/changelog @@ -0,0 +1,5 @@ +automake1.9-nonfree (1.9.6-1) unstable; urgency=low + + * Non-free split for automake1.9 documentation. + + -- Eric Dorland Fri, 18 Aug 2006 23:41:47 -0400 --- automake1.9-nonfree-1.9.6.orig/debian/control +++ automake1.9-nonfree-1.9.6/debian/control @@ -0,0 +1,28 @@ +Source: automake1.9-nonfree +Section: non-free/doc +Priority: optional +Maintainer: Eric Dorland +Standards-Version: 3.7.2.1 +Build-Depends: cdbs, debhelper (>= 4.1.0) +Build-Depends-Indep: autoconf (>= 2.59), autotools-dev (>= 20020320.1), texinfo (>= 4.3) + +Package: automake1.9-doc +Architecture: all +Conflicts: automake1.9 (<= 1.9.6-5) +Replaces: automake1.9 +Description: A tool for generating GNU Standards-compliant Makefiles + Automake is a tool for automatically generating `Makefile.in's from + files called `Makefile.am'. + . + The goal of Automake is to remove the burden of Makefile maintenance + from the back of the individual GNU maintainer (and put it on the back + of the Automake maintainer). + . + The `Makefile.am' is basically a series of `make' macro definitions + (with rules being thrown in occasionally). The generated + `Makefile.in's are compliant with the GNU Makefile standards. + . + Automake 1.9 fails to work in a number of situations that Automake + 1.4, 1.6, 1.7 and 1.8 did, so has been renamed so that the previous + version can continue to be made available. + --- automake1.9-nonfree-1.9.6.orig/debian/compat +++ automake1.9-nonfree-1.9.6/debian/compat @@ -0,0 +1 @@ +4 --- automake1.9-nonfree-1.9.6.orig/debian/watch +++ automake1.9-nonfree-1.9.6/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://ftp.gnu.org/gnu/automake/automake-(.*)\.tar\.gz --- automake1.9-nonfree-1.9.6.orig/debian/copyright +++ automake1.9-nonfree-1.9.6/debian/copyright @@ -0,0 +1,104 @@ +This is the Debian prepackaged version of GNU automake. + +This package was debianized by Eric Dorland . + +It was downloaded from ftp://ftp.gnu.org/gnu/automake/. + +Authors +======= + +Automake was originally written by David Mackenzie . +Perl reimplementation by Tom Tromey . + + +Copyright Holders +================= + +lib/ansi2knr.c: Copyright (C) 1989, 2000 Aladdin Enterprises. + +lib/install-sh: Copyright (C) 1994 X Consortium + +debian/automake-1.9.1 (automake manpage): Copyright (C) 1992, 1993, 1994, +1995, 1996 Free Software Foundation, Inc., Copyright (C) 1998 Ben Pfaff + +all other files: Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005 Free Software Foundation, Inc. + + +License +======= + +Automake Manual (doc/automake.texi): + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software + Foundation; with no Invariant Sections, with the Front-Cover texts + being ``A GNU Manual,'' and with the Back-Cover Texts as in (a) + below. A copy of the license is included in the section entitled + ``GNU Free Documentation License.'' + + (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify this + GNU Manual, like GNU software. Copies published by the Free Software + Foundation raise funds for GNU development.'' + +lib/install-sh: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + + FSF changes to this file are in the public domain. + +debian/automake-1.9.1: + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + are preserved on all copies. + + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided that the entire + resulting derived work is distributed under the terms of a permission + notice identical to this one. + + Permission is granted to copy and distribute translations of this manual + into another language, under the above conditions for modified versions, + except that this permission notice may be stated in a translation approved + by the Foundation. + +all other files: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- automake1.9-nonfree-1.9.6.orig/debian/rules +++ automake1.9-nonfree-1.9.6/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +package=automake1.9 +version=1.9 +infodir=doc + +DEB_DESTDIR=$(CURDIR)/debian/tmp + +common-install-indep:: + cd $(infodir) && makeinfo automake.texi + +clean:: + rm -f $(infodir)/automake-$(version).info* --- automake1.9-nonfree-1.9.6.orig/debian/automake1.9-doc.doc-base +++ automake1.9-nonfree-1.9.6/debian/automake1.9-doc.doc-base @@ -0,0 +1,17 @@ +Document: automake-1.9 +Title: automake-1.9 +Abstract: Automake is a tool for automatically generating `Makefile.in's from + files called `Makefile.am'. + . + The goal of Automake is to remove the burden of Makefile maintenance + from the back of the individual GNU maintainer (and put it on the back + of the Automake maintainer). + . + The `Makefile.am' is basically a series of `make' macro definitions + (with rules being thrown in occasionally). The generated + `Makefile.in's are compliant with the GNU Makefile standards. +Section: Apps/programming + +Format: info +Index: /usr/share/info/automake-1.9.info.gz +Files: /usr/share/info/automake-1.9.info* --- automake1.9-nonfree-1.9.6.orig/debian/automake1.9-doc.info +++ automake1.9-nonfree-1.9.6/debian/automake1.9-doc.info @@ -0,0 +1 @@ +doc/automake-1.9.info*