Author: qboosh Date: Sat Nov 13 07:16:40 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.2.10 (GPL v3 now) - updated po-fix,pl.po-update patches - removed obsolete overflow,gcc4 patches
---- Files affected: packages/indent: indent-pl.po-update.patch (1.2 -> 1.3) , indent-po-fix.patch (1.1 -> 1.2) , indent.spec (1.72 -> 1.73) , indent-gcc4.patch (1.1 -> NONE) (REMOVED), indent-overflow.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/indent/indent-pl.po-update.patch diff -u packages/indent/indent-pl.po-update.patch:1.2 packages/indent/indent-pl.po-update.patch:1.3 --- packages/indent/indent-pl.po-update.patch:1.2 Mon Apr 21 20:07:36 2003 +++ packages/indent/indent-pl.po-update.patch Sat Nov 13 08:16:35 2010 @@ -1,322 +1,374 @@ ---- indent-2.2.9/po/pl.po.orig 2002-12-16 17:14:37.000000000 +0100 -+++ indent-2.2.9/po/pl.po 2003-04-21 19:49:18.000000000 +0200 -@@ -1,27 +1,26 @@ - # Polish translation for indent-1.9.1a - # Copyright (C) 1996, 1997 Free Software Foundation, Inc. +--- indent-2.2.10/po/pl.po.orig 2008-03-11 19:55:47.000000000 +0100 ++++ indent-2.2.10/po/pl.po 2010-11-13 07:55:20.395096585 +0100 +@@ -1,35 +1,39 @@ +-# Polish translation for indent-1.9.1a +-# Copyright (C) 1996, 1997 Free Software Foundation, Inc. ++# Polish translation for indent. ++# Copyright (C) 1996, 1997, 2007, 2008 Free Software Foundation, Inc. ++# This file is distributed under the same license as the indent package. ++# # Wojciech Marek Ga��zka <[email protected]>, 1997. -+# Jakub Bogusz <[email protected]>, 2002-2003. ++# Jakub Bogusz <[email protected]>, 2002-2008. # msgid "" msgstr "" -"Project-Id-Version: indent 1.9.1a\n" -+"Project-Id-Version: indent 2.2.9\n" - "POT-Creation-Date: 2002-12-16 16:12+0000\n" ++"Project-Id-Version: indent 2.2.10\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2008-03-11 19:55+0100\n" -"PO-Revision-Date: 1997-05-03 18:31+0100\n" -+"PO-Revision-Date: 2003-04-21 19:27+0200\n" - "Last-Translator: Wojciech Marek Ga��zka <[email protected]>\n" +-"Last-Translator: Wojciech Marek Ga��zka <[email protected]>\n" -"Language-Team: Polish <[email protected]>\n" ++"PO-Revision-Date: 2008-05-18 23:00+0200\n" ++"Last-Translator: Jakub Bogusz <[email protected]>\n" +"Language-Team: Polish <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" - #: src/args.c:543 + #: src/args.c:610 -#, fuzzy - msgid "usage: indent file [-o outfile ] [ options ]\n" --msgstr "u�ycie: %s plik [-o plik wynikowy ] [ opcje ]\n" -+msgstr "sk�adnia: indent plik [-o plik-wynikowy ] [ opcje ]\n" - - #: src/args.c:544 --#, fuzzy - msgid " indent file1 file2 ... fileN [ options ]\n" + msgid "" + "usage: indent file [-o outfile ] [ options ]\n" + " indent file1 file2 ... fileN [ options ]\n" -msgstr " %s plik1 plik2 ... plikN [ opcje ]\n" -+msgstr " indent plik1 plik2 ... plikN [ opcje ]\n" ++msgstr "" ++"sk�adnia: indent plik [-o plik_wyj�ciowy] [ opcje ]\n" ++" indent plik1 plik2 ... plikN [ opcje ]\n" + + #: src/args.c:676 +-#, fuzzy, c-format ++#, c-format + msgid "%s: missing argument to parameter %s\n" +-msgstr "indent: brak argumentu dla parametru %s\n" ++msgstr "%s: brak argumentu dla parametru %s\n" - #: src/args.c:609 + #: src/args.c:801 +-#, fuzzy, c-format ++#, c-format + msgid "%s: unknown option \"%s\"\n" +-msgstr "indent: nieznana opcja \"%s\"\n" ++msgstr "%s: nieznana opcja \"%s\"\n" + + #: src/args.c:811 #, c-format -@@ -39,9 +38,9 @@ +@@ -37,62 +41,63 @@ msgstr "opcja: %s\n" - #: src/args.c:744 + #: src/args.c:827 -#, fuzzy, c-format +#, c-format msgid "GNU indent %s\n" -msgstr "indent: %s" +msgstr "GNU indent %s\n" - #: src/args.c:827 - #, c-format -@@ -55,68 +54,68 @@ + #: src/args.c:912 +-#, fuzzy, c-format ++#, c-format + msgid "%s: option ``%s'' requires a numeric parameter\n" +-msgstr "indent: opcja ``%s'' wymaga podania warto�ci liczbowej\n" ++msgstr "%s: opcja ``%s'' wymaga podania warto�ci liczbowej\n" - #: src/args.c:892 + #: src/args.c:920 +-#, fuzzy, c-format ++#, c-format + msgid "set_option: internal error: p_type %d\n" +-msgstr "indent: set_option: wewn�trzny b��d: p_type %d\n" ++msgstr "set_option: wewn�trzny b��d: p_type %d\n" + + #: src/args.c:976 msgid "Profile contains an unterminated comment" -msgstr "" +msgstr "Profil zawiera nie zako�czony komentarz" - #: src/args.c:929 + #: src/args.c:1014 msgid "Profile contains unpalatable characters" -msgstr "" +msgstr "Profil zawiera nieprzyjemne znaki" - #: src/backup.c:404 + #: src/args.c:1182 + #, c-format + msgid "File named by environment variable %s does not exist or is not readable" + msgstr "" ++"Plik okre�lony zmienn� �rodowiskow� %s nie istnieje lub nie jest czytelny" + + #: src/backup.c:466 + #, c-format msgid "indent: Strange version-control value\n" -msgstr "indent: Dziwna warto�� numeru wersji\n" +msgstr "indent: Dziwna warto�� znacznika kontroli wersji\n" - #: src/backup.c:405 + #: src/backup.c:467 + #, c-format msgid "indent: Using numbered-existing\n" -msgstr "indent: U�ywam bie��cy numerowany\n" +msgstr "indent: U�ycie trybu numbered-existing (numerowane je�li istniej�)\n" - #: src/backup.c:434 + #: src/backup.c:498 -#, fuzzy, c-format +#, c-format msgid "indent: Can't make backup filename of %s\n" -msgstr "indent: Nie mog� zapisa� kopii pliku jako %s" +msgstr "indent: Nie mo�na utworzy� nazwy kopii zapasowej pliku %s\n" - #: src/backup.c:442 + #: src/backup.c:506 -#, fuzzy, c-format +#, c-format msgid "Can't open backup file %s" -msgstr "indent: Nie mog� zapisa� kopii pliku jako %s" +msgstr "Nie mo�na otworzy� pliku kopii zapasowej %s" - #: src/backup.c:449 + #: src/backup.c:513 -#, fuzzy, c-format +#, c-format msgid "Can't write to backup file %s" -msgstr "indent: Nie mog� zapisa� kopii pliku jako %s" +msgstr "Nie mo�na zapisa� pliku kopii zapasowej %s" - #: src/backup.c:463 + #: src/backup.c:526 #, c-format msgid "Can't preserve modification time on backup file %s" -msgstr "" +msgstr "Nie mo�na zachowa� czasu modyfikacji pliku kopii zapasowej %s" - #: src/globs.c:41 src/globs.c:64 - msgid "indent: Virtual memory exhausted.\n" + #: src/globs.c:49 src/globs.c:74 + #, c-format +@@ -100,31 +105,31 @@ msgstr "indent: Zabrak�o pami�ci wirtualnej.\n" - #: src/globs.c:79 + #: src/globs.c:93 -#, fuzzy, c-format +#, c-format msgid "indent: %s:%d: %s:" -msgstr "indent:%s:%d: %s: " +msgstr "indent: %s:%d: %s:" - #: src/globs.c:93 + #: src/globs.c:109 + #, c-format msgid "indent: Fatal Error: " -msgstr "" +msgstr "indent: B��d krytyczny: " - #: src/globs.c:103 + #: src/globs.c:119 + #, c-format msgid "indent: System Error: " -msgstr "" +msgstr "indent: B��d systemowy: " - #: src/globs.h:25 + #: src/globs.h:27 msgid "Warning" -msgstr "" +msgstr "Uwaga" - #: src/globs.h:29 + #: src/globs.h:31 msgid "Error" -msgstr "" +msgstr "B��d" - #: src/indent.c:156 + #: src/indent.c:187 msgid "Ran out of memory" -msgstr "" +msgstr "Pami�� si� sko�czy�a" - #: src/indent.c:588 src/indent.c:1248 + #: src/indent.c:596 src/indent.c:1318 #, c-format -@@ -132,27 +131,25 @@ +@@ -140,27 +145,25 @@ msgstr "Nadmiarowe #else" - #: src/indent.c:1970 + #: src/indent.c:2116 -#, fuzzy msgid "Unmatched #elif" -msgstr "Nadmiarowe #endif" +msgstr "Niedopasowane #elif" - #: src/indent.c:1997 + #: src/indent.c:2143 msgid "Unmatched #endif" -msgstr "Nadmiarowe #endif" +msgstr "Niedopasowane #endif" - #: src/indent.c:2381 + #: src/indent.c:2563 -#, fuzzy msgid "EOF encountered in comment" -msgstr "Otwarty komentarz" +msgstr "Napotkano EOF wewn�trz komentarza" - #: src/indent.c:2610 + #: src/indent.c:2802 msgid "Unexpected end of file" -msgstr "" +msgstr "Nieoczekiwany koniec pliku" - #: src/indent.c:2616 + #: src/indent.c:2808 -#, fuzzy, c-format +#, c-format msgid "There were %d non-blank output lines and %d comments\n" -msgstr "By�o %d linii wyj�ciowych i %d komentarzy\n" +msgstr "By�o %d niepustych linii wyj�ciowych i %d komentarzy\n" - #: src/indent.c:2620 + #: src/indent.c:2812 #, c-format -@@ -160,32 +157,30 @@ +@@ -168,38 +171,38 @@ msgstr "(Linii komentarza)/(Linii kodu): %6.3f\n" - #: src/indent.c:2644 + #: src/indent.c:2836 -#, fuzzy msgid "Line broken 2" -msgstr "Przerwana linia" +msgstr "Przerwana linia 2" - #: src/indent.c:2846 + #: src/indent.c:3059 -#, fuzzy, c-format +#, c-format msgid "indent: only one output file (2nd was %s)\n" -msgstr "%s: tylko jeden plik wyj�ciowy (drugim by� %s)\n" +msgstr "indent: tylko jeden plik wyj�ciowy (drugim by� %s)\n" - #: src/indent.c:2855 src/indent.c:2881 --#, fuzzy + #: src/indent.c:3068 src/indent.c:3094 +-#, fuzzy, c-format ++#, c-format msgid "indent: only one input file when output file is specified\n" -msgstr "%s: tylko jeden plik wej�ciowy gdy podano plik wyj�ciowy\n" +msgstr "indent: tylko jeden plik wej�ciowy gdy podano plik wyj�ciowy\n" - #: src/indent.c:2869 src/indent.c:2916 + #: src/indent.c:3082 src/indent.c:3129 + #, c-format msgid "indent: can't have filenames when specifying standard input\n" -msgstr "indent: nazwy plik�w ignorowane gdy podano standardowe wej�cie\n" +msgstr "indent: nie mo�na poda� nazw plik�w gdy podano standardowe wej�cie\n" - #: src/indent.c:2889 + #: src/indent.c:3102 + #, c-format msgid "indent: only one input file when stdout is used\n" -msgstr "indent: tylko jeden plik wej�ciowy gdy podano plik wyj�ciowy\n" -+msgstr "indent: tylko jeden plik wej�ciowy gdy u�ywane jest standardowe wyj�cie\n" ++msgstr "" ++"indent: tylko jeden plik wej�ciowy gdy u�ywane jest standardowe wyj�cie\n" - #: src/indent.c:3103 + #: src/indent.c:3138 + msgid "command line" +-msgstr "" ++msgstr "linia polece�" + + #: src/indent.c:3330 #, c-format msgid "Read profile %s\n" -msgstr "Czytaj profil %s\n" +msgstr "Czytanie profilu %s\n" - #: src/io.c:187 + #: src/code_io.c:169 msgid "Internal buffering error" -@@ -194,79 +189,78 @@ - #: src/io.c:349 +@@ -208,79 +211,79 @@ + #: src/code_io.c:262 #, c-format msgid "Can't open input file %s" -msgstr "" +msgstr "Nie mo�na otworzy� pliku wej�ciowego %s" - #: src/io.c:354 + #: src/code_io.c:267 #, c-format msgid "Can't stat input file %s" -msgstr "" +msgstr "Nie mo�na wykona� stat na pliku wej�ciowym %s" - #: src/io.c:359 + #: src/code_io.c:272 #, c-format msgid "Warning: Zero-length file %s" -msgstr "Ostrze�enie: Plik o zerowej d�ugo�ci %s" +msgstr "Uwaga: Plik o zerowej d�ugo�ci: %s" - #: src/io.c:367 + #: src/code_io.c:280 #, c-format msgid "File %s is too big to read" -msgstr "" +msgstr "Plik %s jest zbyt du�y, �eby m�g� by� odczytany" - #: src/io.c:375 + #: src/code_io.c:288 #, c-format msgid "System problem reading file %s" -msgstr "" +msgstr "Problem systemowy podczas odczytu pliku %s" - #: src/io.c:399 + #: src/code_io.c:312 #, c-format msgid "Error reading input file %s" -msgstr "" +msgstr "B��d podczas odczytu pliku wej�ciowego %s" - #: src/io.c:404 + #: src/code_io.c:317 #, c-format msgid "Error closeing input file %s" -msgstr "" +msgstr "B��d podczas zamykania pliku wej�ciowego %s" - #: src/io.c:588 + #: src/code_io.c:505 #, c-format msgid "Warning: File %s contains NULL-characters\n" -msgstr "Ostrze�enie: Plik %s zawiera znaki NULL\n" +msgstr "Uwaga: Plik %s zawiera znaki NULL\n" - #: src/lexi.c:756 + #: src/lexi.c:787 msgid "Unterminated character constant" -msgstr "" +msgstr "Nie zako�czona sta�a znakowa" - #: src/lexi.c:757 + #: src/lexi.c:788 msgid "Unterminated string constant" -msgstr "" +msgstr "Nie zako�czona sta�a �a�cuchowa" - #: src/lexi.c:999 + #: src/lexi.c:1034 #, c-format msgid "old style assignment ambiguity in \"=%c\". Assuming \"= %c\"\n" --msgstr "" + msgstr "" -"Niejasno�� przy starym stylu przypisania w \"=%c\". Przyjmuj� \"= %c\"\n" -+msgstr "Niejasno�� przy starym stylu przypisania w \"=%c\". Za�o�ono \"= %c\"\n" ++"Niejasno�� przy starym stylu przypisania w \"=%c\". Za�o�ono \"= %c\"\n" - #: src/output.c:1148 + #: src/output.c:1312 #, c-format msgid "indent: can't create %s\n" -msgstr "indent: nie mog� utworzy� %s\n" +msgstr "indent: nie mo�na utworzy� %s\n" - #: src/output.c:1187 + #: src/output.c:1351 #, c-format msgid "Can't close output file %s" -msgstr "" +msgstr "Nie mo�na zamkn�� pliku wyj�ciowego %s" - #: src/output.c:1200 + #: src/output.c:1364 #, c-format msgid "Can't preserve modification time on output file %s" -msgstr "" +msgstr "Nie mo�na zachowa� czasu modyfikacji pliku wyj�ciowego %s" - #: src/parse.c:399 + #: src/parse.c:447 msgid "Unmatched 'else'" -msgstr "Nadmiarowe 'else'" +msgstr "Niedopasowane 'else'" - #: src/parse.c:425 + #: src/parse.c:473 msgid "Stmt nesting error." -msgstr "Zagnie�dzony b��d w instrukcji." +msgstr "B��d zagnie�d�enia instrukcji." - #: src/parse.c:467 + #: src/parse.c:515 msgid "Unknown code to parser" -@@ -275,7 +269,7 @@ - #: src/parse.c:477 +@@ -289,7 +292,7 @@ + #: src/parse.c:525 #, c-format msgid "ParseStack [%d]:\n" -msgstr "" +msgstr "ParseStack [%d]:\n" - #: src/parse.c:481 + #: src/parse.c:529 #, c-format -@@ -284,29 +278,4 @@ +@@ -298,33 +301,4 @@ - #: src/wildexp.c:90 + #: src/wildexp.c:126 msgid "CANNOT FIND '@' FILE!" -msgstr "" +- +-#, fuzzy +-#~ msgid "usage: indent file [-o outfile ] [ options ]\n" +-#~ msgstr "u�ycie: %s plik [-o plik wynikowy ] [ opcje ]\n" - -#~ msgid "Stuff missing from end of file." -#~ msgstr "Brak zawarto�ci patrz�c od ko�cu pliku." ================================================================ Index: packages/indent/indent-po-fix.patch diff -u packages/indent/indent-po-fix.patch:1.1 packages/indent/indent-po-fix.patch:1.2 --- packages/indent/indent-po-fix.patch:1.1 Mon Nov 11 23:34:39 2002 +++ packages/indent/indent-po-fix.patch Sat Nov 13 08:16:35 2010 @@ -9,13 +9,13 @@ "Content-Transfer-Encoding: 8bit\n" #: src/args.c:518 ---- indent-2.2.8a/src/indent.c.orig Tue Apr 23 22:49:24 2002 -+++ indent-2.2.8a/src/indent.c Mon Nov 11 23:22:38 2002 -@@ -2980,6 +2980,7 @@ +--- indent-2.2.10/src/indent.c.orig 2008-03-11 19:50:42.000000000 +0100 ++++ indent-2.2.10/src/indent.c 2010-11-13 07:52:15.271104966 +0100 +@@ -3290,6 +3290,7 @@ exit_values_ty exit_status; - #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) -+ setlocale (LC_CTYPE, ""); - setlocale (LC_MESSAGES, ""); + #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES) ++ setlocale(LC_CTYPE, ""); + setlocale(LC_MESSAGES, ""); #endif - bindtextdomain (PACKAGE, LOCALEDIR); + bindtextdomain(PACKAGE, LOCALEDIR); ================================================================ Index: packages/indent/indent.spec diff -u packages/indent/indent.spec:1.72 packages/indent/indent.spec:1.73 --- packages/indent/indent.spec:1.72 Mon Nov 30 01:58:14 2009 +++ packages/indent/indent.spec Sat Nov 13 08:16:35 2010 @@ -12,23 +12,21 @@ Summary(tr.UTF-8): GNU C girintilendirme programı Summary(uk.UTF-8): Програма GNU для форматування вихідних текстів на C Name: indent -Version: 2.2.9 -Release: 10 -License: GPL +Version: 2.2.10 +Release: 1 +License: GPL v3+ Group: Development/Tools Source0: http://ftp.gnu.org/gnu/indent/%{name}-%{version}.tar.gz -# Source0-md5: dcdbb163bef928306dee2a0cfc581c89 +# Source0-md5: be35ea62705733859fbf8caf816d8959 Patch0: %{name}-info.patch Patch1: %{name}-po-fix.patch Patch2: %{name}-pl.po-update.patch Patch3: %{name}-zh_TW.patch Patch4: %{name}-make-jN.patch -Patch5: %{name}-overflow.patch -Patch6: %{name}-gcc4.patch -URL: http://mysite.freeserve.com/indent/beautify.html -BuildRequires: autoconf +URL: http://www.gnu.org/software/indent/ +BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: gettext-devel +BuildRequires: gettext-devel >= 0.11.5 BuildRequires: perl-Encode BuildRequires: texi2html BuildRequires: texinfo @@ -101,8 +99,6 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 mv -f po/zh_TW{.Big5,}.po @@ -125,17 +121,18 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files -f %{name}.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/* -%{_infodir}/*.info* -%{_mandir}/man1/* +%doc AUTHORS ChangeLog NEWS README +%attr(755,root,root) %{_bindir}/indent +%{_infodir}/indent.info* +%{_mandir}/man1/indent.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -143,6 +140,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.73 2010/11/13 07:16:35 qboosh +- updated to 2.2.10 (GPL v3 now) +- updated po-fix,pl.po-update patches +- removed obsolete overflow,gcc4 patches + Revision 1.72 2009/11/30 00:58:14 sparky - BR: perl-Encode ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/indent/indent-pl.po-update.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/indent/indent-po-fix.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/indent/indent.spec?r1=1.72&r2=1.73&f=u
_______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
