Bug#321689: automake1.9: "make dist" distributes too many files (dist-info)

[Alexandre Duret-Lutz]

>>> "RW" == Ralf Wildenhues <[EMAIL PROTECTED]> writes:

 RW> Please try this patch (against CVS Automake, but should
 RW> apply to branch-1-9 as well).  Thanks.

Thanks, I'm checking the following in.

2006-01-12  Alexandre Duret-Lutz  <[EMAIL PROTECTED]>

* tests/txinfo13.test: Test fix below.

2006-01-12  Ralf Wildenhues  <[EMAIL PROTECTED]>

* lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
extra files in distribution.  Reported by Vincent Lefevre.

Index: lib/am/texinfos.am
===
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.118
diff -u -r1.118 texinfos.am
--- lib/am/texinfos.am  7 Aug 2005 07:41:05 -   1.118
+++ lib/am/texinfos.am  12 Jan 2006 19:52:59 -
@@ -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
@@ -344,11 +344,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%
Index: tests/txinfo13.test
===
RCS file: /cvs/automake/automake/tests/txinfo13.test,v
retrieving revision 1.5
diff -u -r1.5 txinfo13.test
--- tests/txinfo13.test 14 May 2005 20:28:56 -  1.5
+++ tests/txinfo13.test 12 Jan 2006 19:52:59 -
@@ -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
-- 
Alexandre Duret-Lutz

Shared books are happy books. http://www.bookcrossing.com/friend/gadl



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#321689: automake1.9: "make dist" distributes too many files (dist-info)

[Vincent Lefevre]

On 2006-01-02 14:14:40 +0100, Ralf Wildenhues wrote:
> [ this is http://bugs.debian.org/321689 ]

> Please try this patch (against CVS Automake, but should apply to
> branch-1-9 as well).  Thanks.

Thanks, this works at least with the Debian package.

-- 
Vincent Lefèvre <[EMAIL PROTECTED]> - Web: 
100% accessible validated (X)HTML - Blog: 
Work: CR INRIA - computer arithmetic / SPACES project at LORIA


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#321689: automake1.9: "make dist" distributes too many files (dist-info)

[Ralf Wildenhues]

[ this is http://bugs.debian.org/321689 ]

* Vincent Lefevre wrote on Sun, Aug 07, 2005 at 12:00:21AM CEST:
> 
> In addition to the file .info, I had a .info.bak
> in the source directory, and when I did a "make dist", both files
> were included in the distribution. Only .info should have
> been included.
> 
> I think that the dist-info rule in /usr/share/automake-1.9/am/texinfos.am
> is incorrect due to the wildcard * that captures too much.

Please try this patch (against CVS Automake, but should apply to
branch-1-9 as well).  Thanks.

It may be useful to refactor all texinfo rules to have the globs in one
macro.

Eric, please consider adding bug-automake at gnu.org when reporting
Automake bugs upstream.

Cheers,
Ralf

* lib/am/texinfos.am (dist-info): Tighten glob to avoid unwanted
extra files in distribution.
Reported by Vincent Lefevre <[EMAIL PROTECTED]>.

Index: lib/am/texinfos.am
===
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.118
diff -u -r1.118 texinfos.am
--- lib/am/texinfos.am  7 Aug 2005 07:41:05 -   1.118
+++ lib/am/texinfos.am  2 Jan 2006 12:45:52 -
@@ -344,11 +344,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%


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#321689: automake1.9: "make dist" distributes too many files (dist-info)

[Vincent Lefevre]

Package: automake1.9
Version: 1.9.6-1
Severity: normal

In addition to the file .info, I had a .info.bak
in the source directory, and when I did a "make dist", both files
were included in the distribution. Only .info should have
been included.

I think that the dist-info rule in /usr/share/automake-1.9/am/texinfos.am
is incorrect due to the wildcard * that captures too much.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (900, 'testing'), (900, 'stable'), (200, 'unstable')
Architecture: powerpc (ppc)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.11-20050709
Locale: LANG=POSIX, LC_CTYPE=en_US.ISO8859-1 (charmap=ISO-8859-1)

Versions of packages automake1.9 depends on:
ii  autoconf  2.59a-3automatic configure script builder
ii  autotools-dev 20050422.1 Update infrastructure for config.{

automake1.9 recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]