--- tre-0.8.0.orig/debian/shlibs +++ tre-0.8.0/debian/shlibs @@ -0,0 +1 @@ +libtre 5 libtre5 --- tre-0.8.0.orig/debian/rules +++ tre-0.8.0/debian/rules @@ -0,0 +1,105 @@ +#!/usr/bin/make -f + +CC = gcc +CFLAGS = -g -Wall -D_REENTRANT +INSTALL_PROGRAM = install + +STRIP = true +ATRIP = true + +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s + STRIP=strip --strip-unneeded --remove-section=.comment --remove-section=.note + ATRIP=strip --strip-debug +endif + +SOVERSION=5 +VERSION=5.0.0 + +build: + ./configure --prefix=/usr --enable-static + $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" + $(MAKE) -C po update-gmo + $(MAKE) install DESTDIR=`pwd`/debian/tmp \ + INSTALL_PROGRAM="$(INSTALL_PROGRAM)" + touch build + +clean: + rm -f build + [ ! -f Makefile ] || $(MAKE) distclean + rm -f `find . -name "*~"` + rm -rf debian/tmp debian/files* core debian/substvars + cd debian && rm -rf libtre$(SOVERSION) libtre-dev tre-agrep + cd po && rm -f *.gmo + +binary-indep: build + +binary-arch: build + debian/rules libtre$(SOVERSION) + debian/rules libtre-dev + debian/rules tre-agrep + +libtre$(SOVERSION): build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc/$@ + install -d debian/$@/usr/lib + cp -a debian/tmp/usr/lib/libtre.so.$(SOVERSION)* debian/$@/usr/lib + cp -a debian/tmp/usr/share/locale debian/$@/usr/share + install -m 755 debian/postinst debian/$@/DEBIAN + install -m 644 debian/shlibs debian/$@/DEBIAN + cp -p NEWS TODO README THANKS debian/$@/usr/share/doc/$@ + cp -p debian/copyright debian/$@/usr/share/doc/$@ + cp -p ChangeLog debian/$@/usr/share/doc/$@/changelog + cp -p debian/changelog debian/$@/usr/share/doc/$@/changelog.Debian + cd debian/$@/usr/share/doc/$@ && gzip -9 changelog changelog.Debian + $(STRIP) debian/$@/usr/lib/libtre.so.$(VERSION) + chmod -x debian/$@/usr/lib/* + dpkg-shlibdeps debian/$@/usr/lib/libtre.so.$(VERSION) + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R go=rX debian/$@ + dpkg --build debian/$@ .. + +libtre-dev: build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc + install -d debian/$@/usr/lib + ln -s libtre$(SOVERSION) debian/$@/usr/share/doc/$@ + cp -a debian/tmp/usr/lib/*.so debian/$@/usr/lib + cp -p debian/tmp/usr/lib/*.a debian/$@/usr/lib + cp -a debian/tmp/usr/lib/pkgconfig debian/$@/usr/lib + cp -a debian/tmp/usr/include debian/$@/usr + $(ATRIP) debian/$@/usr/lib/*.a + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R go=rX debian/$@ + dpkg --build debian/$@ .. + +tre-agrep: build + rm -rf debian/$@ + install -d debian/$@/DEBIAN debian/$@/usr/share/doc + install -d debian/$@/usr/bin debian/$@/usr/share/man/man1 + ln -s libtre$(SOVERSION) debian/$@/usr/share/doc/$@ + cp -p debian/tmp/usr/bin/agrep debian/$@/usr/bin/tre-agrep + cp -p debian/tmp/usr/share/man/man1/agrep.1 \ + debian/$@/usr/share/man/man1/tre-agrep.1 + gzip -r9 debian/$@/usr/share/man + dpkg-shlibdeps debian/$@/usr/bin/tre-agrep + $(STRIP) debian/$@/usr/bin/tre-agrep + dpkg-gencontrol -p$@ -Pdebian/$@ + cd debian/$@ && \ + md5sum `find * -type f ! -regex "DEBIAN/.*"` > DEBIAN/md5sums + chown -R root:root debian/$@ + chmod -R go=rX debian/$@ + dpkg --build debian/$@ .. + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean --- tre-0.8.0.orig/debian/control +++ tre-0.8.0/debian/control @@ -0,0 +1,34 @@ +Source: tre +Section: libs +Priority: optional +Maintainer: Santiago Vila +Uploaders: Milan Zamazal +Standards-Version: 3.8.3 +Build-Depends: gettext + +Package: libtre5 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libtre4 +Suggests: tre-agrep +Description: regexp matching library with approximate matching + TRE is a lightweight, robust, and efficient POSIX compliant regexp + matching library with some exciting features such as approximate + matching. + +Package: libtre-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, libtre5 (= ${binary:Version}) +Description: development package for the libtre5 regexp matching library + This package contains the header files and static libraries required + to develop programs based on the TRE library. TRE is a lightweight, + robust, and efficient POSIX compliant regexp matching library with + some exciting features such as approximate matching. + +Package: tre-agrep +Architecture: any +Section: text +Depends: ${shlibs:Depends} +Description: approximate grep utility based on the tre library + This is an Approximate GREP utility based on the TRE regexp matching library --- tre-0.8.0.orig/debian/postinst +++ tre-0.8.0/debian/postinst @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +if [ "$1" = "configure" ]; then + ldconfig +fi --- tre-0.8.0.orig/debian/copyright +++ tre-0.8.0/debian/copyright @@ -0,0 +1,35 @@ +This is the Debian prepackaged version of libtre, a POSIX compliant +regexp matching package (library and tools) with approximate matching. + +This package was first put together by Santiago Vila, who currently +maintains it. + +The source code was taken from: + +http://laurikari.net/tre/tre-0.8.0.tar.gz + +Copyright (c) 2001-2009 Ville Laurikari +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. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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 COPYRIGHT +HOLDER 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. --- tre-0.8.0.orig/debian/changelog +++ tre-0.8.0/debian/changelog @@ -0,0 +1,107 @@ +tre (0.8.0-2) unstable; urgency=low + + * Added "Replaces: libtre4" to libtre5, as both library packages have + files in /usr/share/locale in common. Closes: #559512. + + -- Santiago Vila Sat, 05 Dec 2009 12:38:18 +0100 + +tre (0.8.0-1) unstable; urgency=low + + * New upstream release. Closes: #558465. From the NEWS file: Added + tre_ prefix to all functions exported from libtre. This changes the + binary interface (ABI). The old source interface (API) is still + available in . New programs should use . + * Made libtre-dev to depend on exact libtre version (lintian warning). + + -- Santiago Vila Thu, 03 Dec 2009 18:27:10 +0100 + +tre (0.7.6-2) unstable; urgency=low + + * Use STRIP variable on tre-agrep. + * Removed useless *.la files. + + -- Santiago Vila Sun, 30 Aug 2009 20:42:38 +0200 + +tre (0.7.6-1) unstable; urgency=low + + * New upstream release. + * License has changed from LGPL to a 2-clause BSD-style license. + * Updated config.guess and config.sub. Closes: #531962. + * Added de.po translation. Closes: #529219. + * Build-Depends: gettext, because of the above. + * Do not ignore errors from make distclean. + * Removed redundant section and priority entries from control file. + + -- Santiago Vila Tue, 28 Jul 2009 20:49:32 +0200 + +tre (0.7.5-2) unstable; urgency=low + + * Added available translations to libtre4. Closes: #513056. + * Added tre.pc to libtre-dev. Closes: #513055. + * Some debian/rules cleanup. + + -- Santiago Vila Mon, 26 Jan 2009 12:29:08 +0100 + +tre (0.7.5-1) unstable; urgency=low + + * New upstream release. See the NEWS file for details. + * Added Milan Zamazal to the Uploaders field, as backup maintainer. + + -- Santiago Vila Tue, 19 Dec 2006 20:06:52 +0100 + +tre (0.7.3-1) unstable; urgency=low + + * New upstream release. License is now LGPL. + + -- Santiago Vila Tue, 11 Apr 2006 19:13:10 +0200 + +tre (0.7.2-1) unstable; urgency=low + + * New upstream release. + + -- Santiago Vila Fri, 24 Dec 2004 20:13:14 +0100 + +tre (0.7.0-1) unstable; urgency=low + + * New upstream release (Closes: #280781). + + -- Santiago Vila Fri, 12 Nov 2004 18:33:02 +0100 + +tre (0.6.8-2) unstable; urgency=low + + * New package tre-agrep, contains /usr/bin/tre-agrep (Closes: #240166). + * Added Suggests: tre-agrep to libtre4. + + -- Santiago Vila Tue, 6 Jul 2004 17:37:46 +0200 + +tre (0.6.8-1) unstable; urgency=low + + * New upstream release, [[:blank:]] should work again (Closes: #250576). + + -- Santiago Vila Fri, 28 May 2004 00:29:00 +0200 + +tre (0.6.7-1) unstable; urgency=low + + * New upstream (stable) release. + + -- Santiago Vila Sun, 23 May 2004 17:09:04 +0200 + +tre (0.6.6-1) unstable; urgency=low + + * New upstream release. + * Added --enable-static, since the default is no. + + -- Santiago Vila Wed, 14 Apr 2004 01:01:22 +0200 + +tre (0.6.4-1) unstable; urgency=low + + * New upstream release (Closes: #226128). + * Changed control, rules and shlibs to match new soname. + + -- Santiago Vila Mon, 5 Jan 2004 15:41:22 +0100 + +tre (0.5.3-1) unstable; urgency=low + + * Initial release. + + -- Santiago Vila Mon, 27 Oct 2003 22:56:44 +0100 --- tre-0.8.0.orig/doc/agrep.1.in +++ tre-0.8.0/doc/agrep.1.in @@ -1,14 +1,14 @@ -.TH agrep 1 "November 21, 2004" "TRE agrep @PACKAGE_VERSION@" +.TH tre-agrep 1 "November 21, 2004" "TRE agrep @PACKAGE_VERSION@" .SH NAME -agrep \- print lines approximately matching a pattern +tre-agrep \- print lines approximately matching a pattern .SH SYNOPSIS -.B agrep +.B tre-agrep .RI [ OPTION ]... .I PATTERN .RI [ FILE ]... .SH DESCRIPTION Searches for approximate matches of PATTERN in each FILE or standard -input. Example: `agrep \-2 optimize foo.txt' outputs all lines in +input. Example: `tre-agrep \-2 optimize foo.txt' outputs all lines in file `foo.txt' that match "optimize" within two errors. E.g. lines which contain "optimise", "optmise", and "opitmize" all match. .SH OPTIONS --- tre-0.8.0.orig/po/de.po +++ tre-0.8.0/po/de.po @@ -0,0 +1,261 @@ +# Translation of tre to German +# Copyright (C) 2006 Ville Laurikari +# This file is distributed under the same license as the tre package. +# Chris Leick , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: 0.7.5\n" +"Report-Msgid-Bugs-To: tre-general@lists.laurikari.net\n" +"POT-Creation-Date: 2006-12-09 22:48+0200\n" +"PO-Revision-Date: 2009-04-30 13:14+0100\n" +"Last-Translator: Chris Leick \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + + +#: lib/regerror.c:43 +msgid "No error" +msgstr "Kein Fehler" + +#: lib/regerror.c:44 +msgid "No match" +msgstr "Kein Treffer" + +#: lib/regerror.c:45 +msgid "Invalid regexp" +msgstr "Falscher regulärer Ausdruck" + +#: lib/regerror.c:46 +msgid "Unknown collating element" +msgstr "" + +#: lib/regerror.c:47 +msgid "Unknown character class name" +msgstr "Unbekannter Zeichenklassenname" + +#: lib/regerror.c:48 +msgid "Trailing backslash" +msgstr "Angehängter Backslash" + +#: lib/regerror.c:49 +msgid "Invalid back reference" +msgstr "Ungültiger Rückwärtsbezug" + +#: lib/regerror.c:50 +msgid "Missing ']'" +msgstr "Fehlende »]«" + +#: lib/regerror.c:51 +msgid "Missing ')'" +msgstr "Fehlende »)«" + +#: lib/regerror.c:52 +msgid "Missing '}'" +msgstr "Fehlende »}«" + +#: lib/regerror.c:53 +msgid "Invalid contents of {}" +msgstr "Ungültige Inhalte von {}" + +#: lib/regerror.c:54 +msgid "Invalid character range" +msgstr "Ungültiger Schriftzeichenbereich" + +#: lib/regerror.c:55 src/agrep.c:230 src/agrep.c:300 src/agrep.c:325 +#: src/agrep.c:674 src/agrep.c:713 +msgid "Out of memory" +msgstr "Platz im Hauptspeicher reicht nicht aus" + +#: lib/regerror.c:56 +msgid "Invalid use of repetition operators" +msgstr "Falsche Benutzung von Wiederholungsoperatoren" + +#: lib/regerror.c:69 +msgid "Unknown error" +msgstr "Unbekannter Fehler" + +#: src/agrep.c:97 src/agrep.c:104 +#, c-format +msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n" +msgstr "Aufruf: %s [OPTION]... MUSTER [DATEI]...\n" + +#: src/agrep.c:99 +#, c-format +msgid "Try `%s --help' for more information.\n" +msgstr "Versuchen Sie »%s --help« um weitere Informationen zu erhalten.\n" + +#: src/agrep.c:105 +#, c-format +msgid "" +"Searches for approximate matches of PATTERN in each FILE or standard input.\n" +"Example: `%s -2 optimize foo.txt' outputs all lines in file `foo.txt' that\n" +"match \"optimize\" within two errors. E.g. lines which contain \"optimise" +"\",\n" +"\"optmise\", and \"opitmize\" all match.\n" +msgstr "" +"Sucht nach ungefähren Treffern von MUSTER in jeder DATEI oder der\n" +"Standardeingabe.\n" +"Beispiel: »%s -2 optimize foo.txt« gibt alle Zeilen in der Datei\n" +"»foo.txt« aus, die in zwei Fehlern »optimize« gleichen. Z.B. Zeilen, die\n" +"»optimise«,»optmise« und »opitmize« enthalten passen alle.\n" + +#: src/agrep.c:111 +#, c-format +msgid "" +"Regexp selection and interpretation:\n" +" -e, --regexp=PATTERN\t use PATTERN as a regular expression\n" +" -i, --ignore-case\t ignore case distinctions\n" +" -k, --literal\t\t PATTERN is a literal string\n" +" -w, --word-regexp\t force PATTERN to match only whole words\n" +"\n" +"Approximate matching settings:\n" +" -D, --delete-cost=NUM\t set cost of missing characters\n" +" -I, --insert-cost=NUM\t set cost of extra characters\n" +" -S, --substitute-cost=NUM set cost of wrong characters\n" +" -E, --max-errors=NUM\t select records that have at most NUM errors\n" +" -#\t\t\t select records that have at most # errors (# is a\n" +"\t\t\t digit between 0 and 9)\n" +"\n" +"Miscellaneous:\n" +" -d, --delimiter=PATTERN set the record delimiter regular expression\n" +" -v, --invert-match\t select non-matching records\n" +" -V, --version\t\t print version information and exit\n" +" -y, --nothing\t\t does nothing (for compatibility with the non-free\n" +"\t\t\t agrep program)\n" +" --help\t\t display this help and exit\n" +"\n" +"Output control:\n" +" -B, --best-match\t only output records with least errors\n" +" -c, --count\t\t only print a count of matching records per FILE\n" +" -h, --no-filename\t suppress the prefixing filename on output\n" +" -H, --with-filename\t print the filename for each match\n" +" -l, --files-with-matches only print FILE names containing matches\n" +" -M, --delimiter-after print record delimiter after record if -d is " +"used\n" +" -n, --record-number\t print record number with output\n" +" --line-number same as -n\n" +" -q, --quiet, --silent\t suppress all normal output\n" +" -s, --show-cost\t print match cost with output\n" +" --colour, --color use markers to distinguish the matching strings\n" +" --show-position prefix each output record with start and end\n" +" position of the first match within the record\n" +msgstr "" +"Auswahl und Interpretation regulärer Ausdrücke:\n" +" -e, --regexp=MUSTER\t MUSTER wird als regulärer Ausdruck benutzt\n" +" -i, --ignore-case\t Groß-/Kleinschreibungsunterschiede ignorieren\n" +" -k, --literal\t\t MUSTER ist eine buchstabengetreue Zeichenkette\n" +" -w, --word-regexp\t erzwingen, dass MUSTER nur ganzen Wörtern\n" +"\t\t\t entspricht\n" +"\n" +"Einstellung für ungefähre Treffer:\n" +" -D, --delete-cost=ZAHL\t Kosten für fehlende Buchstaben setzen\n" +" -I, --insert-cost=ZAHL\t Kosten für zusätzliche Buchstaben setzen\n" +" -S, --substitute-cost=ZAHL Kosten für falsche Buchstaben setzen\n" +" -E, --max-errors=ZAHL\t Datensätze wählen die höchstens ZAHL Fehler\n" +"\t\t\t haben\n" +" -#\t\t\t Datensätze wählen die höchstens # Fehler haben (# ist eine\n" +"\t\t\t Ziffer zwischen 0 und 9)\n" +"\n" +"Verschiedenes:\n" +" -d, --delimiter=MUSTER regulären Ausdruck für Datensatztrenner\n" +"\t\t\t setzen\n" +" -v, --invert-match\t nicht-passende Datensätze auswählen\n" +" -V, --version\t\t Versionsinformation ausgeben und beenden\n" +" -y, --nothing\t\t nichts tun (für Kompatibilität mit dem\n" +"\t\t\t nicht-freien agrep-Programm)\n" +" --help\t\t diese Hilfe anzeigen und beenden\n" +"\n" +"Ausgabekontrolle:\n" +" -B, --best-match\t nur Datensätze mit geringsten Fehlern anzeigen\n" +" -c, --count\t\t nur Anzahl der übereinstimmenden Datensätze pro\n" +"\t\t\t DATEI anzeigen\n" +" -h, --no-filename\t den der Ausgabe vorangestellten Dateinamen\n" +"\t\t\t unterdrücken\n" +" -H, --with-filename\t den Dateinamen für jeden Treffer ausgeben\n" +" -l, --files-with-matches nur DATEInamen ausgeben, die Treffer\n" +"\t\t\t enthalten\n" +" -M, --delimiter-after Datensatztrenner nach dem Datensatz\n" +"\t\t\t ausgeben, wenn -d benutzt wird\n" +" -n, --record-number\t Datensatznummer mit Ausgabe ausgeben\n" +" --line-number das gleiche wie -n\n" +" -q, --quiet, --silent\t normale Ausgabe unterdrücken\n" +" -s, --show-cost\t Trefferkosten mit Ausgabe ausgeben\n" +" --colour, --color Markierungen benutzen um passende\n" +"\t\t\t Zeichenketten zu kennzeichnen\n" +" --show-position jedem ausgegebenen Datensatz die Start- und\n" +" Endposition des ersten Treffers innerhalb des\n" +" Datensatzes voranstellen\n" + +#: src/agrep.c:150 +#, c-format +msgid "" +"With no FILE, or when FILE is -, reads standard input. If less than two\n" +"FILEs are given, -h is assumed. Exit status is 0 if a match is found, 1 " +"for\n" +"no match, and 2 if there were errors. If -E or -# is not specified, only\n" +"exact matches are selected.\n" +msgstr "" +"Ohne DATEI oder wenn DATEI - ist, wird Standardeingabe gelesen. Wenn\n" +"weniger als zwei DATEIen vorhanden sind, wird -h vorausgesetzt.\n" +"Wenn es einen Treffer gibt, ist der Exit-Status 0, 1 für keinen Treffer\n" +"und 2, wenn es Fehler gibt. Wenn -E oder -# nicht angegeben ist, werden\n" +"nur exakte Treffer ausgewählt.\n" + +#: src/agrep.c:156 +#, c-format +msgid "" +"PATTERN is a POSIX extended regular expression (ERE) with the TRE " +"extensions.\n" +"See tre(7) for a complete description.\n" +msgstr "" +"MUSTER ist ein POSIX-erweiterter regulärer Ausdruck (ERE) mit den\n" +"TRE-Erweiterungen.\n" + +#: src/agrep.c:160 +#, c-format +msgid "Report bugs to: " +msgstr "Fehler melden an:" + +#: src/agrep.c:245 +#, c-format +msgid "Error reading from %s: %s\n" +msgstr "Fehler beim Lesen von %s: %s\n" + +#: src/agrep.c:340 +msgid "Cannot use -B when reading from standard input." +msgstr "-B kann nicht beim Lesen von der Standardeingabe benutzt werden." + +#: src/agrep.c:344 +msgid "(standard input)" +msgstr "(Standardeingabe)" + +#: src/agrep.c:597 +#, c-format +msgid "Copyright (c) 2002-2006 Ville Laurikari.\n" +msgstr "Copyright (c) 2002-2006 Ville Laurikari.\n" + +#: src/agrep.c:598 +#, c-format +msgid "" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" +"Dies ist freie Software. Sehen Sie im Quelltext nach\n" +"Vervielfältigungsbedinungen. Es gibt KEINE Garantie. Auch nicht für\n" +"MARKTFÄHIGKEIT oder EIGNUNG FÜR SPEZIELLE ZWECKE.\n" + +#: src/agrep.c:728 +msgid "Error in search pattern" +msgstr "Fehler im Suchmuster" + +#: src/agrep.c:739 +msgid "Error in record delimiter pattern" +msgstr "Fehler im Datensatzbegrenzungsmuster" + +#: src/agrep.c:746 +msgid "Record delimiter pattern must not match an empty string" +msgstr "Datensatzbegrenzungsmuster darf keine leere Zeichenkette sein" --- tre-0.8.0.orig/po/LINGUAS +++ tre-0.8.0/po/LINGUAS @@ -1,3 +1,4 @@ # Set of available languages. +de fi sv --- tre-0.8.0.orig/utils/config.sub +++ tre-0.8.0/utils/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2007-06-28' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -122,6 +122,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -152,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -249,13 +253,16 @@ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +275,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -277,7 +285,7 @@ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | score \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -286,7 +294,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -329,14 +337,17 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -358,20 +369,24 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -435,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -443,10 +462,26 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -514,6 +549,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -668,6 +707,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -813,6 +860,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -1021,6 +1076,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1096,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1134,7 +1197,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1204,10 +1267,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1216,7 +1280,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1356,6 +1420,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1553,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) --- tre-0.8.0.orig/utils/config.guess +++ tre-0.8.0/utils/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -170,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -324,6 +324,9 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -331,7 +334,20 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -532,7 +548,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -640,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -796,13 +812,19 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd) + EM64T | authenticamd | genuineintel) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -833,7 +855,14 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -856,40 +885,17 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif @@ -921,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -954,8 +963,8 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -972,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1048,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1092,8 +1090,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1131,6 +1132,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1143,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1206,6 +1217,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1314,6 +1328,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1474,9 +1491,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be