From a76a195a35d25b1c8ea534a2e75e42879b2e0ae1 Mon Sep 17 00:00:00 2001 From: calvin Date: Tue, 31 Dec 2002 01:12:59 +0000 Subject: [PATCH] build fixes git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@694 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- ChangeLog | 3 ++- MANIFEST.in | 2 +- debian/README.Debian | 7 +++++-- debian/changelog | 4 ++++ debian/control | 2 +- debian/copyright | 12 ++---------- debian/rules | 2 +- lconline/README.negotiation | 3 +++ po/de.po | 10 +++------- po/fr.po | 24 +++++++----------------- po/nl.po | 25 +++++++------------------ 11 files changed, 36 insertions(+), 58 deletions(-) create mode 100644 lconline/README.negotiation diff --git a/ChangeLog b/ChangeLog index 89c039ef..047205ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,8 @@ Changed files: linkcheck/logging/HtmlLogger.py * add translated cgi files Changed files: setup.py, MANIFEST.in, debian/rules - Added files: lconline/*.de + Added files: lconline/*.{de,en} + Removed files: lconline/{leer.html,lc_cgi.html} 1.8.1 * Add missing () to function call in proxy handling code diff --git a/MANIFEST.in b/MANIFEST.in index 8cf5fa92..7578274c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,7 +8,7 @@ include debian/rules debian/changelog debian/copyright debian/control include debian/linkchecker.* include test/*.py test/*.txt include test/output/test_* test/html/*.html -include lconline/*.html lconline/*.de lconline/*.en +include lconline/*.html lconline/*.de lconline/*.en lconline/README.negotiation include linkcheck/parser/Makefile linkcheck/parser/htmllex.l include linkcheck/parser/htmlparse.y linkcheck/parser/htmlparse.h include linkcheck/parser/htmlsax.h diff --git a/debian/README.Debian b/debian/README.Debian index 1df49b37..e34dddec 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,4 +1,7 @@ On Debian systems, you have a simple CGI script located at -http://localhost/cgi-bin/lconline/ +http://localhost/lconline/index.html +For this to work, your web server must have content negotiation enabled. +Or you have to remove for one language XY the file extensions of the .html +files. -For installation of other CGI scripts, see README +For installation of a FastCGI script instead of the above, see README. diff --git a/debian/changelog b/debian/changelog index e27c4576..67263e60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ linkchecker (1.8.2-1) unstable; urgency=low * New upstream release. * install translated cgi html files + * add pointer to common license in copyright + * use DH_COMPAT=4, added build-depends: debhelper (>= 4.1.25) to + remove /usr/doc manglement stuff and add dh_python support for future + versions. There goes woody backport portability :) -- Bastian Kleineidam Sat, 28 Dec 2002 18:23:26 +0100 diff --git a/debian/control b/debian/control index 3bedcb0a..44f27f9f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: linkchecker Section: web Priority: optional Maintainer: Bastian Kleineidam -Build-Depends: python2.2-dev (>= 2.2.1), debhelper (>= 3.0.0), gettext +Build-Depends: python2.2-dev (>= 2.2.1), debhelper (>= 4.1.0), gettext Standards-Version: 3.5.8.0 Package: linkchecker diff --git a/debian/copyright b/debian/copyright index 3a125642..3041c8f9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This is linkchecker, written and maintained by Bastian Kleineidam +This is linkchecker, written and maintained by Bastian Kleineidam on Sat, 8 Jan 2000 11:00:35 +0100. The original source can always be found at: @@ -11,12 +11,4 @@ Copyright (C) 2000-2002 Bastian Kleineidam the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program 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 with - the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; - if not, write to the Free Software Foundation, Inc., 59 Temple Place, - Suite 330, Boston, MA 02111-1307 USA +See /usr/share/common-licenses/GPL for more information. diff --git a/debian/rules b/debian/rules index 496f1634..1576ff1d 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ HTMLDIR=$(ROOT)/var/www/lconline #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 # This has to be exported to make some magic below work. export DH_OPTIONS diff --git a/lconline/README.negotiation b/lconline/README.negotiation new file mode 100644 index 00000000..4e2b5942 --- /dev/null +++ b/lconline/README.negotiation @@ -0,0 +1,3 @@ +For these HTML files to work, your browser has to have mod_negotiation +enabled. +Or you can just remove the .XY suffixes from the language-specific files. diff --git a/po/de.po b/po/de.po index f122745f..ec4267c5 100644 --- a/po/de.po +++ b/po/de.po @@ -34,7 +34,7 @@ msgid "Got no answer from FTP server" msgstr "Keine Antwort vom FTP Server" msgid "Missing trailing directory slash in ftp url" -msgstr "" +msgstr "Fehlender / am Ende der FTP url" msgid "found" msgstr "gefunden" @@ -184,7 +184,7 @@ msgid "Found %s in link contents" msgstr "Habe %s in Link Inhalt gefunden" msgid "Content size %s is larger than %s" -msgstr "" +msgstr "Inhalt %s is größer als %s" msgid "more than one tag found, using only the first one" msgstr "mehr als ein Tag gefunden, benutze lediglich das erste" @@ -312,9 +312,8 @@ msgstr "Ergebnis" msgid "Start checking at %s\n" msgstr "Beginne Prüfen am %s\n" -#, fuzzy msgid " (cached)" -msgstr " (aus dem Cache)\n" +msgstr " (aus dem Cache)" msgid "Thats it. " msgstr "Das wars. " @@ -651,6 +650,3 @@ msgstr "keine Dateien oder URLs angegeben" msgid "Hit RETURN to finish" msgstr "Drücken Sie RETURN zum Beenden" - -#~ msgid "Illegal telnet link syntax" -#~ msgstr "Illegale Telnet link Syntax" diff --git a/po/fr.po b/po/fr.po index 7d40d398..0b0ac34b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -175,29 +175,23 @@ msgstr "" msgid "unsupported language" msgstr "" -#, fuzzy msgid "empty url was given" -msgstr "aucun fichier ou url donnée" +msgstr "aucun url donnée" -#, fuzzy msgid "invalid url was given" -msgstr "aucun fichier ou url donnée" +msgstr "aucun url donnée" -#, fuzzy msgid "no url was given" -msgstr "aucun fichier ou url donnée" +msgstr "aucun url donnée" -#, fuzzy msgid "invalid recursion level syntax" -msgstr "valeur du niveau de récursivité %d illégal" +msgstr "" -#, fuzzy msgid "recursion level greater than 3" -msgstr "valeur du niveau de récursivité %d illégal" +msgstr "" -#, fuzzy msgid "invalid %s option syntax" -msgstr "option de log invalide '%s'" +msgstr "" msgid "" "\n" @@ -291,9 +285,8 @@ msgstr "R msgid "Start checking at %s\n" msgstr "Démarrage du controle à %s\n" -#, fuzzy msgid " (cached)" -msgstr " (caché)\n" +msgstr " (caché)" msgid "Thats it. " msgstr "Terminé. " @@ -624,6 +617,3 @@ msgstr "aucun fichier ou url donn msgid "Hit RETURN to finish" msgstr "" - -#~ msgid "Illegal telnet link syntax" -#~ msgstr "Syntaxe illégale du lien telnet" diff --git a/po/nl.po b/po/nl.po index 76ee63da..b8f5df3b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -178,31 +178,24 @@ msgstr "" msgid "unsupported language" msgstr "" -#, fuzzy msgid "empty url was given" -msgstr "geen bestanden of URLs gegeven" +msgstr "" -#, fuzzy msgid "invalid url was given" -msgstr "geen bestanden of URLs gegeven" +msgstr "" -#, fuzzy msgid "no url was given" msgstr "geen bestanden of URLs gegeven" -#, fuzzy msgid "invalid recursion level syntax" -msgstr "illegaal recursie nivo nummer %d" +msgstr "illegaal recursie nivo" -#, fuzzy msgid "recursion level greater than 3" -msgstr "illegaal recursie nivo nummer %d" +msgstr "" -#, fuzzy msgid "invalid %s option syntax" -msgstr "ungeldige Log Optie '%s'" +msgstr "ungeldige Optie '%s'" -#, fuzzy msgid "" "\n" "LinkChecker Online Error\n" @@ -220,7 +213,7 @@ msgid "" msgstr "" "LinkChecker Online Fehler
Fehler
Das LinkChecker Online Skript ist " +"\"#191c83\">
Fehler: %s
Das LinkChecker Online Skript ist " "auf einen Fehler gestoßen. Bitte stellen Sie sicher, daß die " "angegebene URL mit http:// beginnt und nur diese Zeichen " "enthält: A-Za-z0-9./_~-

Fehler werden geloggt.