diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | po/fr.po | 3 | ||||
-rw-r--r-- | quilt.changes | 7 | ||||
-rwxr-xr-x | test/run | 27 |
4 files changed, 36 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index abaa77f..cfb4aca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,7 +125,7 @@ NON_EXEC_IN := doc/quilt.1 doc/README quilt/scripts/patchfns ISODATE := $(shell date +%Y%m%d) -TESTS := $(wildcard test/*.test) +TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) DIRT += test/.depend $(wildcard test/.*.ok) # Settings for running the uninstalled version of quilt in the source tree: @@ -315,8 +315,7 @@ msgstr "" msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -"Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées." -"\\n" +"Les options «--combine», «--snapshot» et «-z» ne peuvent pas être combinées.\\n" #: quilt/diff.in:232 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" diff --git a/quilt.changes b/quilt.changes index 87c7cb9..f7e690c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun Nov 2 17:48:40 CET 2008 - agruen@suse.de + +- Add a dual BSD/GPL license header to test/run. +- Only run test/patch-wrapper.test if the --with-patch-wrapper + config option is used. + +------------------------------------------------------------------- Wed Sep 3 09:50:48 CEST 2008 - agruen@suse.de - Bash completion fix for fold command from @@ -1,5 +1,32 @@ #!/usr/bin/perl -w -U +# Copyright (c) 2007, 2008 Andreas Gruenbacher. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions, and the following disclaimer, +# without modification, immediately at the beginning of the file. +# 2. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# Alternatively, this software may be distributed under the terms of the +# GNU Public License ("GPL"). +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + # # Possible improvements: # |