openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2010
- 1 participants
- 1023 discussions
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at Fri Nov 26 17:12:34 CET 2010.
--------
--- yast2-network/yast2-network.changes 2010-11-16 11:34:46.000000000 +0100
+++ yast2-network/yast2-network.changes 2010-11-26 14:15:42.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 26 14:09:27 CET 2010 - mzugec(a)suse.cz
+
+- added search keywords (bnc#641922)
+- 2.20.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-network-2.20.4.tar.bz2
New:
----
yast2-network-2.20.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.muyMdM/_old 2010-11-26 17:02:42.000000000 +0100
+++ /var/tmp/diff_new_pack.muyMdM/_new 2010-11-26 17:02:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.20.4)
+# spec file for package yast2-network (Version 2.20.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-network
-Version: 2.20.4
+Version: 2.20.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.20.4.tar.bz2
+Source0: yast2-network-2.20.5.tar.bz2
Prefix: /usr
@@ -73,7 +73,7 @@
This package contains autogenerated documentation for yast2-network
%prep
-%setup -n yast2-network-2.20.4
+%setup -n yast2-network-2.20.5
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-network-2.20.4.tar.bz2 -> yast2-network-2.20.5.tar.bz2 ++++++
++++ 10731 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.4/VERSION new/yast2-network-2.20.5/VERSION
--- old/yast2-network-2.20.4/VERSION 2010-11-16 11:13:09.000000000 +0100
+++ new/yast2-network-2.20.5/VERSION 2010-11-26 14:09:19.000000000 +0100
@@ -1 +1 @@
-2.20.4
+2.20.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.4/configure.in new/yast2-network-2.20.5/configure.in
--- old/yast2-network-2.20.4/configure.in 2010-09-17 10:18:04.000000000 +0200
+++ new/yast2-network-2.20.5/configure.in 2010-02-09 15:48:20.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.19.37, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.19.10, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.19.37"
+VERSION="2.19.10"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.4/src/config/dsl.desktop new/yast2-network-2.20.5/src/config/dsl.desktop
--- old/yast2-network-2.20.4/src/config/dsl.desktop 2010-09-17 10:15:12.000000000 +0200
+++ new/yast2-network-2.20.5/src/config/dsl.desktop 2010-11-26 14:07:53.000000000 +0100
@@ -22,3 +22,4 @@
Name=DSL
GenericName=Configure a DSL connection
StartupNotify=true
+X-SuSE-YaST-Keywords=dsl,vpn,pptp,pppoe,network
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-network-2.20.4/src/config/lan.desktop new/yast2-network-2.20.5/src/config/lan.desktop
--- old/yast2-network-2.20.4/src/config/lan.desktop 2010-09-17 10:15:12.000000000 +0200
+++ new/yast2-network-2.20.5/src/config/lan.desktop 2010-11-26 14:09:09.000000000 +0100
@@ -24,3 +24,4 @@
Name=Network Settings
GenericName=Configure network cards, hostname and routing
StartupNotify=true
+X-SuSE-YaST-Keywords=network,lan,dns,routing
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package opensuse-manuals_en for openSUSE:Factory
checked in at Fri Nov 26 17:10:12 CET 2010.
--------
--- opensuse-manuals_en/opensuse-manuals_en.changes 2010-11-15 16:04:50.000000000 +0100
+++ opensuse-manuals_en/opensuse-manuals_en.changes 2010-11-26 11:39:21.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Nov 26 10:38:09 UTC 2010 - ke(a)suse.de
+
+- Update text and image files.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_en.spec ++++++
--- /var/tmp/diff_new_pack.mvbgDW/_old 2010-11-26 17:07:44.000000000 +0100
+++ /var/tmp/diff_new_pack.mvbgDW/_new 2010-11-26 17:07:44.000000000 +0100
@@ -22,7 +22,7 @@
%define my_lang en
%define my_book opensuse-html
Version: 11.3
-Release: 8
+Release: 9
Provides: locale(desktop-data-openSUSE:en)
Obsoletes: opensuse-manual_en < 11.2 opensuse-kdequick_en < 11.1 opensuse-gnomequick_en < 11.1 opensuse-gnomeuser_en < 11.1 opensuse-kdeuser_en < 11. opensuse-kde3user_en < 11.1 apparmor-admin_en < 11.1
Provides: opensuse-manual_en = %{version}-%{release} opensuse-kdequick_en = %{version}-%{release} opensuse-gnomequick_en = %{version}-%{release} opensuse-gnomeuser_en = %{version}-%{release} opensuse-kdeuser_en = %{version}-%{release} opensuse-kde3user_en = %{version}-%{release} apparmor-admin_en = %{version}-%{release}
@@ -219,7 +219,7 @@
A quick start guide to AppArmor, a security software.
%package -n opensuse-security_en-pdf
-Group: Documentation/SuSE
+Group: Documentation/SUSE
License: GFDLv1.2
Summary: openSUSE manual: Security Guide (PDF, English)
#Provides: locale(desktop-data-openSUSE:en)
++++++ opensuse-apparmor-quick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-apparmor-quick_en.pdf ++++++
(binary differes)
++++++ opensuse-apps_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-apps_en.pdf ++++++
(binary differes)
++++++ opensuse-gnomequick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-gnomequick_en.pdf ++++++
(binary differes)
++++++ opensuse-gnomeuser_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-gnomeuser_en.pdf ++++++
(binary differes)
++++++ opensuse-html_en-desktop.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/art_aaquick.desktop new/desktop/art_aaquick.desktop
--- old/desktop/art_aaquick.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/art_aaquick.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=AppArmor Modes
+Name[en]=AppArmor Modes
+Comment=AppArmor Modes
+Comment[en]=AppArmor Modes
+DocPath=@PATH@/sec.aaquick.modes.html
+Icon=document2
+X-DOC-Weight=8790
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/bk07ar04s11.desktop new/desktop/bk07ar04s11.desktop
--- old/desktop/bk07ar04s11.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/bk07ar04s11.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=For More Information
+Name[en]=For More Information
+Comment=For More Information
+Comment[en]=For More Information
+DocPath=@PATH@/bk07ar04s11.html
+Icon=document2
+X-DOC-Weight=8890
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/bk07ar04s12.desktop new/desktop/bk07ar04s12.desktop
--- old/desktop/bk07ar04s12.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/bk07ar04s12.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Legal Notice
+Name[en]=Legal Notice
+Comment=Legal Notice
+Comment[en]=Legal Notice
+DocPath=@PATH@/bk07ar04s12.html
+Icon=document2
+X-DOC-Weight=8900
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/bk07ar04s13.desktop new/desktop/bk07ar04s13.desktop
--- old/desktop/bk07ar04s13.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/bk07ar04s13.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=GNU Free Documentation License
+Name[en]=GNU Free Documentation License
+Comment=GNU Free Documentation License
+Comment[en]=GNU Free Documentation License
+DocPath=@PATH@/bk07ar04s13.html
+Icon=document2
+X-DOC-Weight=8910
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_audit.desktop new/desktop/sec_aaquick_audit.desktop
--- old/desktop/sec_aaquick_audit.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_audit.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Logging and Auditing
+Name[en]=Logging and Auditing
+Comment=Logging and Auditing
+Comment[en]=Logging and Auditing
+DocPath=@PATH@/sec.aaquick.audit.html
+Icon=document2
+X-DOC-Weight=8870
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_cmdline.desktop new/desktop/sec_aaquick_cmdline.desktop
--- old/desktop/sec_aaquick_cmdline.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_cmdline.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=AppArmor Command Line Tools
+Name[en]=AppArmor Command Line Tools
+Comment=AppArmor Command Line Tools
+Comment[en]=AppArmor Command Line Tools
+DocPath=@PATH@/sec.aaquick.cmdline.html
+Icon=document2
+X-DOC-Weight=8810
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_directories_files.desktop new/desktop/sec_aaquick_directories_files.desktop
--- old/desktop/sec_aaquick_directories_files.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_directories_files.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Directories and Files
+Name[en]=Directories and Files
+Comment=Directories and Files
+Comment[en]=Directories and Files
+DocPath=@PATH@/sec.aaquick.directories_files.html
+Icon=document2
+X-DOC-Weight=8880
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_example.desktop new/desktop/sec_aaquick_example.desktop
--- old/desktop/sec_aaquick_example.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_example.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Example Profile
+Name[en]=Example Profile
+Comment=Example Profile
+Comment[en]=Example Profile
+DocPath=@PATH@/sec.aaquick.example.html
+Icon=document2
+X-DOC-Weight=8840
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_learning_mode.desktop new/desktop/sec_aaquick_learning_mode.desktop
--- old/desktop/sec_aaquick_learning_mode.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_learning_mode.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Learning Mode
+Name[en]=Learning Mode
+Comment=Learning Mode
+Comment[en]=Learning Mode
+DocPath=@PATH@/sec.aaquick.learning_mode.html
+Icon=document2
+X-DOC-Weight=8830
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_methods.desktop new/desktop/sec_aaquick_methods.desktop
--- old/desktop/sec_aaquick_methods.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_methods.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Methods of Profiling
+Name[en]=Methods of Profiling
+Comment=Methods of Profiling
+Comment[en]=Methods of Profiling
+DocPath=@PATH@/sec.aaquick.methods.html
+Icon=document2
+X-DOC-Weight=8820
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_pam_apparmor.desktop new/desktop/sec_aaquick_pam_apparmor.desktop
--- old/desktop/sec_aaquick_pam_apparmor.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_pam_apparmor.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Confining Users with pam_apparmor
+Name[en]=Confining Users with pam_apparmor
+Comment=Confining Users with pam_apparmor
+Comment[en]=Confining Users with pam_apparmor
+DocPath=@PATH@/sec.aaquick.pam_apparmor.html
+Icon=document2
+X-DOC-Weight=8860
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_profile_structure.desktop new/desktop/sec_aaquick_profile_structure.desktop
--- old/desktop/sec_aaquick_profile_structure.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_profile_structure.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Structure of a Profile
+Name[en]=Structure of a Profile
+Comment=Structure of a Profile
+Comment[en]=Structure of a Profile
+DocPath=@PATH@/sec.aaquick.profile_structure.html
+Icon=document2
+X-DOC-Weight=8850
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/desktop/sec_aaquick_startstop.desktop new/desktop/sec_aaquick_startstop.desktop
--- old/desktop/sec_aaquick_startstop.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/desktop/sec_aaquick_startstop.desktop 2010-11-18 14:24:24.000000000 +0100
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Starting and Stopping AppArmor
+Name[en]=Starting and Stopping AppArmor
+Comment=Starting and Stopping AppArmor
+Comment[en]=Starting and Stopping AppArmor
+DocPath=@PATH@/sec.aaquick.startstop.html
+Icon=document2
+X-DOC-Weight=8800
\ No newline at end of file
++++++ opensuse-html_en-graphics.tar.bz2 ++++++
opensuse-manuals_en/opensuse-html_en-graphics.tar.bz2 opensuse-manuals_en/opensuse-html_en-graphics.tar.bz2 differ: char 11, line 1
++++++ opensuse-html_en-html.tar.bz2 ++++++
opensuse-manuals_en/opensuse-html_en-html.tar.bz2 opensuse-manuals_en/opensuse-html_en-html.tar.bz2 differ: char 11, line 1
++++++ opensuse-html_en.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/1_click_install_i.xml new/xml/1_click_install_i.xml
--- old/xml/1_click_install_i.xml 2010-11-15 03:41:06.000000000 +0100
+++ new/xml/1_click_install_i.xml 2010-11-26 11:24:56.000000000 +0100
@@ -89,7 +89,7 @@
<step performance="required">
<para>
The <guimenu>Proposal</guimenu> screen summarizes the choices you made.
- Click <guimenu>Customise</guimenu> to restart the configuration steps
+ Click <guimenu>Customize</guimenu> to restart the configuration steps
from above. Click <guimenu>Next</guimenu> and <guimenu>Yes</guimenu> to
proceed with the installation.
</para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apparmor_profiles.xml new/xml/apparmor_profiles.xml
--- old/xml/apparmor_profiles.xml 2010-11-15 03:41:07.000000000 +0100
+++ new/xml/apparmor_profiles.xml 2010-11-26 11:24:58.000000000 +0100
@@ -1682,7 +1682,7 @@
a capability rule allowing that capability.
</para>
-<screen>set capabilty cap_chown,</screen>
+<screen>set capability cap_chown,</screen>
<note>
<para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_banshee.xml new/xml/apps_banshee.xml
--- old/xml/apps_banshee.xml 2010-11-15 03:41:08.000000000 +0100
+++ new/xml/apps_banshee.xml 2010-11-26 11:24:58.000000000 +0100
@@ -26,7 +26,7 @@
</para>
<para>
The first time you open &musicplayer;, the <guimenu>Musik
- Library</guimenu> window opens ready to import music and videos, or add
+ Library</guimenu> window opens ready to import music and videos, or to add
Internet radio stations.
</para>
<figure id="fig.banshee.media.player">
@@ -56,7 +56,7 @@
<para>
&musicplayer; also comes with MP3 support. If your music collection
- consists of both MP3 and Ogg Vorbis files, you need not convert any files
+ consists of both MP3 and Ogg Vorbis files, you do not need to convert any files
to a different format. Just open &musicplayer; and start listening.
</para>
@@ -373,7 +373,7 @@
If you want to set all fields in a group to the same value, select
multiple songs in a playlist and click <menuchoice>
<guimenu>Edit</guimenu> <guimenu>Edit Track Information</guimenu>
- </menuchoice>. Make the changes you want, then click <guimenu>Snyc all
+ </menuchoice>. Make the changes you want, then click <guimenu>Sync all
field values</guimenu>. You can also use the <guimenu>Back</guimenu> and
<guimenu>Forward</guimenu> buttons to cycle through the selected songs.
</para>
@@ -606,7 +606,7 @@
</para>
<para>
- Before you can share your music, you need to enable the Srobbler plug-in
+ Before you can share your music, you need to enable the Scrobbler plug-in
and enable song reporting.
</para>
@@ -699,7 +699,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Miscellaneus</term>
+ <term>Miscellaneous</term>
<listitem>
<para>
Disable features requiring Internet access.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_digicam.xml new/xml/apps_digicam.xml
--- old/xml/apps_digicam.xml 2010-11-15 03:41:08.000000000 +0100
+++ new/xml/apps_digicam.xml 2010-11-26 11:24:59.000000000 +0100
@@ -207,7 +207,7 @@
few. Some new computers have a card reader on board with different
slots, to support all these formats. If you do not want to deal with
cables, protocols, or drivers, select this option, as it simplifies a
- lot. Normally, card readers are detected as removeable devices and are
+ lot. Normally, card readers are detected as removable devices and are
automatically mounted in KDE.
</para>
</formalpara>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_evolution.xml new/xml/apps_evolution.xml
--- old/xml/apps_evolution.xml 2010-11-15 03:41:08.000000000 +0100
+++ new/xml/apps_evolution.xml 2010-11-26 11:24:59.000000000 +0100
@@ -1015,8 +1015,8 @@
<para>
The message list displays a list of emails that you have received. The
- radio button above the list lets you view mesasages according to
- predifened and custom labels. To view an email in the preview pane, click
+ radio button above the list lets you view messages according to
+ predefined and custom labels. To view an email in the preview pane, click
the email in the email list.
</para>
@@ -1281,7 +1281,7 @@
The message list displays all the emails that you have. This includes
all your read and unread messages and email that is flagged to be
deleted. With the Show radio button above the message you can filter the
- message list view using several predifned and custom labels.
+ message list view using several predefined and custom labels.
</para>
<bridgehead>Preview Pane</bridgehead>
<para>
@@ -1382,7 +1382,7 @@
</para>
<simplelist>
- <member><emphasis>Offical project homepage</emphasis>: <ulink url="http://projects.gnome.org/evolution/"/>
+ <member><emphasis>Official project homepage</emphasis>: <ulink url="http://projects.gnome.org/evolution/"/>
</member>
<member><emphasis>Wiki reference</emphasis>: <ulink url="http://www.go-evolution.org/Main_Page"/>
</member>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_gimp.xml new/xml/apps_gimp.xml
--- old/xml/apps_gimp.xml 2010-11-15 03:41:08.000000000 +0100
+++ new/xml/apps_gimp.xml 2010-11-26 11:24:59.000000000 +0100
@@ -62,9 +62,9 @@
<para>
There are two main types of graphics—raster and vector. GIMP is
intended for working with raster graphics, which is the normal format for
- digital photographs or scanned images. Raster image is a collection of
+ digital photographs or scanned images. A raster image is a collection of
pixels—small blocks of color that together create the entire image.
- High resolution images contain large number of pixels and image files can
+ High resolution images contain a large number of pixels and image files can
easily become quite large because of this. It is also not possible to
increase the size of a pixel image without losing quality. GIMP supports
all the common formats of raster graphics, like JPEG, PNG, GIF, BMP,
@@ -76,7 +76,7 @@
Unlike raster graphics, vector graphics do not store information for all
individual pixels. Instead, it uses geometrical primitives such as
points, lines, curves, and polygons. Vector images can be scaled very
- easily and image files can be smaller. The disadvanage of vector graphics
+ easily and image files can be smaller. The disadvantage of vector graphics
is that it is not good at representing complex images with many different
colors such as photographs. There are many specialized applications for
vector graphics, for example Inkscape. GIMP has only a very limited
@@ -113,7 +113,7 @@
the main GIMP menu, and a window containing several docked dialogs. They
can be arranged on the screen and, except the toolbox and the last image
window, closed if no longer needed. Closing the toolbox or the last
- image window open closes the application. In the default configuration,
+ image window closes the application. In the default configuration,
GIMP saves your window layout when you exit. Dialogs left open reappear
when you next start the program.
</para>
@@ -641,7 +641,7 @@
<para>
This tools selects a continuous region based on color similarities.
Set the maximum difference between colors in the tool options dialog
- in <guimenu>Threshold</guimenu>. By default, the selction is based
+ in <guimenu>Threshold</guimenu>. By default, the selection is based
only on the active layer. To base the selection on all visible
layers, check <guimenu>Sample merged</guimenu>.
</para>
@@ -975,7 +975,7 @@
</indexterm>
<para>
Layers are a very important aspect of GIMP. By drawing parts of your
- image on separate layers, change, move, or delete those parts without
+ image on separate layers, you can change, move, or delete those parts without
damaging the rest of the image. To understand how layers work, imagine
an image created from a stack of transparent sheets. Different parts of
the image are drawn on different sheets. The stack can be rearranged,
@@ -1113,7 +1113,7 @@
</listitem>
<listitem>
<para>
- Printed books about GIMP are published regularly. You will find
+ Printed books about GIMP are published regularly. You will find a
selection of the best ones with short annotations at
<ulink url="http://gimp.org/books/"/>.
</para>
@@ -1121,7 +1121,7 @@
<listitem>
<para>
GIMP functionality can be extended with scripts and plug-ins. Many such
- scripts and plug-ins are distributed in GIMP package, but other can be
+ scripts and plug-ins are distributed in the GIMP package, but others can be
downloaded from the Internet. At
<ulink url="http://registry.gimp.org/"/>, you will find a database of
GIMP scripts and plug-ins.
@@ -1152,9 +1152,9 @@
<para>
There is a whole IRC network dedicated to GIMP and GNOME desktop
environment—GIMPNet. You can connect to GIMPNet with your
- favourite IRC client by pointing it at irc.gimp.org server. The
+ favorite IRC client by pointing it at the irc.gimp.org server. The
#gimp-users channel is the right place to ask question about using
- GIMP. If you want to listen to developer's discussion, join the #gimp
+ GIMP. If you want to listen to developer's discussions, join the #gimp
channel.
</para>
</listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_k3b.xml new/xml/apps_k3b.xml
--- old/xml/apps_k3b.xml 2010-11-15 03:41:09.000000000 +0100
+++ new/xml/apps_k3b.xml 2010-11-26 11:24:59.000000000 +0100
@@ -220,7 +220,7 @@
To add CD text information to your audio tracks, select the track first.
Right-click and select <guimenu>Properties</guimenu> and enter your
information in the window that opens. You can also download track
- information from the Internet by clicking <guimenu>Query Cddb</guimenu>.
+ information from the Internet by clicking <guimenu>Query CDDB</guimenu>.
</para>
</sect1>
<sect1 id="sec.k3b.copying">
@@ -400,7 +400,7 @@
<para>
Apart from the functions described above, K3b offers other functions,
such as ripping music from audio CDs, rewriting CDs, and more. You can
- find more informations about K3b at <ulink url="http://k3b.org/"/>.
+ find more information about K3b at <ulink url="http://k3b.org/"/>.
</para>
<indexterm class="endofrange" startref="idx.k3b.burning"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_kontact.xml new/xml/apps_kontact.xml
--- old/xml/apps_kontact.xml 2010-11-15 03:41:09.000000000 +0100
+++ new/xml/apps_kontact.xml 2010-11-26 11:25:00.000000000 +0100
@@ -374,7 +374,7 @@
</step>
<step performance="required">
<para>
- Enter your account name (can be freely choosen), the incoming mail
+ Enter your account name (can be freely chosen), the incoming mail
server, login and password.
</para>
</step>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_linwin.xml new/xml/apps_linwin.xml
--- old/xml/apps_linwin.xml 2010-11-15 03:41:09.000000000 +0100
+++ new/xml/apps_linwin.xml 2010-11-26 11:25:00.000000000 +0100
@@ -925,7 +925,7 @@
sound quality and with end-to-end encryption. When using Skype,
configuring the firewall or router is not necessary. For more
details, see <ulink url="http://www.skype.com/"/>. Information on
- Skype and openSUSE is avaiable from
+ Skype and openSUSE is available from
<ulink url="http://en.opensuse.org/Skype_HOWTO"/>.
</para>
</listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_openoffice.xml new/xml/apps_openoffice.xml
--- old/xml/apps_openoffice.xml 2010-11-15 03:41:09.000000000 +0100
+++ new/xml/apps_openoffice.xml 2010-11-26 11:25:00.000000000 +0100
@@ -288,7 +288,7 @@
them in an open format such as RTF for text documents. In case of
migration problems with spreadsheets however, it is advisable to re-save
them as Excel files and use this as intermediate format (with CSV format
- you would lose all cell formatting and CVS sometimes leads to incorrect
+ you would lose all cell formatting and CSV sometimes leads to incorrect
cell type detection for spreadsheets).
</para>
@@ -585,7 +585,7 @@
<para>
If you want to switch back to the original settings again, open the
- customization dialog, click the <guimenu>Toolbar</guimenu>drop-down list
+ customization dialog, click the <guimenu>Toolbar</guimenu> drop-down list
and select <guimenu>Restore Default Settings</guimenu>. Click
<guimenu>Yes</guimenu> and <guimenu>Reset</guimenu> to proceed.
</para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_sound.xml new/xml/apps_sound.xml
--- old/xml/apps_sound.xml 2010-11-15 03:41:09.000000000 +0100
+++ new/xml/apps_sound.xml 2010-11-26 11:25:00.000000000 +0100
@@ -26,7 +26,7 @@
Linux includes a wide range of sound and multimedia applications. Some of
these applications are installed on your Linux system by default. With
the applications described here you can control the volume and balance of
- playback and play CDs, music and movie files.<phrase os="osuse">You
+ playback and play CDs, music and movie files. <phrase os="osuse">You
can also record and compress your own audio data.</phrase>
</para>
@@ -116,7 +116,7 @@
<note os="osuse">
<title>Playing MP3 Files</title>
<para>
- &opensuse; currently does not benefit from an MP3 codec agreement.
+ &opensuse; currently does not benefit from a MP3 codec agreement.
However, community support for MP3 and alternatives is strong. For more
information and any options that might work for you legally and
technically, refer to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_tomboy.xml new/xml/apps_tomboy.xml
--- old/xml/apps_tomboy.xml 2010-11-15 03:41:09.000000000 +0100
+++ new/xml/apps_tomboy.xml 2010-11-26 11:25:01.000000000 +0100
@@ -455,7 +455,7 @@
</listitem>
<listitem>
<para>
- Write a line of text immediatelly after the automatically created
+ Write a line of text immediately after the automatically created
bullet, then press <keycap>Enter</keycap>.
</para>
</listitem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/apps_totem.xml new/xml/apps_totem.xml
--- old/xml/apps_totem.xml 2010-11-15 03:41:10.000000000 +0100
+++ new/xml/apps_totem.xml 2010-11-26 11:25:01.000000000 +0100
@@ -335,7 +335,7 @@
<guimenu>View</guimenu> <guimenu>Show Controls</guimenu> </menuchoice>
and deselect the Show Controls option. To show the controls on the Totem
Movie Player window, right-click the window, then select <guimenu>Show
- Controls</guimenu>.If the Show Controls option is selected, Totem Movie
+ Controls</guimenu>. If the Show Controls option is selected, Totem Movie
Player shows the menubar, time elapsed slider, seek control buttons,
volume slider, and statusbar on the window. If the Show Controls option
is not selected, the application hides these controls and shows only the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/art_apparmor_quick.xml new/xml/art_apparmor_quick.xml
--- old/xml/art_apparmor_quick.xml 2010-11-15 03:41:10.000000000 +0100
+++ new/xml/art_apparmor_quick.xml 2010-11-26 11:25:01.000000000 +0100
@@ -180,7 +180,7 @@
<term>unconfined</term>
<listitem>
<para>
- Output a list of processes with open tcp or udp ports that do not have
+ Output a list of processes with open TCP or UDP ports that do not have
&aa; profiles loaded.
</para>
</listitem>
@@ -588,7 +588,7 @@
<title>Rules: Owner Conditional Rules</title>
<para>
The file rules can be extended so that they can be conditional upon the
- the user being the owner of the file. by prepending the keyword
+ the user being the owner of the file, by prepending the keyword
<literal>owner</literal> to the rule. Owner conditional rules accumulate
just as regular file rules and are considered a subset of regular file
rules. If a regular file rule overlaps with an owner conditional file
@@ -932,7 +932,7 @@
processes root privileges, it should be used with extreme caution and
only in exceptional cases.
</para>
-<screen>set capabilty cap_chown,</screen>
+<screen>set capability cap_chown,</screen>
</sect2>
<sect2 id="sec.aaquick.profile_structure.hats">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/gnome_accessibility.xml new/xml/gnome_accessibility.xml
--- old/xml/gnome_accessibility.xml 2010-11-15 03:41:13.000000000 +0100
+++ new/xml/gnome_accessibility.xml 2010-11-26 11:25:06.000000000 +0100
@@ -288,7 +288,7 @@
<sect3 id="mouse.speed">
<title>Mouse Speed and Sensitivity</title>
<para>
- If you have dificulties with the behaviour of the pointer, you can
+ If you have difficulties with the behavior of the pointer, you can
change the speed and sensitivity of the pointer. To configure the speed
and sensitivity of the pointer, select <menuchoice>
<guimenu>System</guimenu> <guimenu> Control Center</guimenu>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/gnome_crypto.xml new/xml/gnome_crypto.xml
--- old/xml/gnome_crypto.xml 2010-11-15 03:41:13.000000000 +0100
+++ new/xml/gnome_crypto.xml 2010-11-26 11:25:06.000000000 +0100
@@ -19,7 +19,7 @@
cache your passphrase, and encrypt and decrypt the clipboard.
</para>
<figure pgwide="0">
- <title>Password and Encryption Keys Main Window</title>
+ <title>Passwords and Encryption Keys Main Window</title>
<mediaobject>
<imageobject role="fo">
<imagedata fileref="seahorse_main.png" width="73%" format="PNG"/>
@@ -61,7 +61,7 @@
To exchange encrypted messages with other users, you must first generate
your own key pair. One part of it—the <emphasis>public
key</emphasis>—is distributed to your communication partners, who
- can than use it to encrypt the files or email messages they send. The
+ can then use it to encrypt the files or email messages they send. The
other part of the key pair—the <emphasis>private
key</emphasis>—is used to decrypt the encrypted contents.
</para>
@@ -215,7 +215,7 @@
<title>Encryption Type</title>
<para>
Specifies the encryption algorithms used to generate your keys.
- Select <guimenu>RSA</guimenu> to use the Rivest-ShamirAdleman (RSA)
+ Select <guimenu>RSA</guimenu> to use the Rivest-Shamir-Adleman (RSA)
algorithm to create the SSH key. This is the preferred and more
secure choice. Select <guimenu>DSA</guimenu> to use the Digital
Signature Algorithm (DSA) to create the SSH key.
@@ -282,7 +282,7 @@
</step>
<step performance="required">
<para>
- Use the options on the<guimenu>Owner</guimenu> tab to add a photo to
+ Use the options on the <guimenu>Owner</guimenu> tab to add a photo to
the key or to change the passphrase associated with the key.
</para>
<para>
@@ -360,7 +360,7 @@
</para>
</formalpara>
<formalpara>
- <title>Overide Owner Trust:</title>
+ <title>Override Owner Trust:</title>
<para>
Here you can set the level of trust in the owner of the key. Trust is
an indication of how sure you are of a person's ability to correctly
@@ -371,7 +371,7 @@
</para>
</formalpara>
<formalpara>
- <title>Exportr Complete Key:</title>
+ <title>Export Complete Key:</title>
<para>
Exports the key to a file.
</para>
@@ -498,7 +498,7 @@
</step>
<step performance="required">
<para>
- Use the button to on the left of the dialog box to add, delete,
+ Use the button on the left of the dialog box to add, delete,
expire, or revoke subkeys.
</para>
<informalfigure pgwide="0">
@@ -939,7 +939,7 @@
<title>Enabling Text Editor Integration</title>
<para>
The package <systemitem>seahorse-plugins-gedit</systemitem> has to be
- installed to enable file manager integration. The plugin has to be
+ installed to enable text editor integration. The plugin has to be
enabled in gedit by choosing <menuchoice> <guimenu>Edit</guimenu>
<guimenu>Preferences</guimenu> <guimenu>Plugins</guimenu></menuchoice>
and checking <guimenu>Text Encryption</guimenu>.
@@ -1019,7 +1019,7 @@
<title>Clipboard Integration</title>
<para>
- Passwords and Encryption Keys integrate with the clipboard in GNOME
+ Passwords and Encryption Keys integrates with the clipboard in GNOME
desktop. You can quickly encrypt, decrypt, sign, and verify text in the
clipboard.
</para>
@@ -1214,7 +1214,7 @@
<title>Password Keyrings</title>
<para>
You can use password keyring preferences to create or remove keyrings,
- to set the default keyring for application passwords or to change unlock
+ to set the default keyring for application passwords or to change the unlock
password of a keyring. To create a new keyring, follow these steps:
</para>
<procedure>
@@ -1229,7 +1229,7 @@
<step performance="required">
<para>
Click <menuchoice> <guimenu>File</guimenu> <guimenu>New</guimenu>
- <guimenu>Password Keyring</guimenu> </menuchoice>, then click the
+ <guimenu>Password Keyring</guimenu> </menuchoice>, then click
<guimenu>Continue</guimenu>.
</para>
</step>
@@ -1246,7 +1246,7 @@
</step>
</procedure>
<para>
- To change unlock password of an existing keyring, click on the keyring
+ To change the unlock password of an existing keyring, click on the keyring
in the <guimenu>Passwords</guimenu> tab and press <guimenu>Change
Password</guimenu>. You have to provide the old password to be able to
change it.
@@ -1319,7 +1319,7 @@
<step performance="required">
<para>
Set whether you want to automatically publish your public keys and
- which keyserver to use. Set whether you want to autopmatically
+ which keyserver to use. Set whether you want to automatically
retrieve keys from keyservers and whether to synchronize modified keys
with keyservers.
</para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/gnome_use.xml new/xml/gnome_use.xml
--- old/xml/gnome_use.xml 2010-11-15 03:41:13.000000000 +0100
+++ new/xml/gnome_use.xml 2010-11-26 11:25:07.000000000 +0100
@@ -357,7 +357,7 @@
<title>Toolbar</title>
<para>
Lets you quickly navigate among files and folders, and provides access
- to them.The toolbar contains Back, Forward, Up, Stop, Reload, Home,
+ to them. The toolbar contains Back, Forward, Up, Stop, Reload, Home,
Computer, and Search buttons.
</para>
</formalpara>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/kde_networking.xml new/xml/kde_networking.xml
--- old/xml/kde_networking.xml 2010-11-15 03:41:15.000000000 +0100
+++ new/xml/kde_networking.xml 2010-11-26 11:25:09.000000000 +0100
@@ -534,7 +534,7 @@
<para>
Press <keycombo> <keycap function="alt"/> <keycap>F2</keycap>
</keycombo> and enter
- <command>dolphin<option>http://<replaceable>address_exchange_server</replaceable></option></command>.
+ <command>dolphin <option>http://<replaceable>address_exchange_server</replaceable></option></command>.
</para>
<para>
You are logged in to your Exchange account without having to
@@ -709,7 +709,7 @@
<step performance="required">
<para>
You can keep the default values for the <guimenu>Listening
- Port</guimenu>, the <guimenu>Bandwith Limit</guimenu> and the
+ Port</guimenu>, the <guimenu>Bandwidth Limit</guimenu> and the
<guimenu>Server Name</guimenu> in the next steps (they can also be
altered later, if needed).
</para>
@@ -758,7 +758,7 @@
left click the Kepas widget) and select <menuchoice> <guimenu>File
Server</guimenu> <guimenu>Configured Server</guimenu>
<guimenu>Remove</guimenu> </menuchoice>. If you want to change the file
- server settings (like port, bandwith limit, server name or if to follow
+ server settings (like port, bandwidth limit, server name or if to follow
symbolic links or not), instead select <menuchoice> <guimenu>File
Server</guimenu> <guimenu>Configured Server</guimenu>
<guimenu>Settings</guimenu> </menuchoice> from the context menu to access
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/lvm.xml new/xml/lvm.xml
--- old/xml/lvm.xml 2010-11-15 03:41:15.000000000 +0100
+++ new/xml/lvm.xml 2010-11-26 11:25:09.000000000 +0100
@@ -82,7 +82,7 @@
incorporated in a volume group are called physical volumes (PVs). Within
the volume groups, four LVs (LV 1 through LV 4) have been
defined. They can be used by the operating system via the associated
- mount points. The border between different LVs need not be aligned with
+ mount points. The border between different LVs do not need to be aligned with
any partition border. See the border between LV 1 and LV 2 in
this example.
</para>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/net_xntp.xml new/xml/net_xntp.xml
--- old/xml/net_xntp.xml 2010-11-15 03:41:16.000000000 +0100
+++ new/xml/net_xntp.xml 2010-11-26 11:25:11.000000000 +0100
@@ -83,7 +83,7 @@
On laptops and other machines that suspend automatically, select
<guimenu>Synchronize without Daemon</guimenu>. Using this mode,
&yast; does not start <command>ntpd</command> on the local machine
- for synchronising. Instead &yast; creates a crontab entry
+ for synchronizing. Instead &yast; creates a crontab entry
(<filename>/etc/cron.d/novell.ntp-synchronize</filename>) that checks
the time with the time server as specified in the <guimenu>Interval
of the Synchronization in Minutes</guimenu> field. For more
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/opensuse_update.xml new/xml/opensuse_update.xml
--- old/xml/opensuse_update.xml 2010-11-15 03:41:17.000000000 +0100
+++ new/xml/opensuse_update.xml 2010-11-26 11:25:12.000000000 +0100
@@ -46,7 +46,7 @@
<title>Preparations</title>
<para>
Before upgrading, copy the old configuration files to a separate medium
- (such as tape device, removable hard disk, or USB flash drive) to secure
+ (such as removable hard disk or USB flash drive) to secure
the data. This primarily applies to files stored in
<filename>/etc</filename> as well as some of the directories and files
in <filename>/var</filename>. You may also want to write the user data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/troubleshooting.xml new/xml/troubleshooting.xml
--- old/xml/troubleshooting.xml 2010-11-15 03:41:20.000000000 +0100
+++ new/xml/troubleshooting.xml 2010-11-26 11:25:17.000000000 +0100
@@ -2128,7 +2128,7 @@
Decide where you want to store your image (labeled as
<replaceable>BACKUP_PATH</replaceable>). It must be different from
your source device. In other words: if you make a backup from
- <filename>/dev/sda</filename>, your image file need not to be stored
+ <filename>/dev/sda</filename>, your image file must not be stored
under <filename>/dev/sda</filename>.
</para>
</step>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/utilities.xml new/xml/utilities.xml
--- old/xml/utilities.xml 2010-11-15 03:41:21.000000000 +0100
+++ new/xml/utilities.xml 2010-11-26 11:25:17.000000000 +0100
@@ -929,7 +929,7 @@
<para>
To list all processes with user and command line information, use
- <command>ps axu</command>:
+ <command>ps aux</command>:
</para>
<screen>&exampleuser;@&wsIV;:~> ps axu
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
@@ -1052,7 +1052,7 @@
<para>
The parameter <option>-p</option> adds the process ID to a given name.
To have the command lines displayed as well, use the <option>-a</option>
- parameter:
+ parameter.
</para>
</sect2>
@@ -1848,7 +1848,7 @@
compressed files:
</para>
<screen>&exampleuser;@&wsIV;:~> file /usr/share/man/man1/file.1.gz
-usr/share/man/man1/file.1.gz: gzip compressed data, from Unix, max compression
+/usr/share/man/man1/file.1.gz: gzip compressed data, from Unix, max compression
&exampleuser;@&wsIV;:~> file -z /usr/share/man/man1/file.1.gz
/usr/share/man/man1/file.1.gz: troff or preprocessor input text \
(gzip compressed data, from Unix, max compression)</screen>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xml/yast2_webpin.xml new/xml/yast2_webpin.xml
--- old/xml/yast2_webpin.xml 2010-11-15 03:41:24.000000000 +0100
+++ new/xml/yast2_webpin.xml 2010-11-26 11:25:22.000000000 +0100
@@ -89,7 +89,7 @@
<step performance="required">
<para>
The <guimenu>Proposal</guimenu> screen summarizes the choices you made.
- Click <guimenu>Customise</guimenu> to restart the configuration steps
+ Click <guimenu>Customize</guimenu> to restart the configuration steps
from above. Click <guimenu>Next</guimenu> and <guimenu>Yes</guimenu> to
proceed with the installation.
</para>
++++++ opensuse-installquick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-installquick_en.pdf ++++++
(binary differes)
++++++ opensuse-kdequick_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-kdequick_en.pdf ++++++
(binary differes)
++++++ opensuse-kdeuser_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-kdeuser_en.pdf ++++++
(binary differes)
++++++ opensuse-reference_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-reference_en.pdf ++++++
(binary differes)
++++++ opensuse-security_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-security_en.pdf ++++++
(binary differes)
++++++ opensuse-startup_en-pdf-yelp.tar.bz2 ++++++
++++++ opensuse-startup_en.pdf ++++++
(binary differes)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package tomcat6 for openSUSE:Factory
checked in at Fri Nov 26 17:02:08 CET 2010.
--------
--- tomcat6/tomcat6.changes 2010-11-02 11:20:31.000000000 +0100
+++ tomcat6/tomcat6.changes 2010-11-25 11:57:42.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 25 10:33:51 UTC 2010 - mvyskocil(a)suse.cz
+
+- fix bnc#655440 - VUL-0: tomcat6: Apache Tomcat Manager application XSS
+ vulnerability (CVE-2010-4172)
+ http://svn.apache.org/viewvc?view=revision&revision=1037779
+- fix bnc#653586 - spacewalk 1.2 requires jasper 5.5
+ * add offline jasper compiler /usr/bin/jspc
+- unpack tarball to apache-tomcat-$VERSION-src directory directly
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
apache-tomcat-CVE-2010-4172.patch
tomcat6-6.0.jasper.sh
tomcat6-6.0.jspc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libtcnative-1-0.spec ++++++
--- /var/tmp/diff_new_pack.N3UGsc/_old 2010-11-26 16:58:39.000000000 +0100
+++ /var/tmp/diff_new_pack.N3UGsc/_new 2010-11-26 16:58:39.000000000 +0100
@@ -29,7 +29,7 @@
Name: libtcnative-1-0
Version: %{major}.%{minor}.%{micro}
-Release: 8
+Release: 9
Summary: JNI wrappers for Apache Portable Runtime for Tomcat
Group: Productivity/Networking/Web/Servers
License: Apache Software License ..
++++++ tomcat6.spec ++++++
--- /var/tmp/diff_new_pack.N3UGsc/_old 2010-11-26 16:58:39.000000000 +0100
+++ /var/tmp/diff_new_pack.N3UGsc/_new 2010-11-26 16:58:39.000000000 +0100
@@ -41,7 +41,7 @@
Name: tomcat6
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2
+Release: 3
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API
Group: Productivity/Networking/Web/Servers
License: Apache Software License ..
@@ -56,11 +56,16 @@
Source6: %{name}-%{major_version}.%{minor_version}-digest.script
Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
Source8: %{name}-%{major_version}.%{minor_version}.starter
+#bnc#653586: offline jasper compiler for spacewalk - rewritten from tomcat5.5/jasper/bin
+Source100: tomcat6-6.0.jasper.sh
+Source101: tomcat6-6.0.jspc
Source1000: tomcat6-rpmlintrc
#PATCH-FIX-UPSTREAM: from jpackage.org package
Patch0: %{name}-%{major_version}.%{minor_version}.bootstrap-MANIFEST.MF.patch
#PATCH-FIX-UPSTREAM: from jpackage.org package
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
+#PATCH-FIX-UPSTREAM: http://svn.apache.org/viewvc?view=revision&revision=1037779
+Patch2: apache-tomcat-CVE-2010-4172.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: ant
@@ -209,30 +214,30 @@
%prep
-%setup -q -c -T -a 0
+%setup -q -n %{packdname}
# remove pre-built binaries and windows files
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
%patch0 -p1
%patch1 -p0
+%patch2 -p1
%build
export CLASSPATH=
export OPT_JAR_LIST="ant/ant-trax"
-pushd %{packdname}
- # remove pre-built binaries and windows files
- find . \( -name "*.bat" -o -name "*.class" -o -name "*.gz" -o \
+# remove pre-built binaries and windows files
+find . \( -name "*.bat" -o -name "*.class" -o -name "*.gz" -o \
-name "*.jar" -o -name "*.zip" \) | xargs -t %{__rm} -f
- # we don't care about the tarballs and we're going to replace
- # tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
- # so just create a dummy file for later removal
- touch HACK
+# we don't care about the tarballs and we're going to replace
+# tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
+# so just create a dummy file for later removal
+touch HACK
%if %defined suse_version
- export CLASSPATH="$(build-classpath xalan-j2-serializer)"
- export ANT_OPTS=-Xmx500M
+export CLASSPATH="$(build-classpath xalan-j2-serializer)"
+export ANT_OPTS=-Xmx500M
%endif
- # who needs a build.properties file anyway
- %{ant} -Dbase.path="." \
+# who needs a build.properties file anyway
+%{ant} -Dbase.path="." \
-Dbuild.compiler="modern" \
-Dcommons-collections.jar="$(build-classpath commons-collections)" \
-Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
@@ -243,17 +248,17 @@
-Dtomcat-native.tar.gz="HACK" \
-Dversion="%{version}" \
-Dversion.build="%{micro_version}"
- # javadoc generation
- %{ant} -f dist.xml dist-prepare
- %{ant} -f dist.xml dist-source
- %{ant} -f dist.xml dist-javadoc
- # remove some jars that we'll replace with symlinks later
- %{__rm} output/build/bin/commons-daemon.jar \
+# javadoc generation
+%{ant} -f dist.xml dist-prepare
+%{ant} -f dist.xml dist-source
+%{ant} -f dist.xml dist-javadoc
+# remove some jars that we'll replace with symlinks later
+%{__rm} output/build/bin/commons-daemon.jar \
output/build/lib/ecj.jar
- # remove the cruft we created
- %{__rm} output/build/bin/tomcat-native.tar.gz
-popd
-pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
+# remove the cruft we created
+%{__rm} output/build/bin/tomcat-native.tar.gz
+
+pushd output/dist/src/webapps/docs/appdev/sample/src
%{__mkdir_p} ../web/WEB-INF/classes
%{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
pushd ../web
@@ -281,14 +286,14 @@
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{tempdir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir}/Catalina/localhost
# move things into place
-pushd %{packdname}/output/build
+pushd output/build
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
%{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
popd
# javadoc
-pushd %{packdname}/output/dist/webapps
+pushd output/dist/webapps
%{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
popd
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
@@ -381,6 +386,9 @@
ln -sf %{_initrddir}/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
#bnc#565901
ln -sf %{_sbindir}/d%{name} %{buildroot}/%{bindir}/catalina.sh
+#bnc#653586 - jasper.sh and jspc
+install -m 0755 %{SOURCE100} %{buildroot}/%{bindir}/jasper.sh
+install -m 0755 %{SOURCE101} %{buildroot}/%{_bindir}/jspc
%endif
%clean
@@ -509,7 +517,7 @@
%files
%defattr(0644,root,root,0755)
-%doc %{packdname}/{LICENSE,NOTICE,RELEASE*}
+%doc {LICENSE,NOTICE,RELEASE*}
%attr(0755,root,root) %{_bindir}/%{name}-digest
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
%attr(0755,root,root) %{_sbindir}/d%{name}
@@ -518,6 +526,9 @@
%if %{defined suse_version}
#bnc#565901
%attr(0755,root,root) %{bindir}/catalina.sh
+#bnc#653586
+%attr(0755,root,root) %{bindir}/jasper.sh
+%attr(0755,root,root) %{_bindir}/jspc
%endif
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%if ! %defined suse_version
++++++ apache-tomcat-CVE-2010-4172.patch ++++++
---
apache-tomcat-6.0.29-src/java/org/apache/catalina/manager/JspHelper.java | 2 -
apache-tomcat-6.0.29-src/webapps/docs/changelog.xml | 3 ++
apache-tomcat-6.0.29-src/webapps/manager/sessionDetail.jsp | 10 ++++---
apache-tomcat-6.0.29-src/webapps/manager/sessionsList.jsp | 14 +++++-----
4 files changed, 18 insertions(+), 11 deletions(-)
Index: apache-tomcat-6.0.29-src/java/org/apache/catalina/manager/JspHelper.java
===================================================================
--- apache-tomcat-6.0.29-src/java/org/apache/catalina/manager/JspHelper.java 2010-01-19 14:43:39.000000000 +0100
+++ apache-tomcat-6.0.29-src/java/org/apache/catalina/manager/JspHelper.java 2010-11-24 14:11:27.959022725 +0100
@@ -58,7 +58,7 @@
}
private static String localeToString(Locale locale) {
if (locale != null) {
- return locale.toString();//locale.getDisplayName();
+ return escapeXml(locale.toString());//locale.getDisplayName();
} else {
return "";
}
Index: apache-tomcat-6.0.29-src/webapps/docs/changelog.xml
===================================================================
--- apache-tomcat-6.0.29-src/webapps/docs/changelog.xml 2010-01-19 14:43:41.000000000 +0100
+++ apache-tomcat-6.0.29-src/webapps/docs/changelog.xml 2010-11-24 14:11:27.959022725 +0100
@@ -1931,6 +1931,9 @@
<bug>44968</bug>: Provide more information when the load of a keystore
fails. (markt)
</fix>
+ <fix>
+ CVE-2010-4172: Multiple XSS in Manager application. (markt/kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
Index: apache-tomcat-6.0.29-src/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
===================================================================
--- apache-tomcat-6.0.29-src/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 2010-01-19 14:43:41.000000000 +0100
+++ apache-tomcat-6.0.29-src/webapps/manager/WEB-INF/jsp/sessionDetail.jsp 2010-11-24 14:11:27.979023045 +0100
@@ -30,8 +30,10 @@
<% String path = (String) request.getAttribute("path");
Session currentSession = (Session)request.getAttribute("currentSession");
HttpSession currentHttpSession = currentSession.getSession();
- String currentSessionId = currentSession.getId();
- String submitUrl = ((HttpServletRequest)pageContext.getRequest()).getRequestURL().toString();
+ String currentSessionId = JspHelper.escapeXml(currentSession.getId());
+ String submitUrl = JspHelper.escapeXml(response.encodeURL(
+ ((HttpServletRequest) pageContext.getRequest()).getRequestURI() +
+ "?path=" + path));
%>
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
@@ -45,7 +47,7 @@
<title>Sessions Administration: details for <%= currentSessionId %></title>
</head>
<body>
-<h1>Details for Session <%= JspHelper.escapeXml(currentSessionId) %></h1>
+<h1>Details for Session <%= currentSessionId %></h1>
<table style="text-align: left;" border="0">
<tr>
@@ -120,7 +122,7 @@
String attributeName = (String) attributeNamesEnumeration.nextElement();
%>
<tr>
- <td align="center"><form action="<%= submitUrl %>"><div><input type="hidden" name="path" value="<%= path %>" /><input type="hidden" name="action" value="removeSessionAttribute" /><input type="hidden" name="sessionId" value="<%= currentSessionId %>" /><input type="hidden" name="attributeName" value="<%= attributeName %>" /><input type="submit" value="Remove" /></div></form></td>
+ <td align="center"><form action="<%= submitUrl %>"><div><input type="hidden" name="action" value="removeSessionAttribute" /><input type="hidden" name="sessionId" value="<%= currentSessionId %>" /><input type="hidden" name="attributeName" value="<%= attributeName %>" /><input type="submit" value="Remove" /></div></form></td>
<td><%= JspHelper.escapeXml(attributeName) %></td>
<td><% Object attributeValue = currentHttpSession.getAttribute(attributeName); %><span title="<%= attributeValue == null ? "" : attributeValue.getClass().toString() %>"><%= JspHelper.escapeXml(attributeValue) %></span></td>
</tr>
Index: apache-tomcat-6.0.29-src/webapps/manager/WEB-INF/jsp/sessionsList.jsp
===================================================================
--- apache-tomcat-6.0.29-src/webapps/manager/WEB-INF/jsp/sessionsList.jsp 2010-01-19 14:43:41.000000000 +0100
+++ apache-tomcat-6.0.29-src/webapps/manager/WEB-INF/jsp/sessionsList.jsp 2010-11-24 14:13:16.292757413 +0100
@@ -26,7 +26,9 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<% String path = (String) request.getAttribute("path");
- String submitUrl = ((HttpServletRequest)pageContext.getRequest()).getRequestURI() + "?path=" + path;
+ String submitUrl = JspHelper.escapeXml(response.encodeURL(
+ ((HttpServletRequest) pageContext.getRequest()).getRequestURI() +
+ "?path=" + path));
Collection activeSessions = (Collection) request.getAttribute("activeSessions");
%>
<head>
@@ -38,10 +40,10 @@
<meta name="author" content="Cedrik LIME"/>
<meta name="copyright" content="copyright 2005-2010 the Apache Software Foundation"/>
<meta name="robots" content="noindex,nofollow,noarchive"/>
- <title>Sessions Administration for <%= path %></title>
+ <title>Sessions Administration for <%= JspHelper.escapeXml(path) %></title>
</head>
<body>
-<h1>Sessions Administration for <%= path %></h1>
+<h1>Sessions Administration for <%= JspHelper.escapeXml(path) %></h1>
<p>Tips:</p>
<ul>
@@ -55,13 +57,13 @@
<form action="<%= submitUrl %>" method="post" id="sessionsForm">
<fieldset><legend>Active HttpSessions informations</legend>
<input type="hidden" name="action" id="sessionsFormAction" value="injectSessions"/>
- <input type="hidden" name="sort" id="sessionsFormSort" value="<%= (String) request.getAttribute("sort") %>"/>
+ <input type="hidden" name="sort" id="sessionsFormSort" value="<%= JspHelper.escapeXml(request.getAttribute("sort")) %>"/>
<% String order = (String) request.getAttribute("order");
if (order == null || "".equals(order)) {
order = "ASC";
}
%>
- <input type="hidden" name="order" id="sessionsFormSortOrder" value="<%= order %>"/>
+ <input type="hidden" name="order" id="sessionsFormSortOrder" value="<%= JspHelper.escapeXml(order) %>"/>
<input type="submit" name="refresh" id="refreshButton" value="Refresh Sessions list" onclick="document.getElementById('sessionsFormAction').value='refreshSessions'; return true;"/>
<%= JspHelper.formatNumber(activeSessions.size()) %> active Sessions<br/>
<table border="1" cellpadding="2" cellspacing="2" width="100%">
@@ -95,11 +97,11 @@
<% Iterator iter = activeSessions.iterator();
while (iter.hasNext()) {
Session currentSession = (Session) iter.next();
- String currentSessionId = currentSession.getId();
+ String currentSessionId = JspHelper.escapeXml(currentSession.getId());
%>
<tr>
<td>
-<input type="checkbox" name="sessionIds" value="<%= currentSessionId %>" /><a href="<%= submitUrl %>&action=sessionDetail&sessionId=<%= currentSessionId %>" target="_blank"><%= JspHelper.escapeXml(currentSessionId) %></a>
+<input type="checkbox" name="sessionIds" value="<%= currentSessionId %>" /><a href="<%= submitUrl %>&action=sessionDetail&sessionId=<%= currentSessionId %>" target="_new"><%= currentSessionId %></a>
</td>
<td style="text-align: center;"><%= JspHelper.guessDisplayLocaleFromSession(currentSession) %></td>
<td style="text-align: center;"><%= JspHelper.guessDisplayUserFromSession(currentSession) %></td>
++++++ tomcat6-6.0-tomcat-users-webapp.patch ++++++
--- /var/tmp/diff_new_pack.N3UGsc/_old 2010-11-26 16:58:39.000000000 +0100
+++ /var/tmp/diff_new_pack.N3UGsc/_new 2010-11-26 16:58:39.000000000 +0100
@@ -1,7 +1,7 @@
-Index: apache-tomcat-6.0.29-src/conf/tomcat-users.xml
+Index: conf/tomcat-users.xml
===================================================================
---- apache-tomcat-6.0.29-src/conf/tomcat-users.xml.orig 2010-06-29 16:33:40.000000000 +0200
-+++ apache-tomcat-6.0.29-src/conf/tomcat-users.xml 2010-07-15 09:35:36.400001376 +0200
+--- conf/tomcat-users.xml.orig 2010-06-29 16:33:40.000000000 +0200
++++ conf/tomcat-users.xml 2010-07-15 09:35:36.400001376 +0200
@@ -33,4 +33,9 @@
<user username="both" password="tomcat" roles="tomcat,role1"/>
<user username="role1" password="tomcat" roles="role1"/>
++++++ tomcat6-6.0.bootstrap-MANIFEST.MF.patch ++++++
--- /var/tmp/diff_new_pack.N3UGsc/_old 2010-11-26 16:58:39.000000000 +0100
+++ /var/tmp/diff_new_pack.N3UGsc/_new 2010-11-26 16:58:39.000000000 +0100
@@ -1,7 +1,7 @@
-Index: tomcat6-6.0.29/apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest
+Index: apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest
===================================================================
---- tomcat6-6.0.29.orig/apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest 2010-06-29 16:33:42.000000000 +0200
-+++ tomcat6-6.0.29/apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest 2010-07-15 09:35:10.044876580 +0200
+--- apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest 2010-06-29 16:33:42.000000000 +0200
++++ apache-tomcat-6.0.29-src/res/META-INF/bootstrap.jar.manifest 2010-07-15 09:35:10.044876580 +0200
@@ -1,6 +1,5 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
++++++ tomcat6-6.0.jasper.sh ++++++
#!/bin/bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# -----------------------------------------------------------------------------
# Script for Jasper compiler
# - mvyskocil reworked for SUSE tomcat6 package - see
# https://bugzilla.novell.com/show_bug.cgi?id=653586
#
# Environment Variable Prequisites
#
# JASPER_HOME May point at your Catalina "build" directory.
#
# JASPER_OPTS (Optional) Java runtime options used when the "start",
# "stop", or "run" command is executed.
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
# JAVA_OPTS (Optional) Java runtime options used when the "start",
# "stop", or "run" command is executed.
# Get the tomcat config (use this for environment specific settings)
if [ -z "${TOMCAT_CFG}" ]; then
TOMCAT_CFG="/etc/tomcat6/tomcat6.conf"
fi
if [ -r "$TOMCAT_CFG" ]; then
. $TOMCAT_CFG
fi
CLASSPATH="${CLASSPATH}:$(build-classpath tomcat6 ant)"
CLASSPATH="${CLASSPATH}:$(build-classpath tomcat6-servlet-2.5-api tomcat6-jsp-2.1-api tomcat6-el-1.0-api)"
# CLASSPATH munging
if [ -n "$JSSE_HOME" ]; then
CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)"
fi
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar"
CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar"
CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)"
# ----- Execute The Requested Command -----------------------------------------
if [ "$1" = "jspc" ] ; then
shift
exec "${JAVA_HOME}/bin/java" $JAVA_OPTS $JASPER_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Djasper.home="$JASPER_HOME" \
-Dcatalina.home="$JASPER_HOME" \
org.apache.jasper.JspC "$@"
elif [ "$1" = "debug" ] ; then
shift
exec "${JAVA_HOME}/bin/jdb" $JAVA_OPTS $JASPER_OPTS \
-Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
-Djasper.home="$JASPER_HOME" \
-Dcatalina.home="$JASPER_HOME" \
org.apache.jasper.JspC "$@"
else
echo "Usage: jasper.sh ( jspc )"
echo "Commands:"
echo " jspc - Run the offline JSP compiler"
exit 1
fi
++++++ tomcat6-6.0.jspc ++++++
#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# -----------------------------------------------------------------------------
# Script to run the Jasper "offline JSP compiler"
# - mvyskocil reworked for SUSE tomcat6 package - see
# https://bugzilla.novell.com/show_bug.cgi?id=653586
#
# $Id: jspc.sh 565193 2007-08-12 22:53:10Z markt $
# -----------------------------------------------------------------------------
PRGDIR=/usr/share/tomcat6/bin
EXECUTABLE=jasper.sh
# Check that target executable exists
if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then
echo "Cannot find $PRGDIR/$EXECUTABLE"
echo "This file is needed to run this program"
exit 1
fi
if [ "$1" = "debug" ]; then
shift
exec "$PRGDIR"/"$EXECUTABLE" debug "$@"
else
exec "$PRGDIR"/"$EXECUTABLE" jspc "$@"
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package subversion for openSUSE:Factory
checked in at Fri Nov 26 16:58:07 CET 2010.
--------
--- subversion/subversion.changes 2010-10-02 23:21:47.000000000 +0200
+++ subversion/subversion.changes 2010-11-24 11:29:10.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 24 11:28:51 CET 2010 - dmueller(a)suse.de
+
+- correct instructions on how to create the svn account (bnc#655094)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subversion.spec ++++++
--- /var/tmp/diff_new_pack.IJq7g9/_old 2010-11-26 16:57:31.000000000 +0100
+++ /var/tmp/diff_new_pack.IJq7g9/_new 2010-11-26 16:57:31.000000000 +0100
@@ -42,7 +42,7 @@
Name: subversion
Version: 1.6.13
-Release: 1
+Release: 2
# in-tree SWIG version to use for the build:
%define swig_version 1.3.36
%define sqlite_version 3.6.13
++++++ subversion.README.SuSE ++++++
--- /var/tmp/diff_new_pack.IJq7g9/_old 2010-11-26 16:57:32.000000000 +0100
+++ /var/tmp/diff_new_pack.IJq7g9/_new 2010-11-26 16:57:32.000000000 +0100
@@ -23,10 +23,11 @@
daemon and a special network protocol. svnserve should not run as root user.
The startup script rcsvnserve expects a user/group named 'svn', configureable
via /etc/sysconfig/svnserve.
+
But this user/group must be created before first use:
- useradd svn
groupadd svn
+ useradd -d /srv/svn -s /bin/false -g svn svn
3. mini-howto for 2 projects
++++++ subversion.rcsvnserve ++++++
--- /var/tmp/diff_new_pack.IJq7g9/_old 2010-11-26 16:57:32.000000000 +0100
+++ /var/tmp/diff_new_pack.IJq7g9/_new 2010-11-26 16:57:32.000000000 +0100
@@ -96,8 +96,16 @@
echo -n "Starting svnserve "
## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc.
- startproc -u "$SVNSERVE_USERID" -g "$SVNSERVE_GROUPID" -e $SVNSERVE_BIN $SVNSERVE_OPTIONS
+ if test -z "$SVNSERVE_USERID" || ! (/usr/bin/id $SVNSERVE_USERID &>/dev/null) \
+ test -z "$SVNSERVE_GROUPID" || ! (/usr/bin/id $SVNSERVE_GROUPID;
+ then
+ echo "User $SVNSERVE_USERID does not exist."
+ echo "Please check $SVNSERVE_CONFIG before starting this service."
+ rc_failed
+ else
+ startproc -u "$SVNSERVE_USERID" -g "$SVNSERVE_GROUPID" -e $SVNSERVE_BIN $SVNSERVE_OPTIONS
+ fi
# Remember status and be verbose
rc_status -v
;;
++++++ subversion.sysconfig.svnserve ++++++
--- /var/tmp/diff_new_pack.IJq7g9/_old 2010-11-26 16:57:32.000000000 +0100
+++ /var/tmp/diff_new_pack.IJq7g9/_new 2010-11-26 16:57:32.000000000 +0100
@@ -16,7 +16,7 @@
#
# svnserve should run as unprivileged user
# the userid/groupid svn is not created during package install
-# run 'useradd -d /srv/svn -s /bin/false svn ; groupadd svn' to create the userid/groupid
+# run 'groupadd svn; useradd -d /srv/svn -s /bin/false -g svn svn' to create the userid/groupid
#
SVNSERVE_USERID="svn"
@@ -25,6 +25,6 @@
#
# svnserve should run as unprivileged user
# the userid/groupid svn is not created during package install
-# run 'useradd -d /srv/svn -s /bin/false svn ; groupadd svn' to create the userid/groupid
+# run 'groupadd svn; useradd -d /srv/svn -s /bin/false -g svn svn' to create the userid/groupid
#
SVNSERVE_GROUPID="svn"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package re2c for openSUSE:Factory
checked in at Fri Nov 26 16:55:36 CET 2010.
--------
--- re2c/re2c.changes 2008-06-27 09:02:52.000000000 +0200
+++ re2c/re2c.changes 2010-11-23 13:54:09.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 23 12:52:50 UTC 2010 - cristian.rodriguez(a)opensuse.org
+
+- Use smp_flags
+- when rebuilding the scanner use -g, to generate GCC specific
+ code that is slightly faster.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ re2c.spec ++++++
--- /var/tmp/diff_new_pack.Wfuxs5/_old 2010-11-26 16:54:58.000000000 +0100
+++ /var/tmp/diff_new_pack.Wfuxs5/_new 2010-11-26 16:54:58.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package re2c (Version 0.13.5)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
Name: re2c
BuildRequires: gcc-c++
Version: 0.13.5
-Release: 25
+Release: 32
License: Public Domain, Freeware
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,12 +50,12 @@
%build
%configure
-%{__make} re2c
+%{__make} %{?_smp_mflags} re2c
#regenerate file scanner.cc
%{__rm} -f scanner.cc
-./re2c scanner.re > scanner.cc
+./re2c -g scanner.re > scanner.cc
%{__rm} -f re2c scanner.o
-%{__make}
+%{__make} %{?_smp_mflags}
%check
%{__make} test
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lockdev for openSUSE:Factory
checked in at Fri Nov 26 16:54:45 CET 2010.
--------
--- lockdev/lockdev.changes 2010-04-23 11:39:13.000000000 +0200
+++ lockdev/lockdev.changes 2010-11-24 14:07:40.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Nov 24 12:58:26 UTC 2010 - lnussel(a)suse.de
+
+- update permissions handling
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lockdev.spec ++++++
--- /var/tmp/diff_new_pack.9QXF7Y/_old 2010-11-26 16:54:16.000000000 +0100
+++ /var/tmp/diff_new_pack.9QXF7Y/_new 2010-11-26 16:54:16.000000000 +0100
@@ -21,7 +21,7 @@
Name: lockdev
Summary: A library for locking devices
Version: 1.0.3_git201003141408
-Release: 2
+Release: 5
License: LGPLv2
Group: System/Base
Url: http://packages.debian.org/unstable/source/lockdev
@@ -35,6 +35,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
BuildRequires: perl
+BuildRequires: pkg-config
BuildRequires: perl(ExtUtils::MakeMaker)
%description
@@ -94,9 +95,10 @@
%pre
getent group lock >/dev/null || groupadd -r lock || :
-%post -n liblockdev1
-/sbin/ldconfig
-%run_permissions
+%post
+%set_permissions /usr/sbin/lockdev
+
+%post -n liblockdev1 -p /sbin/ldconfig
%postun -n liblockdev1 -p /sbin/ldconfig
@@ -109,8 +111,7 @@
%files
%defattr(-,root,root)
%doc COPYING AUTHORS
-#TODO attr(2755,root,lock)
-%verify(not mode) %attr(-,root,lock) %{_sbindir}/lockdev
+%verify(not mode) %attr(2755,root,lock) %{_sbindir}/lockdev
%{_mandir}/man8/*
%files -n liblockdev1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package multipath-tools for openSUSE:Factory
checked in at Fri Nov 26 16:54:02 CET 2010.
--------
--- multipath-tools/multipath-tools.changes 2010-10-11 13:19:40.000000000 +0200
+++ multipath-tools/multipath-tools.changes 2010-11-26 10:22:38.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 26 10:18:45 CET 2010 - meissner(a)suse.de
+
+- updated one more dm_simplecmd caller with &cookie.
+- bumped 1 character buffer to 1 byte more for leading \0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multipath-tools.spec ++++++
--- /var/tmp/diff_new_pack.W96Sva/_old 2010-11-26 16:52:47.000000000 +0100
+++ /var/tmp/diff_new_pack.W96Sva/_new 2010-11-26 16:52:47.000000000 +0100
@@ -27,7 +27,7 @@
PreReq: %insserv_prereq %fillup_prereq coreutils grep
AutoReqProv: on
Version: 0.4.8
-Release: 54
+Release: 55
Summary: Tools to Manage Multipathed Devices with the device-mapper
Source: multipath-tools-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ multipath-tools-0.4.8-opensuse-11.3.diff.bz2 ++++++
++++ 5971 lines (skipped)
++++ between multipath-tools/multipath-tools-0.4.8-opensuse-11.3.diff.bz2
++++ and multipath-tools/multipath-tools-0.4.8-opensuse-11.3.diff.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri Nov 26 16:40:56 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-11-22 07:13:39.000000000 +0100
+++ xorg-x11/xorg-x11.changes 2010-11-25 18:43:12.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Nov 25 17:27:42 UTC 2010 - sndirsch(a)novell.com
+
+- xcalc 1.0.4
+ * This minor maintenance release provides the usual recent
+ collection of improvements to the calculation of the build
+ configuration and other janitorial cleanups.
+- xeyes 1.1.1
+ * Looking closely at this release would reveal an unsurprising
+ set of build configuration improvements and removal of various
+ eyesores in the code.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xcalc-1.0.3.tar.bz2
xeyes-1.1.0.tar.bz2
New:
----
xcalc-1.0.4.tar.bz2
xeyes-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.FdrClF/_old 2010-11-26 16:39:35.000000000 +0100
+++ /var/tmp/diff_new_pack.FdrClF/_new 2010-11-26 16:39:35.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 33
+Release: 34
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -62,7 +62,7 @@
Source27: x11perf-1.5.2.tar.bz2
Source28: xauth-1.0.5.tar.bz2
Source29: xbiff-1.0.2.tar.bz2
-Source30: xcalc-1.0.3.tar.bz2
+Source30: xcalc-1.0.4.tar.bz2
Source31: xclipboard-1.1.1.tar.bz2
Source32: xclock-1.0.5.tar.bz2
Source33: xcmsdb-1.0.3.tar.bz2
@@ -75,7 +75,7 @@
Source40: xdpyinfo-1.2.0.tar.bz2
Source42: xedit-1.2.0.tar.bz2
Source43: xev-1.1.0.tar.bz2
-Source44: xeyes-1.1.0.tar.bz2
+Source44: xeyes-1.1.1.tar.bz2
Source45: xf86dga-1.0.3.tar.bz2
Source46: xfd-1.1.0.tar.bz2
Source47: xfindproxy-X11R7.0-1.0.1.tar.bz2
++++++ xcalc-1.0.3.tar.bz2 -> xcalc-1.0.4.tar.bz2 ++++++
++++ 4986 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/ChangeLog new/xcalc-1.0.4/ChangeLog
--- old/xcalc-1.0.3/ChangeLog 2009-12-18 04:52:17.000000000 +0100
+++ new/xcalc-1.0.4/ChangeLog 2010-11-25 00:58:39.000000000 +0100
@@ -1,3 +1,108 @@
+commit 8245b9f8451b92a1aaa7a3520114a4afdd37c2e8
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Nov 24 15:58:04 2010 -0800
+
+ xcalc 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4ac002703c8bda62f768f581e1ec81bbf7446365
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 11:12:55 2010 -0800
+
+ create_keypad: declare list of button name strings as const
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 0d7aa29c6209391cf8307c19b5cf84528f8c2184
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 10:55:58 2010 -0800
+
+ Purge RCS/CVS version tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 9ede32efd5f840b7728e28e24efe2759e2c3917b
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 10:41:45 2010 -0800
+
+ config: Explicitly check for xt & x11 pkgs, since xcalc calls those directly
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 4be6d1bd7b6293ff4af1042098a6164aa9639595
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 10:37:40 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 30e01e9b012c7191c28946a73c2ff5b969d9eec7
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 10:35:57 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 5505a663714c71aa3545889633f36079522edcb5
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 10:34:33 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 6919c12a985abd335b4890005d572107f833c3ec
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sat Nov 20 10:31:43 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 8180d8ea42cfdda9ed3828fb28d1a6cd24d951db
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Feb 11 10:08:06 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
+commit 04d8b9bfcd40eee452ba080b654dac9281251115
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Sat Dec 19 20:48:47 2009 -0500
+
+ configure.ac: use backticks rather than $() for cmd subs
+
+ Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
commit 6c21e467c805d62593d34da9e83a2fa2f01798a6
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Thu Dec 17 19:51:44 2009 -0800
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/Makefile.am new/xcalc-1.0.4/Makefile.am
--- old/xcalc-1.0.3/Makefile.am 2009-12-18 04:20:56.000000000 +0100
+++ new/xcalc-1.0.4/Makefile.am 2010-11-20 19:55:13.000000000 +0100
@@ -21,7 +21,7 @@
bin_PROGRAMS = xcalc
-AM_CFLAGS = $(XCALC_CFLAGS)
+AM_CFLAGS = $(XCALC_CFLAGS) $(CWARNFLAGS)
xcalc_LDADD = $(XCALC_LIBS) -lm
xcalc_SOURCES = \
@@ -63,26 +63,8 @@
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/actions.c new/xcalc-1.0.4/actions.c
--- old/xcalc-1.0.3/actions.c 2009-10-16 23:38:47.000000000 +0200
+++ new/xcalc-1.0.4/actions.c 2010-11-20 19:54:55.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XConsortium: actions.c,v 1.9 94/04/17 20:43:30 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/app-defaults/XCalc new/xcalc-1.0.4/app-defaults/XCalc
--- old/xcalc-1.0.3/app-defaults/XCalc 2009-10-16 23:38:47.000000000 +0200
+++ new/xcalc-1.0.4/app-defaults/XCalc 2010-11-20 19:54:55.000000000 +0100
@@ -1,5 +1,3 @@
-! $XConsortium: XCalc.ad,v 1.13 94/03/03 19:19:32 converse Exp $
-! $XFree86$
! XCalc application class resource file
XCalc.Title: Calculator
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/configure.ac new/xcalc-1.0.4/configure.ac
--- old/xcalc-1.0.3/configure.ac 2009-12-18 04:51:00.000000000 +0100
+++ new/xcalc-1.0.4/configure.ac 2010-11-25 00:57:51.000000000 +0100
@@ -21,31 +21,28 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xcalc, [1.0.3],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcalc)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xcalc], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xcalc])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
-
-AC_PROG_CC
-AC_PROG_INSTALL
-
-
-PKG_CHECK_MODULES(XCALC, xaw7)
-XCALC_CFLAGS="$CWARNFLAGS $XCALC_CFLAGS"
-AC_SUBST(XCALC_CFLAGS)
-AC_SUBST(XCALC_LIBS)
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XCALC, xaw7 xt x11)
PKG_CHECK_MODULES(APPDEFS, xt)
-xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
[specify directory for app-defaults files (default is autodetected)]),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/math.c new/xcalc-1.0.4/math.c
--- old/xcalc-1.0.3/math.c 2009-10-16 23:38:47.000000000 +0200
+++ new/xcalc-1.0.4/math.c 2010-11-20 19:56:33.000000000 +0100
@@ -1,8 +1,4 @@
-/* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $
- * $MIT: contrib/programs/xcalc/math.c,v 3.2 1999/12/14 18:53:00 gjcoram Exp$
- * $XFree86: xc/programs/xcalc/math.c,v 1.5tsi Exp $
- * $XdotOrg: xc/programs/xcalc/math.c,v 1.3 2004/05/23 20:03:49 alanc Exp $
- *
+/*
* math.c - mathematics functions for a hand calculator under X
*
* Author: John H. Bradley, University of Pennsylvania
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/xcalc.c new/xcalc-1.0.4/xcalc.c
--- old/xcalc-1.0.3/xcalc.c 2009-10-16 23:38:47.000000000 +0200
+++ new/xcalc-1.0.4/xcalc.c 2010-11-20 20:11:03.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XConsortium: xcalc.c,v 1.16 94/04/17 20:43:31 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
@@ -28,7 +27,6 @@
from the X Consortium.
*/
-/* $XFree86$ */
/*
* xcalc.c - a hand calculator for the X Window system
@@ -234,7 +232,7 @@
static void create_keypad(Widget parent)
{
- static char *Keyboard[] = {
+ static const char *Keyboard[] = {
"button1", "button2", "button3", "button4", "button5",
"button6", "button7", "button8", "button9", "button10",
"button11","button12","button13","button14","button15",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/xcalc.h new/xcalc-1.0.4/xcalc.h
--- old/xcalc-1.0.3/xcalc.h 2009-10-16 23:38:47.000000000 +0200
+++ new/xcalc-1.0.4/xcalc.h 2010-11-20 19:54:55.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XConsortium: xcalc.h,v 1.4 94/04/17 20:43:32 converse Exp $ */
/*
Copyright (c) 1989 X Consortium
@@ -28,7 +27,6 @@
from the X Consortium.
*/
-/* $XFree86$ */
/*
* xcalc.h - symbolic constants for xcalc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xcalc-1.0.3/xcalc.man new/xcalc-1.0.4/xcalc.man
--- old/xcalc-1.0.3/xcalc.man 2009-10-16 23:38:47.000000000 +0200
+++ new/xcalc-1.0.4/xcalc.man 2010-11-20 19:54:55.000000000 +0100
@@ -1,5 +1,3 @@
-.\" $XConsortium: xcalc.man,v 1.10 94/04/17 20:43:32 matt Exp $
-.\" $XdotOrg: $
.\" Copyright (c) 1994 X Consortium
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
@@ -26,7 +24,6 @@
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
.\"
-.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.4 2002/10/12 16:06:46 herrb Exp $
.\"
.de EX \"Begin example
.ne 5
++++++ xeyes-1.1.0.tar.bz2 -> xeyes-1.1.1.tar.bz2 ++++++
++++ 12734 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/COPYING new/xeyes-1.1.1/COPYING
--- old/xeyes-1.1.0/COPYING 2007-02-16 02:46:58.000000000 +0100
+++ new/xeyes-1.1.1/COPYING 2010-11-21 02:24:01.000000000 +0100
@@ -1,12 +1,25 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 1991 X Consortium
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from the X Consortium.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/ChangeLog new/xeyes-1.1.1/ChangeLog
--- old/xeyes-1.1.0/ChangeLog 2009-12-18 15:55:46.000000000 +0100
+++ new/xeyes-1.1.1/ChangeLog 2010-11-25 08:30:19.000000000 +0100
@@ -1,6 +1,109 @@
+commit 72e65631bb3d3bb4f65b5d841ca5d409dff07e20
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Nov 24 23:28:41 2010 -0800
+
+ xeyes 1.1.1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit cf26a29230cd3ccd79fc8c113dab12a47e244f7a
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 17:33:52 2010 -0800
+
+ Make usage message fit into 80-column lines
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f6a9256db2c463f73982c79378b563d92a6ff180
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sat Nov 20 17:24:20 2010 -0800
+
+ Remove trailing whitespace
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 906c634e85111deac379f0a8e664c933d31c97d8
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 23:35:55 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit b24dce8f95cbed1a91a989a783eb1fdd36335bf1
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 23:34:03 2010 -0800
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 34ea83ac16ce3bc55aedd9d8e73e3d4a04bafdcc
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Mon Nov 8 23:31:22 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit a10b0c4b0445a2b4e12916ee0498db533fde86fd
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Nov 8 23:30:16 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit fcda75a70b29e1532a2a5f33058f3882bcad2642
+Author: Jesse Adkins <jesserayadkins(a)gmail.com>
+Date: Tue Sep 28 13:29:49 2010 -0700
+
+ Purge cvs tags.
+
+ Signed-off-by: Jesse Adkins <jesserayadkins(a)gmail.com>
+
+commit 2cbe4f83d4b24794679bda517573f907bb3de710
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Fri Aug 6 09:04:12 2010 -0700
+
+ Fill in COPYING file with copyright notices from source code
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 96a593c4a221db4b31041e01053e907bedd60519
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Feb 11 10:08:06 2010 -0500
+
+ config: move CWARNFLAGS from configure.ac to Makefile.am
+
+ Compiler warning flags should be explicitly set in the makefile
+ rather than being merged with other packages compiler flags.
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
commit a2c8bc28a57474cda77769292aabe1d9f73839a5
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Fri Dec 18 09:44:32 2009 -0500
+Date: Fri Dec 18 09:44:56 2009 -0500
xeyes 1.1.0
@@ -8,7 +111,7 @@
commit e134d57ac54b77269252b7f73f0e84d08ded5212
Author: Gaetan Nadon <memsize(a)videotron.ca>
-Date: Thu Nov 26 09:19:29 2009 -0500
+Date: Thu Nov 26 09:19:53 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
@@ -17,7 +120,7 @@
commit 6e387e3329722dc9a09b481dbd15f441f39aa054
Author: Gaetan Nadon <memsize(a)videotron.ca>
-Date: Wed Oct 28 14:08:44 2009 -0400
+Date: Wed Oct 28 14:09:08 2009 -0400
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
@@ -28,7 +131,7 @@
commit 34ddbb1213cc4c061409cf6e3883683f6ed8dc92
Author: Gaetan Nadon <memsize(a)videotron.ca>
-Date: Tue Oct 27 15:07:00 2009 -0400
+Date: Tue Oct 27 15:07:24 2009 -0400
Deploy the new XORG_DEFAULT_OPTIONS #24242
@@ -38,7 +141,7 @@
commit d1c05b6bb985c00447b3eef598fc6c9b5a95134b
Author: Gaetan Nadon <memsize(a)videotron.ca>
-Date: Mon Oct 26 22:08:14 2009 -0400
+Date: Mon Oct 26 22:08:38 2009 -0400
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
@@ -47,7 +150,7 @@
commit 3195a5dc486e6daa2ed9754ffd7d2e12da7906a2
Author: Gaetan Nadon <memsize(a)videotron.ca>
-Date: Thu Oct 22 12:33:51 2009 -0400
+Date: Thu Oct 22 12:34:15 2009 -0400
.gitignore: use common defaults with custom section # 24239
@@ -57,7 +160,7 @@
commit 6054c8c98d25752492b57b8ad7fd1d3679d23369
Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
-Date: Wed Oct 21 12:46:56 2009 -0700
+Date: Wed Oct 21 12:47:20 2009 -0700
This is not a GNU project, so declare it foreign.
@@ -79,7 +182,7 @@
commit 59a5be39cdbddb070cd4e4758848fd08aa5910a4
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Mon Oct 5 18:07:53 2009 -0400
+Date: Mon Oct 5 18:08:17 2009 -0400
Bump version for second beta release.
@@ -91,7 +194,7 @@
commit 610889785caf41146505458beccc5e3662c233db
Author: Dylan Simon <dylan(a)dylex.net>
-Date: Sun Oct 4 17:41:30 2009 -0400
+Date: Sun Oct 4 17:41:54 2009 -0400
New -distance mapping option
@@ -102,7 +205,7 @@
commit dc0f730a4a49f0e436a0a915955997b07bbf56e0
Author: Dylan Simon <dylan(a)dylex.net>
-Date: Sun Oct 4 17:38:43 2009 -0400
+Date: Sun Oct 4 17:39:07 2009 -0400
Cleanup and simplify calculation and drawing
@@ -120,7 +223,7 @@
commit 7cc3aa8ce30990e12e7b102f61dfcaaf8baa4d16
Author: Dylan Simon <dylan(a)dylex.net>
-Date: Sun Oct 4 17:29:59 2009 -0400
+Date: Sun Oct 4 17:30:23 2009 -0400
Fix excessive redraw bug
@@ -131,7 +234,7 @@
commit 6d9fdcfb076f4c261b071cc5c454c8b9ce560e68
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Sat Oct 3 21:32:48 2009 -0400
+Date: Sat Oct 3 21:33:12 2009 -0400
Bump version for beta release.
@@ -141,7 +244,7 @@
commit 41f604009c3c7b4a3d05311faa649c8152494700
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Sat Oct 3 21:28:35 2009 -0400
+Date: Sat Oct 3 21:28:59 2009 -0400
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
@@ -149,7 +252,7 @@
commit fd754c702c789f15ac1c0241e50dbb23aed354fc
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
-Date: Thu Oct 1 14:53:59 2009 -0700
+Date: Thu Oct 1 14:54:23 2009 -0700
Add README with pointers to mailing lists, bugzilla, & git
@@ -157,7 +260,7 @@
commit 5e825a140f4022b88dd7a1a20a9a01b653f1a95c
Author: Dylan Simon <dylan(a)dylex.net>
-Date: Sun Sep 27 14:44:11 2009 -0400
+Date: Sun Sep 27 14:44:35 2009 -0400
Add xrender support
@@ -170,13 +273,13 @@
commit dbb8401026c421d64a2962e6ac6eb900f6dc141e
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Fri Jul 17 19:21:15 2009 +1000
+Date: Fri Jul 17 19:21:39 2009 +1000
Split drawing code into multiple functions.
commit 85f1441378b47c01aa68dd1479850c4cd1c8eb72
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
-Date: Fri Jul 17 18:41:07 2009 +1000
+Date: Fri Jul 17 18:41:31 2009 +1000
Remove unused NUM_EYES define.
@@ -184,7 +287,7 @@
commit e8bd6bcaf2cbe8306cc9a4821e8ea7a54a7e56a2
Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br>
-Date: Tue Jan 13 17:42:23 2009 -0200
+Date: Tue Jan 13 17:42:47 2009 -0200
Ansification and compile warning fixes.
@@ -193,106 +296,106 @@
commit 7e3208d263050d0ad4502f7d7d7d64d7ec84a4ad
Author: Jeremy Huddleston <jeremyhu(a)freedesktop.org>
-Date: Thu Nov 27 22:46:26 2008 -0800
+Date: Thu Nov 27 22:46:49 2008 -0800
AM_CFLAGS instead of xeyes_CFLAGS to shut automake up
commit 53488fad7ef10ff8c4835bcd497cd3980be38b7a
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Thu Dec 6 16:36:49 2007 -0500
+Date: Thu Dec 6 16:37:12 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
commit ab449267ea2fcae6261e57f42bfb54d2205c470f
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Mon Sep 3 05:50:58 2007 -0400
+Date: Mon Sep 3 05:51:21 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
commit 07dfa4cb3ff0c9a94bea85db0e571fbb2cfe9161
Author: James Cloos <cloos(a)jhcloos.com>
-Date: Thu Aug 23 19:24:22 2007 -0400
+Date: Thu Aug 23 19:24:45 2007 -0400
Rename .cvsignore to .gitignore
commit ecb2095318d7233e8cfa3a58626c31f770be6ee7
Author: Kevin E Martin <kem(a)kem.org>
-Date: Wed Dec 21 02:29:27 2005 +0000
+Date: Wed Dec 21 02:29:49 2005 +0000
Update package version for X11R7 release.
commit 3aae44d6b3c9332f73fbeacb39e9c928a2002164
Author: Adam Jackson <ajax(a)nwnk.net>
-Date: Mon Dec 19 16:22:21 2005 +0000
+Date: Mon Dec 19 16:22:43 2005 +0000
Stub COPYING files
commit 41b039a4861154d82bdd3e6ea1b6697b16205b93
Author: Kevin E Martin <kem(a)kem.org>
-Date: Thu Dec 15 00:23:44 2005 +0000
+Date: Thu Dec 15 00:24:06 2005 +0000
Update package version number for final X11R7 release candidate.
commit bc99738464950416207d43a4a4db970bd0563d56
Author: Kevin E Martin <kem(a)kem.org>
-Date: Tue Dec 6 22:47:59 2005 +0000
+Date: Tue Dec 6 22:48:21 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
commit 266b7244e16ec2f82bdfb1bd346951761e0d27e2
Author: Kevin E Martin <kem(a)kem.org>
-Date: Sat Dec 3 05:48:58 2005 +0000
+Date: Sat Dec 3 05:49:20 2005 +0000
Update package version number for X11R7 RC3 release.
commit 4298a74b61a6aa8ac36b2d820e147e44ab0f5e32
Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
-Date: Mon Nov 28 22:01:19 2005 +0000
+Date: Mon Nov 28 22:01:41 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
commit 69160791a057704e9a83794420d2349ae8bbbe1c
Author: Eric Anholt <anholt(a)freebsd.org>
-Date: Mon Nov 21 10:34:38 2005 +0000
+Date: Mon Nov 21 10:35:00 2005 +0000
Another pass at .cvsignores for apps.
commit ba6118981be2d3a058a08cd1621113cc8e4a42f8
Author: Eric Anholt <anholt(a)freebsd.org>
-Date: Sun Nov 20 22:08:30 2005 +0000
+Date: Sun Nov 20 22:08:52 2005 +0000
Add/improve .cvsignore files for apps.
commit 6772ce855c078b40635ad62f47da741c037e05c5
Author: Kevin E Martin <kem(a)kem.org>
-Date: Wed Oct 19 02:47:31 2005 +0000
+Date: Wed Oct 19 02:47:53 2005 +0000
Update package version number for RC1 release.
commit 8001fd04f2d893e147b3b21fb4702c54e2919b1d
Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
-Date: Mon Oct 17 23:56:00 2005 +0000
+Date: Mon Oct 17 23:56:22 2005 +0000
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
work better with BSD make
commit 1f61a27ce249d94b4be20db22cb84642a4d8a480
Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
-Date: Fri Oct 14 00:25:23 2005 +0000
+Date: Fri Oct 14 00:25:45 2005 +0000
Use sed to fill in variables in man page
commit 79456c023b864e06b3ab3c6c93106772286b10ae
Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
-Date: Mon Aug 1 20:25:07 2005 +0000
+Date: Mon Aug 1 20:25:29 2005 +0000
Install man pages to section 1 instead of section m (Patch from Donnie
Berkholz)
commit 8119360377d17461578cfb26e07c98df6bbe560d
Author: Kevin E Martin <kem(a)kem.org>
-Date: Fri Jul 29 21:22:10 2005 +0000
+Date: Fri Jul 29 21:22:32 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
@@ -306,67 +409,67 @@
commit 9da2af8715937921c718733e309471f565614c99
Author: Kevin E Martin <kem(a)kem.org>
-Date: Thu Jul 28 15:56:50 2005 +0000
+Date: Thu Jul 28 15:57:12 2005 +0000
Fix distcheck for remaining apps
commit ae49bb18f5feab2b70e6faae046bb26058421d61
Author: Adam Jackson <ajax(a)nwnk.net>
-Date: Wed Jul 20 19:31:31 2005 +0000
+Date: Wed Jul 20 19:31:53 2005 +0000
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
commit c903caebf875d510cbd1f720ccc02bd03250d7c6
Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk>
-Date: Fri Jul 1 18:06:56 2005 +0000
+Date: Fri Jul 1 18:07:18 2005 +0000
Xeyes build system
commit 160c9f4f69bb2fd273c6223c7e4c6cda1523757f
Author: Egbert Eich <eich(a)suse.de>
-Date: Fri Apr 23 19:54:25 2004 +0000
+Date: Fri Apr 23 19:54:47 2004 +0000
Merging XORG-CURRENT into trunk
commit 37db892d918e67bb13652d48f76d3da4c67f5d58
Author: Egbert Eich <eich(a)suse.de>
-Date: Sun Mar 14 08:34:58 2004 +0000
+Date: Sun Mar 14 08:35:20 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
commit e1eda60fd5b4634652d0505a13a2516515d8ff88
Author: Egbert Eich <eich(a)suse.de>
-Date: Wed Mar 3 12:12:43 2004 +0000
+Date: Wed Mar 3 12:13:05 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
commit f8eb90ffc747cd45db069212031e1e41c797d378
Author: Egbert Eich <eich(a)suse.de>
-Date: Thu Feb 26 13:36:02 2004 +0000
+Date: Thu Feb 26 13:36:24 2004 +0000
readding XFree86's cvs IDs
commit cd8a87f77a8ee8b4d29c34cc2066a840964fe3b8
Author: Egbert Eich <eich(a)suse.de>
-Date: Thu Feb 26 09:23:45 2004 +0000
+Date: Thu Feb 26 09:24:07 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
commit bd6d337e78c95b6cd3d831f6e6ad44afc6595520
Author: Kaleb Keithley <kaleb(a)freedesktop.org>
-Date: Tue Nov 25 19:28:50 2003 +0000
+Date: Tue Nov 25 19:29:12 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
commit 2d36e110b8dbfa073bd533d7d0c720a4e51339a4
Author: Kaleb Keithley <kaleb(a)freedesktop.org>
-Date: Fri Nov 14 16:49:00 2003 +0000
+Date: Fri Nov 14 16:49:22 2003 +0000
XFree86 4.3.0.1
commit dfc0320568e5237fff45b3f7fb6f332d1bf5e9bf
Author: Kaleb Keithley <kaleb(a)freedesktop.org>
-Date: Fri Nov 14 16:49:00 2003 +0000
+Date: Fri Nov 14 16:49:22 2003 +0000
Initial revision
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/Eyes.c new/xeyes-1.1.1/Eyes.c
--- old/xeyes-1.1.0/Eyes.c 2009-10-06 00:06:17.000000000 +0200
+++ new/xeyes-1.1.1/Eyes.c 2010-11-21 02:24:01.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XConsortium: Eyes.c,v 1.28 94/04/17 20:45:22 eswu Exp $ */
-/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.3 2001/07/25 15:05:21 dawes Exp $ */
/*
Copyright (c) 1991 X Consortium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/Eyes.h new/xeyes-1.1.1/Eyes.h
--- old/xeyes-1.1.0/Eyes.h 2009-10-06 00:06:17.000000000 +0200
+++ new/xeyes-1.1.1/Eyes.h 2010-11-21 02:24:01.000000000 +0100
@@ -1,6 +1,3 @@
-/*
-* $XConsortium: Eyes.h,v 1.7 90/12/01 13:04:51 rws Exp $
-*/
#ifndef _XtEyes_h
#define _XtEyes_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/EyesP.h new/xeyes-1.1.1/EyesP.h
--- old/xeyes-1.1.0/EyesP.h 2009-10-06 00:06:17.000000000 +0200
+++ new/xeyes-1.1.1/EyesP.h 2010-11-21 02:24:01.000000000 +0100
@@ -1,6 +1,3 @@
-/*
-* $XConsortium: EyesP.h,v 1.9 90/12/01 13:04:43 rws Exp $
-*/
#ifndef _EyesP_h
#define _EyesP_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/INSTALL new/xeyes-1.1.1/INSTALL
--- old/xeyes-1.1.0/INSTALL 2009-12-18 15:55:46.000000000 +0100
+++ new/xeyes-1.1.1/INSTALL 2010-11-25 08:30:19.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/Makefile.am new/xeyes-1.1.1/Makefile.am
--- old/xeyes-1.1.0/Makefile.am 2009-11-29 19:08:25.000000000 +0100
+++ new/xeyes-1.1.1/Makefile.am 2010-11-21 02:24:01.000000000 +0100
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -21,8 +21,8 @@
bin_PROGRAMS = xeyes
-AM_CFLAGS = $(XEYES_CFLAGS)
-xeyes_LDADD = $(XEYES_LIBS) -lm
+AM_CFLAGS = $(XEYES_CFLAGS) $(XRENDER_CFLAGS) $(CWARNFLAGS)
+xeyes_LDADD = $(XEYES_LIBS) $(XRENDER_LIBS) -lm
xeyes_SOURCES = \
Eyes.c \
@@ -45,27 +45,9 @@
MAINTAINERCLEANFILES = ChangeLog INSTALL
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/config.h.in new/xeyes-1.1.1/config.h.in
--- old/xeyes-1.1.0/config.h.in 2009-12-18 15:48:48.000000000 +0100
+++ new/xeyes-1.1.1/config.h.in 2010-11-25 08:29:02.000000000 +0100
@@ -42,6 +42,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/configure.ac new/xeyes-1.1.1/configure.ac
--- old/xeyes-1.1.0/configure.ac 2009-12-18 15:44:52.000000000 +0100
+++ new/xeyes-1.1.1/configure.ac 2010-11-25 08:28:18.000000000 +0100
@@ -1,6 +1,6 @@
dnl Copyright 2005 Red Hat, Inc.
-dnl
+dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
dnl specific, written prior permission. Red Hat makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
-dnl
+dnl
dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -21,35 +21,30 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(xeyes,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xeyes)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([xeyes], [1.1.1],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xeyes])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
-
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
-
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(XEYES, x11 xt xext xmu)
-XEYES_CFLAGS="$CWARNFLAGS $XEYES_CFLAGS"
-AC_SUBST(XEYES_CFLAGS)
-AC_SUBST(XEYES_LIBS)
dnl Optional dependencies
AC_ARG_WITH(xrender, AC_HELP_STRING([--with-xrender],[Use Xrender for rendering (Default is YES)]),use_xrender="$withval",use_xrender="try")
if test x$use_xrender != xno ; then
PKG_CHECK_MODULES(XRENDER, [xrender >= 0.4])
- XEYES_CFLAGS="$XEYES_CFLAGS $XRENDER_CFLAGS"
- XEYES_LIBS="$XEYES_LIBS $XRENDER_LIBS"
AC_DEFINE([XRENDER],1,[Define to use X Render Extension])
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/transform.c new/xeyes-1.1.1/transform.c
--- old/xeyes-1.1.0/transform.c 2009-09-27 20:56:00.000000000 +0200
+++ new/xeyes-1.1.1/transform.c 2010-11-21 02:24:01.000000000 +0100
@@ -1,7 +1,6 @@
/*
* transformed coordinate system objects for X
*/
-/* $XFree86: xc/programs/xeyes/transform.c,v 1.3 2000/02/17 14:00:35 dawes Exp $ */
# include <X11/Xos.h>
# include <stdlib.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/transform.h new/xeyes-1.1.1/transform.h
--- old/xeyes-1.1.0/transform.h 2009-09-27 20:56:00.000000000 +0200
+++ new/xeyes-1.1.1/transform.h 2010-11-21 02:24:01.000000000 +0100
@@ -2,7 +2,6 @@
* header file for transformed coordinate system. No rotations
* supported, as elipses cannot be rotated in X.
*/
-/* $XFree86$ */
typedef struct _transform {
double mx, bx;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/xeyes.c new/xeyes-1.1.1/xeyes.c
--- old/xeyes-1.1.0/xeyes.c 2009-10-06 00:06:17.000000000 +0200
+++ new/xeyes-1.1.1/xeyes.c 2010-11-21 02:28:18.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XConsortium: xeyes.c,v 1.16 94/04/17 20:45:23 rws Exp $ */
/*
Copyright (c) 1991 X Consortium
@@ -28,7 +27,6 @@
from the X Consortium.
*/
-/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.3 2000/02/17 14:00:35 dawes Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -38,8 +36,8 @@
#include <X11/StringDefs.h>
#include <X11/Shell.h>
#include "Eyes.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
#include "eyes.bit"
#include "eyesmask.bit"
@@ -49,18 +47,15 @@
usage(void)
{
fprintf(stderr,
-"usage: xeyes\n");
- fprintf (stderr,
-" [-geometry [{width}][x{height}][{+-}{xoff}[{+-}{yoff}]]] [-display [{host}]:[{vs}]]\n");
- fprintf(stderr,
-" [-fg {color}] [-bg {color}] [-bd {color}] [-bw {pixels}]");
- fprintf(stderr, " [-shape | +shape]");
- fprintf(stderr, "\n");
- fprintf(stderr,
-" [-outline {color}] [-center {color}] [-backing {backing-store}] [-distance]\n");
+ "usage: xeyes\n"
+ " [-display [{host}]:[{vs}]]\n"
+ " [-geometry [{width}][x{height}][{+-}{xoff}[{+-}{yoff}]]]\n"
+ " [-fg {color}] [-bg {color}] [-bd {color}] [-bw {pixels}]\n"
+ " [-shape | +shape] [-outline {color}] [-center {color}]\n"
+ " [-backing {backing-store}] [-distance]\n");
#ifdef XRENDER
fprintf(stderr,
-" [-render | +render]\n");
+ " [-render | +render]\n");
#endif
exit(1);
}
@@ -87,7 +82,7 @@
static void
quit(Widget w, XEvent *event, String *params, Cardinal *num_params)
{
- if (event->type == ClientMessage &&
+ if (event->type == ClientMessage &&
event->xclient.data.l[0] != wm_delete_window) {
XBell(XtDisplay(w), 0);
} else {
@@ -107,10 +102,10 @@
Widget toplevel;
Arg arg[2];
Cardinal i;
-
+
XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
- toplevel = XtAppInitialize(&app_context, "XEyes",
+ toplevel = XtAppInitialize(&app_context, "XEyes",
options, XtNumber(options), &argc, argv,
NULL, arg, (Cardinal) 0);
if (argc != 1) usage();
@@ -120,14 +115,14 @@
XtAppAddActions(app_context, actions, XtNumber(actions));
XtOverrideTranslations
(toplevel, XtParseTranslationTable ("<Message>WM_PROTOCOLS: quit()"));
-
+
i = 0;
- XtSetArg (arg[i], XtNiconPixmap,
+ XtSetArg (arg[i], XtNiconPixmap,
XCreateBitmapFromData (XtDisplay(toplevel),
XtScreen(toplevel)->root,
(char *)eyes_bits, eyes_width, eyes_height));
i++;
- XtSetArg (arg[i], XtNiconMask,
+ XtSetArg (arg[i], XtNiconMask,
XCreateBitmapFromData (XtDisplay(toplevel),
XtScreen(toplevel)->root,
(char *)eyesmask_bits,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xeyes-1.1.0/xeyes.man new/xeyes-1.1.1/xeyes.man
--- old/xeyes-1.1.0/xeyes.man 2009-10-06 00:06:18.000000000 +0200
+++ new/xeyes-1.1.1/xeyes.man 2010-11-21 02:24:01.000000000 +0100
@@ -1,7 +1,3 @@
-.\" $XConsortium: xeyes.man,v 1.12 94/04/17 20:45:24 gildea Exp $
-.\"
-.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.3 2001/01/27 18:21:12 dawes Exp $
-.\"
.TH XEYES 1 __xorgversion__
.SH NAME
xeyes \- a follow the mouse X demo
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package gnome-patch-translation for openSUSE:Factory
checked in at Fri Nov 26 16:39:22 CET 2010.
--------
--- GNOME/gnome-patch-translation/gnome-patch-translation.changes 2010-09-07 17:02:39.000000000 +0200
+++ gnome-patch-translation/gnome-patch-translation.changes 2010-11-24 15:53:33.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 24 14:15:51 CET 2010 - sbrabec(a)suse.cz
+
+- Updated fi.
+- Updated for the latest Factory.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-patch-translation.spec ++++++
--- /var/tmp/diff_new_pack.qWgBv0/_old 2010-11-26 16:37:06.000000000 +0100
+++ /var/tmp/diff_new_pack.qWgBv0/_new 2010-11-26 16:37:06.000000000 +0100
@@ -23,7 +23,7 @@
Group: System/GUI/GNOME
AutoReqProv: on
Version: 11.3
-Release: 6
+Release: 7
Summary: Collect and Merge Translations From RPM Patches
Source: gnome-patch-translation-files.tar.bz2
Source1: gnome-patch-translation.tar.bz2
++++++ HEADER.pot ++++++
--- /var/tmp/diff_new_pack.qWgBv0/_old 2010-11-26 16:37:06.000000000 +0100
+++ /var/tmp/diff_new_pack.qWgBv0/_new 2010-11-26 16:37:06.000000000 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
++++++ gnome-patch-translation-files.tar.bz2 ++++++
++++ 17582 lines of diff (skipped)
++++++ gnome-patch-translation.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/af.po new/gnome-patch-translation/af.po
--- old/gnome-patch-translation/af.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/af.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2006-11-03 14:26\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -70,11 +70,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ar.po new/gnome-patch-translation/ar.po
--- old/gnome-patch-translation/ar.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ar.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2007-01-03 15:37:16+CET\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -69,11 +69,11 @@
msgstr ""
"إذا كان من الضروري عرض رسالة معلومات عند العودة من وضع السكون في وضع خمول."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "عاد النظام إلى العمل من وضع السكون"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "تحول النظام تلقائيًا إلى وضع السكون نظرًا لأن النظام كان في وضع الخمول."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/bn.po new/gnome-patch-translation/bn.po
--- old/gnome-patch-translation/bn.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/bn.po 2010-11-24 15:46:25.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "প্রোফাইলের তথ্য অনুমান করা হলে সূচনাবার্তা প্রদর্শন করা হবে।"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ca.po new/gnome-patch-translation/ca.po
--- old/gnome-patch-translation/ca.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ca.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2007-03-08 09:06+0100\n"
"Last-Translator: espe <ehumet(a)idisc.es>\n"
"Language-Team: ca <i18n(a)suse.de>\n"
@@ -73,11 +73,11 @@
"Si s'ha de mostrar una notificació quan les dades del perfil han estat "
"estimades."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/cs.po new/gnome-patch-translation/cs.po
--- old/gnome-patch-translation/cs.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/cs.po 2010-11-24 15:46:25.000000000 +0100
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-05-30 11:12+0200\n"
"Last-Translator: Vojtěch Zeisek <Vojtech.Zeisek(a)opensuse.org>\n"
"Language-Team: Czech <opensuse-translation(a)opensuse.org>\n"
@@ -76,11 +76,11 @@
"Zda má být při návratu z režimu spánku při nečinnosti zobrazena informační "
"zpráva."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Systém byl obnoven z režimu spánku."
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Systém automaticky přešel do režimu spánku, protože byl nečinný."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/da.po new/gnome-patch-translation/da.po
--- old/gnome-patch-translation/da.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/da.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-05-27 16:38+0200\n"
"Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n"
"Language-Team: Danish <opensuse-translation(a)opensuse.org>\n"
@@ -70,11 +70,11 @@
"Om en informationsmeddelelse skal vises når der vendes tilbage fra inaktiv "
"søvn."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "System genoptaget fra at sove"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Systemet blev automatisk sat til at sove fordi systemet var inaktivt."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/de.po new/gnome-patch-translation/de.po
--- old/gnome-patch-translation/de.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/de.po 2010-11-24 15:46:25.000000000 +0100
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-07-03 01:07+0200\n"
"Last-Translator: Tilman Schmidt <tilman(a)imap.cc>\n"
"Language-Team: German <kde-i18n-de(a)kde.org>\n"
@@ -77,11 +77,11 @@
"Hiermit wird festgelegt, ob bei der Rückkehr aus dem Energiesparmodus "
"(Leerlauf) eine informative Meldung ausgegeben werden soll."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "System aus Ruhezustand zurückgeholt"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"Das System wurde automatisch in den Ruhezustand versetzt, da es sich im "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/el.po new/gnome-patch-translation/el.po
--- old/gnome-patch-translation/el.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/el.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2008-06-06 01:04+0100\n"
"Last-Translator: Vasileios Giannakopoulos <billg(a)billg.gr>\n"
"Language-Team: Ελληνικά <billg(a)billg.gr>\n"
@@ -74,11 +74,11 @@
"Αν θα εμφανίζεται μήνυμα ειδοποίησης όταν ολοκληρώνεται η φόρτιση της "
"μπαταρίας."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/es.po new/gnome-patch-translation/es.po
--- old/gnome-patch-translation/es.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/es.po 2010-11-24 15:46:25.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-03-26 12:05-0300\n"
"Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n"
"Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n"
@@ -72,11 +72,11 @@
"Indica si se debe mostrar un mensaje de información al volver del modo de "
"reposo por inactividad."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Se ha recuperado el sistema del modo de reposo"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"El sistema ha entrado en reposo automáticamente porque estaba inactivo."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/et.po new/gnome-patch-translation/et.po
--- old/gnome-patch-translation/et.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/et.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2007-10-04 23:36+0300\n"
"Last-Translator: Ain Vagula <avagula(a)gmail.com>\n"
"Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n"
@@ -75,11 +75,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Kas aku täislaetuse korral tuleks näidata teadet."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/fi.po new/gnome-patch-translation/fi.po
--- old/gnome-patch-translation/fi.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/fi.po 2010-11-24 15:46:25.000000000 +0100
@@ -18,14 +18,15 @@
# Jan-Olof Eriksson <jan-olof.eriksson(a)opensuse.fi>, 2009.
# Tommi Nieminen <translator(a)legisign.org>, 2010.
# Harri Miettinen <harri.miettinen(a)opensuse.fi>, 2010.
+# Katariina Kemppainen <katariina07(a)yahoo.se>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: gnome-patch-translation.fi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
-"PO-Revision-Date: 2010-05-30 19:33+0300\n"
-"Last-Translator: Harri Miettinen <harri.miettinen(a)opensuse.fi>\n"
-"Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
+"PO-Revision-Date: 2010-09-26 16:41+0300\n"
+"Last-Translator: Katariina Kemppainen <katariina07(a)yahoo.se>\n"
+"Language-Team: Finnish <opensuse-fi(a)opensuse.fi>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +63,7 @@
#: gnome-control-center-2.0/shell/control-center.c:44
msgid "Open Administrator Settings"
-msgstr "Avaa ylläpitäjän asetukset"
+msgstr "Avaa ylläpitäjälle tarkoitetut asetukset"
#: gnome-panel-2.0/gnome-panel/panel-addto.c:141
msgid "Traditional Main Menu"
@@ -71,7 +72,7 @@
# gnome-panel/menu.c:277
#: gnome-panel-2.0/gnome-panel/panel-addto.c:142
msgid "The traditional GNOME menu"
-msgstr "Perinteinen Gnomen päävalikko"
+msgstr "Perinteinen GNOME-päävalikko"
#: gnome-panel-2.0/gnome-panel/panel-recent.c:54
#, c-format
@@ -83,11 +84,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Näytetäänkö huomautusviesti, kun palataan lepotilasta."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Järjestelmä palautettu lepotilasta"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Järjestelmä meni automaattisesti lepotilaan, koska se oli vapaana."
@@ -207,7 +208,7 @@
" create a User Account and use that to login.\n"
msgstr ""
"* IRC-ohjelmia ei tule ikinä ajaa pääkäyttäjänä!\n"
-" Luo tavallinen käyttäjätunnus ja kirjaudu sisään sitä käyttäen.\n"
+" Luo tavallinen käyttäjätunnus ja kirjaudu sisään käyttäen sitä.\n"
#: xchat/src/fe-gtk/setup.c:252
msgid "Open an extra tab for outgoing msg"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/fr.po new/gnome-patch-translation/fr.po
--- old/gnome-patch-translation/fr.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/fr.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-06-03 21:20+0100\n"
"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n"
"Language-Team: French <opensuse-fr(a)opensuse.org>\n"
@@ -67,11 +67,11 @@
"Si un message d'information doit être affiché lors du retour du sommeil "
"inactif."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Reprise du système après la mise en sommeil"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Le système est entré en sommeil automatiquement car il était inactif."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/gl.po new/gnome-patch-translation/gl.po
--- old/gnome-patch-translation/gl.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/gl.po 2010-11-24 15:46:25.000000000 +0100
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-06-07 18:23+0200\n"
"Last-Translator: Manuel A. Vazquez <xixirei(a)yahoo.es>\n"
"Language-Team: Galician <proxecto(a)trasno.net>\n"
@@ -71,11 +71,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Se debe amosar unha mensaxe informativa ao retornar da inactividade."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "O sistema continuou a partires da inactividade"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "O sistema repousou automaticamente por estar inactivo."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/gu.po new/gnome-patch-translation/gu.po
--- old/gnome-patch-translation/gu.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/gu.po 2010-11-24 15:46:25.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2006-11-11 18:41+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n"
@@ -68,11 +68,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "જ્યારે બેટરી સંપૂર્ણપણે ભારિત થઈ જાય ત્યારે શું સૂચન સંદેશો દર્શાવવામાં આવવો જોઈએ."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/hi.po new/gnome-patch-translation/hi.po
--- old/gnome-patch-translation/hi.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/hi.po 2010-11-24 15:46:25.000000000 +0100
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2007-08-24 22:37+0530\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
@@ -68,11 +68,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "क्या एक सूचना संदेश को दिखाया जाना चाहिए बैटरी के पूरी तरह चार्ज होने पर."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/hr.po new/gnome-patch-translation/hr.po
--- old/gnome-patch-translation/hr.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/hr.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2009-07-20 17:19+0200\n"
"Last-Translator: Krešimir Jozić <kjozic(a)gmail.com>\n"
"Language-Team: Croatian <hr(a)li.org>\n"
@@ -71,11 +71,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/hu.po new/gnome-patch-translation/hu.po
--- old/gnome-patch-translation/hu.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/hu.po 2010-11-24 15:46:25.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-04-09 23:20+0200\n"
"Last-Translator: kalman <kkemenczy(a)gmail.com>\n"
"Language-Team: Hungarian <kde-i18n-doc(a)kde.org>\n"
@@ -72,11 +72,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Megjelenjen-e értesítő üzenet ha energiatakarékos módból tér vissza."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "A rendszer felfüggesztett módból indult el"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "A rendszer automatikusan tétlenségből felfüggesztett módba váltott."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/it.po new/gnome-patch-translation/it.po
--- old/gnome-patch-translation/it.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/it.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-05-27 16:39+0100\n"
"Last-Translator: Andrea Florio <andrea(a)opensuse.org>\n"
"Language-Team: italiano <translations(a)opensuse.org>\n"
@@ -73,11 +73,11 @@
"Specifica se deve essere visualizzato un messaggio informativo "
"successivamente a un periodo di inattività."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Riattivazione del sistema dallo stato di sospensione"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"Sospensione automatica del sistema a causa del precedente stato di "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ja.po new/gnome-patch-translation/ja.po
--- old/gnome-patch-translation/ja.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ja.po 2010-11-24 15:46:25.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-03-10 14:52+0900\n"
"Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n"
"Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n"
@@ -67,11 +67,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "アイドルスリープから戻ったときに情報メッセージを表示するかどうか。"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "システムはスリープから再開しました"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "システムはアイドル状態であったため、自動的にスリープしました。"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/km.po new/gnome-patch-translation/km.po
--- old/gnome-patch-translation/km.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/km.po 2010-11-24 15:46:25.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-05-28 08:08+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n"
"Language-Team: Khmer <support(a)khmeros.info>\n"
@@ -66,11 +66,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "ប្រសិនបើសារព័ត៌មានគួរត្រូវបានបង្ហាញ នៅពេលត្រឡប់ពីទំនេរ ។"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "ប្រព័ន្ធបានបន្តពីការដេក"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "ប្រព័ន្ធដេកដោយស្វ័យប្រវត្តិ ពីព្រោះប្រព័ន្ធទំនេរ ។"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ko.po new/gnome-patch-translation/ko.po
--- old/gnome-patch-translation/ko.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ko.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.ko\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2009-10-23 02:09+0900\n"
"Last-Translator: Yunseok Choi <xein(a)naver.com>\n"
"Language-Team: Korean <xein(a)naver.com>\n"
@@ -70,11 +70,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "정보 메시지를 유휴 절전 모드에서 돌아올 때 표시할 경우 "
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "시스템이 절전 모드에서 다시 시작되었습니다."
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "시스템이 유휴 상태이므로 자동으로 절전 상태로 변경되었습니다."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/lt.po new/gnome-patch-translation/lt.po
--- old/gnome-patch-translation/lt.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/lt.po 2010-11-24 15:46:25.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-07-23 19:59+0300\n"
"Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n"
"Language-Team: lietuvių\n"
@@ -67,11 +67,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Ar rodyti pranešimą grįžus iš laisvo miego."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Sistema pabudo"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Sistema automatiškai užmigo, nes sistema buvo laisva."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/mr.po new/gnome-patch-translation/mr.po
--- old/gnome-patch-translation/mr.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/mr.po 2010-11-24 15:46:25.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2004-08-09 10:24+0200\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n"
@@ -68,11 +68,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "बॅटरी पूर्णतया चार्ज असल्यावर सूचना संदेश दर्शविले पाहिजे का."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/nb.po new/gnome-patch-translation/nb.po
--- old/gnome-patch-translation/nb.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/nb.po 2010-11-24 15:46:25.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.nb_no\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-03-09 20:00+0200\n"
"Last-Translator: Olav Pettershagen <olav.pet(a)gmail.com>\n"
"Language-Team: Norwegian Bokmål <opensuse-translation(a)opensuse.org>\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Om en informasjonsmelding skal vises når dvalemodus opphører"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "System ikke lenger i dvalemodus"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Systemet gikk automatisk til dvalemodus fordi systemet var inaktivt."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/nl.po new/gnome-patch-translation/nl.po
--- old/gnome-patch-translation/nl.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/nl.po 2010-11-24 15:46:25.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-03-18 13:04+0100\n"
"Last-Translator: Freek de Kruijf <freek(a)opensuse.org>\n"
"Language-Team: Dutch <yast-nl-l10n(a)lists.sf.kovoks.nl>\n"
@@ -69,11 +69,11 @@
"Als een informatiebericht moet worden weergegeven na activeren uit "
"slaapmodus."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Systeem wordt voortgezet vanuit slaapstand"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"Het systeem is automatisch in de slaapstand gezet omdat het systeem inactief "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/pa.po new/gnome-patch-translation/pa.po
--- old/gnome-patch-translation/pa.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/pa.po 2010-11-24 15:46:25.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2008-11-23 07:47+0530\n"
"Last-Translator: KDB <brar.kd(a)gmail.com>\n"
"Language-Team: Panjabi <punjabi-l10n(a)list.sf.net>\n"
@@ -72,11 +72,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "ਕੀ ਪ੍ਰੋਫਾਇਲ ਡਾਟਾ ਬੁੱਝਣ ਸਮੇਂ ਇੱਕ ਸੂਚਨਾ ਸੁਨੇਹਾ ਵੇਖਾਇਆ ਜਾਵੇ।"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/pl.po new/gnome-patch-translation/pl.po
--- old/gnome-patch-translation/pl.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/pl.po 2010-11-24 15:46:25.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-06-08 00:29+0200\n"
"Last-Translator: Karol Kozioł <7c0.000(a)gmail.com>\n"
"Language-Team: Polish <kde-i18n-doc(a)kde.org>\n"
@@ -70,11 +70,11 @@
"Komunikat informacyjny powinien być wyświetlony podczas powrotu ze stanu "
"uśpienia."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "System przywrócony ze stanu uśpienia"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"System został automatycznie uśpiony, ponieważ nie wykazywał aktywności."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/pt.po new/gnome-patch-translation/pt.po
--- old/gnome-patch-translation/pt.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/pt.po 2010-11-24 15:46:25.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2008-04-21 22:05+0100\n"
"Last-Translator: Antonio Cardoso Martins <digiplan.pt(a)gmail.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
@@ -75,11 +75,11 @@
"Se uma mensagem de notificação deverá ser apresentada quando os dados de "
"perfil forem inferidos."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/pt_BR.po new/gnome-patch-translation/pt_BR.po
--- old/gnome-patch-translation/pt_BR.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/pt_BR.po 2010-11-24 15:46:25.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-05-27 13:51-0300\n"
"Last-Translator: Isis Binder <isis.binder(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-doc(a)lists.kde.org>\n"
@@ -72,11 +72,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Se uma mensagem informativa deve ser exibida ao retornar do repouso."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "O sistema continuou a partir do repouso"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "O sistema adormeceu automaticamente por estar ocioso."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ro.po new/gnome-patch-translation/ro.po
--- old/gnome-patch-translation/ro.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ro.po 2010-11-24 15:46:25.000000000 +0100
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: openSUSE\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-04-30 16:32+0300\n"
"Last-Translator: Lucian Oprea <oprea.luci(a)gmail.com>\n"
"Language-Team: Comunitatea traducatorilor openSUSE Romania. Contact: <oprea."
@@ -66,11 +66,11 @@
msgstr ""
"Un mesaj de informare ar trebui să fie afişat la întoarcerea din inactivare."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Sistemul a pornit din inactivare"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Sistemul s-a inactivat automat, deoarece nu a fost utilizat."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ru.po new/gnome-patch-translation/ru.po
--- old/gnome-patch-translation/ru.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ru.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-04-10 20:32+0300\n"
"Last-Translator: Alexander Melentiev <alex239(a)gmail.com>\n"
"Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Нужно ли показывать информационное сообщение при выходе из режима сна."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Система восстановлена из режима сна"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Система автоматически перешла в режим сна из-за простоя."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/sk.po new/gnome-patch-translation/sk.po
--- old/gnome-patch-translation/sk.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/sk.po 2010-11-24 15:46:25.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.sk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-05-30 13:31+0100\n"
"Last-Translator: Rastislav Krupanský <rastislav.krupansky(a)gmail.com>\n"
"Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n"
@@ -71,11 +71,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Či by mala byť zobrazená správa pri návrate zo spánku."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Systém obnovený zo spánku"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "Systém sa automaticky uspal, pretože bol nečinný."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/sl.po new/gnome-patch-translation/sl.po
--- old/gnome-patch-translation/sl.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/sl.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2007-01-03 15:37:30+CET\n"
"Last-Translator: sl <i18n(a)suse.de>\n"
"Language-Team: sl <i18n(a)suse.de>\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Ali naj se prikaže obvestilo med ugibanjem podatkov profila?"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/sv.po new/gnome-patch-translation/sv.po
--- old/gnome-patch-translation/sv.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/sv.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2008-11-08 10:49+0100\n"
"Last-Translator: Jonas Björk <jonas(a)jonasbjork.net>\n"
"Language-Team: Swedish <sv(a)li.org>\n"
@@ -70,11 +70,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Om ett informationsmeddelande ska visas vid återgång från viloläge."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Datorn återgår från viloläge"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"Datorn försattes automatiskt i viloläge eftersom systemet var inaktivt."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/ta.po new/gnome-patch-translation/ta.po
--- old/gnome-patch-translation/ta.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/ta.po 2010-11-24 15:46:25.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2006-11-11 18:41+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n"
@@ -68,11 +68,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "மின்கலம் முழு ஏற்றத்துடன் இருப்பின் அறிவிப்பு செய்தி காட்ட வேண்டுமா"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/uk.po new/gnome-patch-translation/uk.po
--- old/gnome-patch-translation/uk.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/uk.po 2010-11-24 15:46:25.000000000 +0100
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-04-25 22:26-0700\n"
"Last-Translator: I. Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n"
"Language-Team: Ukrainian <kde-i18n-doc(a)kde.org>\n"
@@ -72,11 +72,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "Чи відображатиметься повідомлення про повний заряд акумулятора."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/wa.po new/gnome-patch-translation/wa.po
--- old/gnome-patch-translation/wa.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/wa.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2010-06-06 22:18+0100\n"
"Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n"
"Language-Team: Walloon <linux-wa(a)walon.org>\n"
@@ -67,11 +67,11 @@
"S' on dvreut håyner on messaedje d' informåcion cwand on rtoûne do soumey "
"innactif."
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "Li sistinme a rvinou di s' soumey"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
"Li sistinme s' a edoirmou otomaticmint pask' el sistinme esteut inactif."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/xh.po new/gnome-patch-translation/xh.po
--- old/gnome-patch-translation/xh.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/xh.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2005-07-27 11:49+0200\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/zh_CN.po new/gnome-patch-translation/zh_CN.po
--- old/gnome-patch-translation/zh_CN.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/zh_CN.po 2010-11-24 15:46:25.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2008-11-24 22:53+0800\n"
"Last-Translator: Thruth Wang <wanglihao(a)gmail.com>\n"
"Language-Team: Simplified Chinese\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "从空闲休眠状态返回时是否显示参考消息。"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "系统从休眠模式继续"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "由于系统空闲,因此系统自动进入休眠状态。"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/zh_TW.po new/gnome-patch-translation/zh_TW.po
--- old/gnome-patch-translation/zh_TW.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/zh_TW.po 2010-11-24 15:46:25.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2009-09-18 21:38+0800\n"
"Last-Translator: swyear <swyear(a)gmail.com>\n"
"Language-Team: Chinese Traditional <zh(a)li.org>\n"
@@ -71,11 +71,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr "當從閑置睡眠狀態返回時應顯示資訊訊息。"
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr "系統已從睡眠狀態恢復"
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr "因為系統處於閑置狀態,將自動進入睡眠狀態。"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-patch-translation/zu.po new/gnome-patch-translation/zu.po
--- old/gnome-patch-translation/zu.po 2010-09-07 16:58:11.000000000 +0200
+++ new/gnome-patch-translation/zu.po 2010-11-24 15:46:25.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gnome-patch-translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-06 20:01+0200\n"
+"POT-Creation-Date: 2010-11-24 15:44+0100\n"
"PO-Revision-Date: 2005-07-27 11:49+0200\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -69,11 +69,11 @@
"If an information message should be displayed when returning from idle sleep."
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:737
+#: gnome-power-manager/src/gpm-manager.c:742
msgid "System resumed from sleep"
msgstr ""
-#: gnome-power-manager/src/gpm-manager.c:738
+#: gnome-power-manager/src/gpm-manager.c:743
msgid "The system automatically went to sleep because the system was idle."
msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package fontconfig for openSUSE:Factory
checked in at Fri Nov 26 16:36:55 CET 2010.
--------
--- fontconfig/fontconfig.changes 2010-11-11 14:51:21.000000000 +0100
+++ fontconfig/fontconfig.changes 2010-11-25 13:16:34.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 25 13:15:08 CET 2010 - pgajdos(a)suse.cz
+
+- <prefer> "Liberation Mono" instead of "Liberation Sans" in
+ monospace <family>
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fontconfig.spec ++++++
--- /var/tmp/diff_new_pack.D4CdLf/_old 2010-11-26 16:36:43.000000000 +0100
+++ /var/tmp/diff_new_pack.D4CdLf/_new 2010-11-26 16:36:43.000000000 +0100
@@ -35,7 +35,7 @@
%endif
Requires: bash
Version: 2.8.0
-Release: 11
+Release: 12
Summary: Library for Font Configuration
# CVS can be found here: (CVS is gone, fontconfig uses git now).
# $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
++++++ suse-post-user.conf ++++++
--- /var/tmp/diff_new_pack.D4CdLf/_old 2010-11-26 16:36:43.000000000 +0100
+++ /var/tmp/diff_new_pack.D4CdLf/_new 2010-11-26 16:36:43.000000000 +0100
@@ -109,7 +109,7 @@
<family>Consolas</family>
<family>Andale Mono</family>
<family>DejaVu Sans Mono</family>
- <family>Liberation Sans</family>
+ <family>Liberation Mono</family>
<family>SUSE Sans Mono</family>
<family>Bitstream Vera Sans Mono</family>
<family>Courier New</family>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0