SOURCES: linux_logo-pld.patch, linux_logo-po.patch, linux_logo-quo...
qboosh
qboosh at pld-linux.org
Wed Jul 11 22:26:41 CEST 2007
Author: qboosh Date: Wed Jul 11 20:26:41 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 5.01
---- Files affected:
SOURCES:
linux_logo-pld.patch (1.3 -> 1.4) , linux_logo-po.patch (1.3 -> 1.4) , linux_logo-quote_logo_backslashes.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/linux_logo-pld.patch
diff -u SOURCES/linux_logo-pld.patch:1.3 SOURCES/linux_logo-pld.patch:1.4
--- SOURCES/linux_logo-pld.patch:1.3 Sat Sep 6 14:45:31 2003
+++ SOURCES/linux_logo-pld.patch Wed Jul 11 22:26:36 2007
@@ -1,19 +1,5 @@
-diff -Nur linux_logo-3.9b2.orig/logo_config linux_logo-3.9b2/logo_config
---- linux_logo-3.9b2.orig/logo_config Sun Mar 4 22:55:55 2001
-+++ linux_logo-3.9b2/logo_config Mon Mar 26 20:48:07 2001
-@@ -1,2 +1,9 @@
-+./logos/distributions/pld.logo
- ./logos/banner.logo
- ./logos/classic.logo
-+./logos/distributions/debian.logo
-+./logos/distributions/debian-old.logo
-+./logos/distributions/slackware.logo
-+./logos/distributions/suse.logo
-+./logos/alternate_oses/aix.logo
-+./logos/alternate_oses/irix.logo
-diff -Nur linux_logo-3.9b2.orig/logos/distributions/pld.logo linux_logo-3.9b2/logos/distributions/pld.logo
---- linux_logo-3.9b2.orig/logos/distributions/pld.logo Thu Jan 1 01:00:00 1970
-+++ linux_logo-3.9b2/logos/distributions/pld.logo Mon Mar 26 20:46:50 2001
+--- linux_logo-5.01.orig/logos/distributions/pld.logo Thu Jan 1 01:00:00 1970
++++ linux_logo-5.01/logos/distributions/pld.logo Mon Mar 26 20:46:50 2001
@@ -0,0 +1,39 @@
+# PLD logo by Michal Zawalich <michuz at pld-linux.org>
+
@@ -21,7 +7,7 @@
+SYSINFO_POSITION bottom
+
+DESCRIPTION_STRING PLD Linux banner
-+
++NAME pld
+
+BEGIN_ASCII_LOGO
+ _______ ___ _______
================================================================
Index: SOURCES/linux_logo-po.patch
diff -u SOURCES/linux_logo-po.patch:1.3 SOURCES/linux_logo-po.patch:1.4
--- SOURCES/linux_logo-po.patch:1.3 Sun Feb 5 21:48:32 2006
+++ SOURCES/linux_logo-po.patch Wed Jul 11 22:26:36 2007
@@ -34,17 +34,24 @@
#: ../linux_logo.c:38
msgid "Zero"
---- linux_logo-4.13/po/pl.po.orig 2002-03-12 02:19:18.000000000 +0100
-+++ linux_logo-4.13/po/pl.po 2006-02-05 21:32:18.672178750 +0100
-@@ -4,11 +4,11 @@
+--- linux_logo-5.01/po/pl.po.orig 2002-03-12 02:19:18.000000000 +0100
++++ linux_logo-5.01/po/pl.po 2007-07-11 22:18:37.875301186 +0200
+@@ -1,14 +1,15 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
++# Polish translation for linux_logo.
++# Copyright (C) 2007 Free Software Foundation, Inc.
++# ?
#
msgid ""
msgstr ""
-"Project-Id-Version: 4.01\n"
-"POT-Creation-Date: 2002-02-19 00:50+0100\n"
-"PO-Revision-Date: 2002-02-18 19:14GMT\n"
-+"Project-Id-Version: 4.13\n"
-+"POT-Creation-Date: 2006-02-05 21:12+0100\n"
++"Project-Id-Version: linux_logo 5.01\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2007-07-11 22:11+0200\n"
+"PO-Revision-Date: 2006-02-05 21:30+0100\n"
"Last-Translator: Patryk ¦ciborek <scibi at inetia.pl>\n"
-"Language-Team: Polski <pl at li.org>\n"
@@ -52,7 +59,121 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-@@ -93,5 +93,14 @@
+@@ -16,60 +17,85 @@
+ "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+ "|| n%100>=20) ? 1 : 2;\n"
+
+-#: ../linux_logo.c:53
++#: ../linux_logo.c:59
+ msgid "Zero"
+ msgstr "Zero"
+
+-#: ../linux_logo.c:54
++#: ../linux_logo.c:60
+ msgid "One"
+ msgstr "Jeden"
+
+-#: ../linux_logo.c:55
++#: ../linux_logo.c:61
+ msgid "Two"
+ msgstr "Dwa"
+
+-#: ../linux_logo.c:56
++#: ../linux_logo.c:62
+ msgid "Three"
+ msgstr "Trzy"
+
+-#: ../linux_logo.c:57
++#: ../linux_logo.c:63
+ msgid "Four"
+ msgstr "Cztery"
+
+-#: ../linux_logo.c:58
++#: ../linux_logo.c:64
+ msgid "Five"
+ msgstr "Piêæ"
+
+-#: ../linux_logo.c:59
++#: ../linux_logo.c:65
+ msgid "Six"
+ msgstr "Sze¶æ"
+
+-#: ../linux_logo.c:60
++#: ../linux_logo.c:66
+ msgid "Seven"
+ msgstr "Siedem"
+
+-#: ../linux_logo.c:61
++#: ../linux_logo.c:67
+ msgid "Eight"
+ msgstr "Osiem"
+
+-#: ../linux_logo.c:62
++#: ../linux_logo.c:68
+ msgid "Nine"
+ msgstr "Dziewiêæ"
+
+-#: ../linux_logo.c:63
++#: ../linux_logo.c:69
+ msgid "Many"
+ msgstr "Wiele"
+
+-#: ../linux_logo.c:416
+-#msgid "Processor"
+-#msgid_plural "Processors"
+-#msgstr[0] "procesor"
+-#msgstr[1] "procesory"
+-#msgstr[2] "procesorów"
++#: ../linux_logo.c:179
++msgid "Uptime "
++msgstr "Dzia³a "
++
++#: ../linux_logo.c:183
++msgid "day"
++msgstr "dzieñ"
++
++#: ../linux_logo.c:183
++msgid "days"
++msgstr "dni"
++
++#: ../linux_logo.c:189
++msgid "hour"
++msgstr "godzinê"
++
++#: ../linux_logo.c:189
++msgid "hours"
++msgstr "godziny"
++
++#: ../linux_logo.c:194
++msgid "minute"
++msgstr "minutê"
++
++#: ../linux_logo.c:194
++msgid "minutes"
++msgstr "minut"
++
++#: ../linux_logo.c:316
++msgid "Load Average"
++msgstr "¦rednie obci±¿enie"
+
+-#. This is the default format of the output file. See the README for more *\
++#. This is the default format of the output file. See the README for more *
+ #. \* information on how to configure this option.
+-#: ../defaults.h:13
++#: ../defaults.h:8
+ msgid ""
+ "#O Version #V, Compiled #C\n"
+ "#N #M #X #T #P, #R RAM, #B Bogomips Total\n"
+@@ -79,7 +105,7 @@
+ "#N #P #X #T #M, #R RAM, ³±cznie #B bogomips\n"
+ "#H\n"
+
+-#: ../defaults.h:14
++#: ../defaults.h:9
+ msgid ""
+ "#O Version #V\n"
+ "Compiled #C\n"
+@@ -93,5 +119,14 @@
"³±cznie #B bogomips\n"
"#H\n"
@@ -60,22 +181,11 @@
+#. be made by adding a string to the end. Hopefully this can fix it for
+#. most languages. If they require significant word-order changes then
+#. we'll have even more problems
-+#: ../defaults.h:19
++#: ../defaults.h:14
+msgid "Processor"
+msgstr "procesor"
+
-+#: ../defaults.h:20
++#: ../defaults.h:15
msgid "Processors"
-msgstr "Procesory"
+msgstr "procesory"
---- linux_logo-4.13/linux_logo.c.orig 2006-02-05 21:32:44.005762000 +0100
-+++ linux_logo-4.13/linux_logo.c 2006-02-05 21:50:07.242960250 +0100
-@@ -619,7 +619,7 @@
- /* i18n */
- setlocale(LC_ALL, "");
- textdomain("linux_logo");
-- bindtextdomain("linux_logo", "/usr/lib/locale");
-+ bindtextdomain("linux_logo", "/usr/share/locale");
- #endif
- /* Set some defaults */
- setup_info(&settings);
================================================================
Index: SOURCES/linux_logo-quote_logo_backslashes.patch
diff -u SOURCES/linux_logo-quote_logo_backslashes.patch:1.2 SOURCES/linux_logo-quote_logo_backslashes.patch:1.3
--- SOURCES/linux_logo-quote_logo_backslashes.patch:1.2 Sat Aug 24 20:53:49 2002
+++ SOURCES/linux_logo-quote_logo_backslashes.patch Wed Jul 11 22:26:36 2007
@@ -8,72 +8,63 @@
int center_sysinfo;
char *user_text;
char *format;
---- linux_logo-4.04/linux_logo.c.orig Fri Aug 9 18:50:49 2002
-+++ linux_logo-4.04/linux_logo.c Sat Aug 24 20:43:50 2002
-@@ -196,6 +196,7 @@
- settings->display_sysinfo_only=0;
- settings->display_usertext=0;
- settings->custom_format=0;
-+ settings->quote_logo_backslashes=0; /* Defaults to No */
- settings->center_sysinfo=1;
- settings->user_text = NULL; /* Change this and display_usertext to *\
- \* have a default message */
-@@ -236,12 +237,14 @@
-
-
-
--char *print_line(char *string)
-+char *print_line(char *string, struct linux_logo_info_type *settings)
- {
-
- char *temp_st=string;
-
- while ((*temp_st!='\n') && (*temp_st!='\0')) {
-+ if('\\' == *temp_st && settings->quote_logo_backslashes)
-+ putchar('\\');
- putchar(*temp_st);
- temp_st++;
- }
-@@ -533,7 +536,7 @@
- if (settings->banner_mode) { /* Banner mode */
- for(i=0;i<ysize;i++) {
- shift_right((settings->width-80)/2,settings->plain_ascii);
-- string_point=print_line(string_point);
-+ string_point=print_line(string_point, settings);
- printf("\n");
- }
- if (!settings->display_logo_only) printf("\n");
-@@ -550,14 +553,14 @@
-
- for(i=0;i<7;i++) {
- shift_right(settings->offset,settings->plain_ascii);
-- string_point=print_line(string_point);
-+ string_point=print_line(string_point, settings);
- printf("\n");
- }
-
- /* The next lines can have cpuinfo after them */
- for(i=7;i<ysize;i++) {
- shift_right(settings->offset,settings->plain_ascii);
-- string_point=print_line(string_point);
-+ string_point=print_line(string_point, settings);
- shift_right(2,settings->plain_ascii);
- if (print_sysinfo(i-7,temp_string,settings)!=1) {
- if (!settings->plain_ascii) ansi_print("^[[1;37;40m");
-@@ -737,7 +740,7 @@
- /*******************************************************/
-
- while ((c = getopt (*custom_argc, custom_argv,"D:F:L:"
-- "a::b::c::de:fghiklno:pst:uvw:y"))!=-1) {
-+ "a::b::c::de:fghiklno:pqst:uvw:y"))!=-1) {
- switch (c) {
- case 'a': settings.plain_ascii=1; break;
- case 'b': settings.banner_mode=1; break;
-@@ -813,6 +816,7 @@
- if ( endptr == optarg ) help_message(argv[0], 1);
- break;
- case 'p': settings.preserve_xy=1; break;
-+ case 'q': settings.quote_logo_backslashes=1; break;
- case 's': settings.skip_bogomips=1; break;
- case 't':
- settings.display_usertext=1;
+--- linux_logo-5.01/linux_logo.c.orig 2007-07-09 18:34:18.000000000 +0200
++++ linux_logo-5.01/linux_logo.c 2007-07-11 21:56:07.894370157 +0200
+@@ -102,6 +102,7 @@
+ settings->display_sysinfo_only=0;
+ settings->display_usertext=0;
+ settings->custom_format=0;
++ settings->quote_logo_backslashes=0;
+ settings->center_sysinfo=1;
+ settings->user_text[0]=0;
+ settings->format[0]=0;
+@@ -125,11 +126,13 @@
+ }
+
+ /* Prints a string, but stops at a newline or end of string */
+-static char *print_line(char *string) {
++static char *print_line(char *string, struct linux_logo_info_type *settings) {
+
+ char *temp_st=string;
+
+ while ((*temp_st!='\n') && (*temp_st!='\0')) {
++ if('\\' == *temp_st && settings->quote_logo_backslashes)
++ putchar('\\');
+ putchar(*temp_st);
+ temp_st++;
+ }
+@@ -516,7 +519,7 @@
+ if (settings->banner_mode) { /* Banner mode */
+ for(i=0;i<ysize;i++) {
+ shift_right((settings->width-80)/2,settings->plain_ascii);
+- string_point=print_line(string_point);
++ string_point=print_line(string_point, settings);
+ printf("\n");
+ }
+ if (!settings->display_logo_only) printf("\n");
+@@ -533,14 +536,14 @@
+
+ for(i=0;i<7;i++) {
+ shift_right(settings->offset,settings->plain_ascii);
+- string_point=print_line(string_point);
++ string_point=print_line(string_point, settings);
+ printf("\n");
+ }
+
+ /* The next lines can have cpuinfo after them */
+ for(i=7;i<ysize;i++) {
+ shift_right(settings->offset,settings->plain_ascii);
+- string_point=print_line(string_point);
++ string_point=print_line(string_point, settings);
+ shift_right(2,settings->plain_ascii);
+ if (i-7<sysinfo_length) {
+ if (!settings->plain_ascii) printf("\033[1;37;40m");
+@@ -862,6 +865,8 @@
+ break;
+ case 'p': settings->preserve_xy=1;
+ break;
++ case 'q': settings->quote_logo_backslashes=1;
++ break;
+ case 's': settings->skip_bogomips=1;
+ break;
+ case 't': argument=get_arg(&index,argc,argv);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux_logo-pld.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/linux_logo-po.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/linux_logo-quote_logo_backslashes.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list