May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-update
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-update checked in at Fri May 26 15:48:19 CEST 2006. -------- --- yast2-update/yast2-update.changes 2006-05-11 09:04:21.000000000 +0200 +++ yast2-update/yast2-update.changes 2006-05-25 13:34:37.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 25 13:15:54 CEST 2006 - jsrain(a)suse.cz + +- fixed keeping locked packages during upgrade (#177469) +- 2.13.29 + +------------------------------------------------------------------- +Mon May 22 12:22:35 CEST 2006 - jsrain(a)suse.cz + +- do not delete unmaintained packages if not wanted by user + (#176788) +- 2.13.28 + +------------------------------------------------------------------- Old: ---- yast2-update-2.13.27.tar.bz2 New: ---- yast2-update-2.13.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.aKERUg/_old 2006-05-26 15:48:05.000000000 +0200 +++ /var/tmp/diff_new_pack.aKERUg/_new 2006-05-26 15:48:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.13.27) +# spec file for package yast2-update (Version 2.13.29) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-update -Version: 2.13.27 -Release: 2 +Version: 2.13.29 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.13.27.tar.bz2 +Source0: yast2-update-2.13.29.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml Requires: yast2 yast2-installation yast2-storage yast2-packager @@ -39,7 +39,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-update-2.13.27 +%setup -n yast2-update-2.13.29 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,13 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog -n yast2-update +* Thu May 25 2006 - jsrain(a)suse.cz +- fixed keeping locked packages during upgrade (#177469) +- 2.13.29 +* Mon May 22 2006 - jsrain(a)suse.cz +- do not delete unmaintained packages if not wanted by user + (#176788) +- 2.13.28 * Thu May 11 2006 - jsrain(a)suse.cz - preselect patterns specified in the content file (#168297) - 2.13.27 ++++++ yast2-update-2.13.27.tar.bz2 -> yast2-update-2.13.29.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/VERSION new/yast2-update-2.13.29/VERSION --- old/yast2-update-2.13.27/VERSION 2006-05-11 09:00:16.000000000 +0200 +++ new/yast2-update-2.13.29/VERSION 2006-05-25 13:20:20.000000000 +0200 @@ -1 +1 @@ -2.13.27 +2.13.29 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/configure new/yast2-update-2.13.29/configure --- old/yast2-update-2.13.27/configure 2006-05-11 09:04:00.000000000 +0200 +++ new/yast2-update-2.13.29/configure 2006-05-25 13:33:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-update 2.13.27. +# Generated by GNU Autoconf 2.59 for yast2-update 2.13.29. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.13.27' -PACKAGE_STRING='yast2-update 2.13.27' +PACKAGE_VERSION='2.13.29' +PACKAGE_STRING='yast2-update 2.13.29' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-update 2.13.27 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.13.29 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.13.27:";; + short | recursive ) echo "Configuration of yast2-update 2.13.29:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.13.27 +yast2-update configure 2.13.29 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.13.27, which was +It was created by yast2-update $as_me 2.13.29, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.13.27' + VERSION='2.13.29' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.27" +VERSION="2.13.29" RPMNAME="yast2-update" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-update $as_me 2.13.27, which was +This file was extended by yast2-update $as_me 2.13.29, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.13.27 +yast2-update config.status 2.13.29 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/configure.in new/yast2-update-2.13.29/configure.in --- old/yast2-update-2.13.27/configure.in 2006-05-11 09:03:56.000000000 +0200 +++ new/yast2-update-2.13.29/configure.in 2006-05-25 13:33:06.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.13.27, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.13.29, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.27" +VERSION="2.13.29" RPMNAME="yast2-update" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/kernel-update-tool.pot new/yast2-update-2.13.29/kernel-update-tool.pot --- old/yast2-update-2.13.27/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.13.29/kernel-update-tool.pot 2006-05-12 12:36:43.000000000 +0200 @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-05-12 12:36+0200\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/clients/kernel-update.ycp:188 +msgid "Warning" +msgstr "" + +#: src/clients/kernel-update.ycp:189 +msgid "Abort the kernel upgrade?" +msgstr "" + +#: src/clients/kernel-update.ycp:246 +msgid "Alternate Download Location" +msgstr "" + +#: src/clients/kernel-update.ycp:509 +msgid "Kernel Update Status Log" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/src/clients/update_proposal.ycp new/yast2-update-2.13.29/src/clients/update_proposal.ycp --- old/yast2-update-2.13.27/src/clients/update_proposal.ycp 2006-05-11 08:53:33.000000000 +0200 +++ new/yast2-update-2.13.29/src/clients/update_proposal.ycp 2006-05-25 12:46:33.000000000 +0200 @@ -92,12 +92,9 @@ Packages::using_patterns = true; } - if (!Update::did_init2) + Pkg::PkgApplReset (); + if (! Update::onlyUpdateInstalled) { - Pkg::PkgReset (); - Update::did_init2 = true; - if (! Update::onlyUpdateInstalled) - { if (Packages::using_patterns) { Update::SetDesktopPattern (); @@ -106,12 +103,10 @@ { Update::ProposeSelection (); } - } } if (Update::onlyUpdateInstalled) // just consider already installed packages { - Pkg::PkgReset(); Pkg::SetSelection (""); // -> don't select any additional selections } else if (Packages::using_patterns) @@ -128,7 +123,6 @@ } else // update selections too { - Pkg::PkgReset(); Pkg::SetSelection (Update::selected_selection); // -> set the base selection (minimal, default, ....) if (!Update::manual_interaction) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/update.pot new/yast2-update-2.13.29/update.pot --- old/yast2-update-2.13.27/update.pot 2005-09-09 16:22:12.000000000 +0200 +++ new/yast2-update-2.13.29/update.pot 2006-05-12 12:36:43.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-09 16:22+0200\n" +"POT-Creation-Date: 2006-05-12 12:36+0200\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" @@ -18,68 +18,81 @@ #. Proposal for backup during update #: src/clients/backup_proposal.ycp:42 +#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:42 msgid "Create Backup of Modified Files" msgstr "" #. Proposal for backup during update #: src/clients/backup_proposal.ycp:47 +#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:47 msgid "Create Backup of /etc/sysconfig Directory" msgstr "" #. Proposal for backup during update #: src/clients/backup_proposal.ycp:52 +#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:52 msgid "Do Not Create Backups" msgstr "" #. Proposal for backup during update #: src/clients/backup_proposal.ycp:57 +#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:57 msgid "Remove Backups from Previous Updates" msgstr "" #. this is a heading #: src/clients/backup_proposal.ycp:88 +#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:88 msgid "Backup" msgstr "" #. this is a menu entry #: src/clients/backup_proposal.ycp:90 +#: yast2-update-2.13.25/src/clients/backup_proposal.ycp:90 msgid "&Backup" msgstr "" #. error popup, user did not enter a valid directory specification #: src/clients/inst_backup.ycp:38 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:38 msgid "Invalid backup path." msgstr "" #. there is not enough space for the backup during update #. inform the user about this (MB==megabytes) #: src/clients/inst_backup.ycp:78 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:78 #, ycp-format msgid "Minimum disk space of %1 MB required." msgstr "" #. screen title for software selection #: src/clients/inst_backup.ycp:90 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:90 msgid "Backup System Before Update" msgstr "" #. checkbox label if user wants to backup modified files #: src/clients/inst_backup.ycp:100 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:100 msgid "Create &Backup of Modified Files" msgstr "" #. checkbox label if user wants to backup /etc/sysconfig #: src/clients/inst_backup.ycp:103 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:103 msgid "Create a &Complete Backup of /etc/sysconfig" msgstr "" #. checkbox label if user wants remove old backup stuff #: src/clients/inst_backup.ycp:107 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:107 msgid "Remove &Old Backups from the Backup Directory" msgstr "" #. help text for backup dialog during update 1/7 #: src/clients/inst_backup.ycp:112 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:112 msgid "" "To avoid any loss of information during update,\n" "it is possible to create a backup prior to updating.\n" @@ -87,6 +100,7 @@ #. help text for backup dialog during update 2/7 #: src/clients/inst_backup.ycp:117 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:117 msgid "" "Warning: This will not be a complete\n" "backup. Only modified files will be saved.\n" @@ -94,11 +108,13 @@ #. help text for backup dialog during update 3/7 #: src/clients/inst_backup.ycp:122 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:122 msgid "Select the desired options.\n" msgstr "" #. help text for backup dialog during update 4/7 #: src/clients/inst_backup.ycp:126 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:126 msgid "" "Create a Backup of Modified Files:\n" "Stores those modified files that are replaced during update.\n" @@ -106,6 +122,7 @@ #. help text for backup dialog during update 5/7 #: src/clients/inst_backup.ycp:131 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:131 msgid "" "Create a Complete Backup of\n" "/etc/sysconfig: This covers all configuration files that are part of the\n" @@ -114,6 +131,7 @@ #. help text for backup dialog during update 6/7 #: src/clients/inst_backup.ycp:137 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:137 msgid "" "Remove Old Backups from the Backup\n" "Directory: If your current system already is the result of an earlier\n" @@ -123,18 +141,29 @@ #. help text for backup dialog during update 7/7 #: src/clients/inst_backup.ycp:144 +#: yast2-update-2.13.25/src/clients/inst_backup.ycp:144 #, ycp-format msgid "All backups are placed in %1." msgstr "" #. screen title for update options #. this is a heading -#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:288 +#. screen title for update options +#. this is a heading +#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:357 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:27 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:346 msgid "Update Options" msgstr "" +#: src/clients/inst_update.ycp:39 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:39 +msgid "Select Patterns" +msgstr "" + #. Display warning message -#: src/clients/inst_update.ycp:56 +#: src/clients/inst_update.ycp:66 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:66 msgid "" "You have already chosen software from \"Detailed selection\".\n" "You will lose that selection if you change the basic selection." @@ -142,50 +171,62 @@ #. Unkown for unknown system #. label for an unknown installed system -#: src/clients/inst_update.ycp:64 src/include/rootpart.ycp:30 -#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:117 -#: src/modules/RootPart.ycp:1067 +#. Unkown for unknown system +#. label for an unknown installed system +#: src/clients/inst_update.ycp:74 src/include/rootpart.ycp:30 +#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:94 +#: src/modules/RootPart.ycp:1014 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:74 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:94 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:1014 msgid "Unknown" msgstr "" #. label showing from what version to what version we are updating -#: src/clients/inst_update.ycp:69 +#: src/clients/inst_update.ycp:79 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:79 #, ycp-format msgid "Update from %1 to %2" msgstr "" #. frame title for update selection -#: src/clients/inst_update.ycp:72 +#: src/clients/inst_update.ycp:82 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:82 msgid "Update Mode" msgstr "" #. radio button label for update including new packages -#: src/clients/inst_update.ycp:79 +#: src/clients/inst_update.ycp:89 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:89 msgid "" "&Update with Installation of New Software and Features\n" "Based on the Selection:\n" msgstr "" #. radio button label for update of already installed packages only -#: src/clients/inst_update.ycp:90 +#: src/clients/inst_update.ycp:100 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:100 msgid "Only U&pdate Installed Packages" msgstr "" #. check box label #. translator: add a & shortcut -#: src/clients/inst_update.ycp:100 +#: src/clients/inst_update.ycp:110 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:110 msgid "&Delete Unmaintained Packages" msgstr "" #. help text for dialog "update options" 1/4 -#: src/clients/inst_update.ycp:108 +#: src/clients/inst_update.ycp:118 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:118 msgid "" "The update option differs between two modes. In\n" "either case, it is recommended to make a backup of your personal data.\n" msgstr "" #. help text for dialog "update options" 2/4 -#: src/clients/inst_update.ycp:113 +#: src/clients/inst_update.ycp:123 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:123 msgid "" "With New Software: This default setting\n" "updates the existing software and installs all new features and benefits of\n" @@ -194,7 +235,8 @@ msgstr "" #. help text for dialog "update options" 3/4 -#: src/clients/inst_update.ycp:120 +#: src/clients/inst_update.ycp:130 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:130 msgid "" "Only Installed Packages: This selection\n" "only updates the packages already installed on your system. Note:\n" @@ -203,7 +245,8 @@ msgstr "" #. help text for dialog "update options" 4/4 -#: src/clients/inst_update.ycp:127 +#: src/clients/inst_update.ycp:137 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:137 msgid "" "After the update, some software might not\n" "function anymore. Activate Delete Unmaintained Packages to delete those\n" @@ -211,84 +254,101 @@ msgstr "" #. yes/no question -#: src/clients/inst_update.ycp:186 +#: src/clients/inst_update.ycp:216 +#: yast2-update-2.13.25/src/clients/inst_update.ycp:216 msgid "" "Do you really want\n" "to reset your detailed selection?" msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:74 +#: src/clients/packages_proposal.ycp:75 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:75 #, ycp-format msgid "Packages to Update: %1" msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:77 +#: src/clients/packages_proposal.ycp:78 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:78 #, ycp-format msgid "New Packages to Install: %1" msgstr "" #. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:80 +#: src/clients/packages_proposal.ycp:81 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:81 #, ycp-format msgid "Packages to Remove: %1" msgstr "" #. part of summary, %1 is size of packages (in MB or GB) -#: src/clients/packages_proposal.ycp:83 +#: src/clients/packages_proposal.ycp:84 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:84 #, ycp-format msgid "Total Size of Packages to Update: %1" msgstr "" #. warning text -#: src/clients/packages_proposal.ycp:91 -msgid "Cannot solve all conflicts, requires manual intervention" +#: src/clients/packages_proposal.ycp:92 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:92 +msgid "Cannot solve all conflicts. Manual intervention is required." msgstr "" #. this is a heading -#: src/clients/packages_proposal.ycp:138 +#: src/clients/packages_proposal.ycp:139 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:139 msgid "Packages" msgstr "" #. this is a menu entry -#: src/clients/packages_proposal.ycp:140 +#: src/clients/packages_proposal.ycp:141 +#: yast2-update-2.13.25/src/clients/packages_proposal.ycp:141 msgid "&Packages" msgstr "" #. Proposal for system to update #: src/clients/rootpart_proposal.ycp:50 +#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:50 msgid "No root partition found" msgstr "" #. Proposal for system to update #: src/clients/rootpart_proposal.ycp:85 +#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:85 #, ycp-format msgid "%1 on root partition %2" msgstr "" #. inform user in the proposal about the failed mount -#: src/clients/rootpart_proposal.ycp:94 +#. error report +#. inform user in the proposal about the failed mount +#: src/clients/rootpart_proposal.ycp:94 src/include/rootpart.ycp:226 +#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:94 msgid "Failed to mount target system" msgstr "" #. this is a heading #: src/clients/rootpart_proposal.ycp:138 +#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:138 msgid "Selected for Update" msgstr "" #. this is a menu entry #: src/clients/rootpart_proposal.ycp:140 +#: yast2-update-2.13.25/src/clients/rootpart_proposal.ycp:140 msgid "&Selected for Update" msgstr "" #. intermediate popup while initializing internal packagemanagement -#: src/clients/update_proposal.ycp:62 +#: src/clients/update_proposal.ycp:67 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:65 msgid "Reading package information. One moment please..." msgstr "" #. continue-cancel popup -#: src/clients/update_proposal.ycp:138 +#: src/clients/update_proposal.ycp:172 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:161 msgid "" "The installed product is not compatible with the product\n" "on the installation media. If you try to update using the\n" @@ -297,45 +357,59 @@ msgstr "" #. error message in proposal -#: src/clients/update_proposal.ycp:195 +#: src/clients/update_proposal.ycp:249 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:238 msgid "The installed product is not compatible with the product on the installatin media." msgstr "" #. Can't find any software data, probably a installation media error #. error message -#: src/clients/update_proposal.ycp:209 +#: src/clients/update_proposal.ycp:263 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:252 msgid "Cannot read package data from installation media. Media error?" msgstr "" #. proposal error -#: src/clients/update_proposal.ycp:220 +#: src/clients/update_proposal.ycp:274 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:263 msgid "Updating to another version is not supported from the running system." msgstr "" #. summary text (%1 is package selection) -#: src/clients/update_proposal.ycp:229 +#: src/clients/update_proposal.ycp:283 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:272 #, ycp-format msgid "Update to %1" msgstr "" #. Proposal for backup during update -#: src/clients/update_proposal.ycp:234 +#: src/clients/update_proposal.ycp:288 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:277 msgid "Only Update Installed Packages" msgstr "" +#. proposal string +#: src/clients/update_proposal.ycp:299 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:288 +msgid "Update Based on Patterns" +msgstr "" + #. Proposal for selection during update -#: src/clients/update_proposal.ycp:242 +#: src/clients/update_proposal.ycp:310 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:299 #, ycp-format msgid "Update Based on Selection \"%1\"" msgstr "" #. Proposal for backup during update -#: src/clients/update_proposal.ycp:252 +#: src/clients/update_proposal.ycp:321 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:310 msgid "Delete Old Packages" msgstr "" #. this is a menu entry -#: src/clients/update_proposal.ycp:290 +#: src/clients/update_proposal.ycp:359 +#: yast2-update-2.13.25/src/clients/update_proposal.ycp:348 msgid "&Update Options" msgstr "" @@ -364,12 +438,12 @@ msgstr "" #. label for selection of root partition (for boot) -#: src/include/rootpart.ycp:56 +#: src/include/rootpart.ycp:58 msgid "Partition or System to Boot:" msgstr "" #. help text for root partition dialog (for boot) -#: src/include/rootpart.ycp:59 +#: src/include/rootpart.ycp:61 msgid "" "\n" "Select the partition or system to boot.\n" @@ -377,12 +451,12 @@ msgstr "" #. label for selection of root partition (for update) -#: src/include/rootpart.ycp:67 +#: src/include/rootpart.ycp:69 msgid "Partition or System to Update:" msgstr "" #. help text for root partition dialog (for update) -#: src/include/rootpart.ycp:70 +#: src/include/rootpart.ycp:72 msgid "" "\n" "Select the partition or system to update.\n" @@ -390,12 +464,12 @@ msgstr "" #. headline for dialog "Select for update" -#: src/include/rootpart.ycp:78 +#: src/include/rootpart.ycp:80 msgid "Select for Update" msgstr "" #. help text for root partition dialog (general part) -#: src/include/rootpart.ycp:83 +#: src/include/rootpart.ycp:85 msgid "" "\n" "Show All Partitions expands the list to a\n" @@ -404,39 +478,44 @@ msgstr "" #. table header -#: src/include/rootpart.ycp:99 +#: src/include/rootpart.ycp:100 msgid "System" msgstr "" #. table header -#: src/include/rootpart.ycp:101 +#: src/include/rootpart.ycp:102 msgid "Partition" msgstr "" #. table header -#: src/include/rootpart.ycp:103 +#: src/include/rootpart.ycp:104 msgid "Architecture" msgstr "" +#. table header +#: src/include/rootpart.ycp:106 +msgid "Label" +msgstr "" + #. check box -#: src/include/rootpart.ycp:107 +#: src/include/rootpart.ycp:110 msgid "&Show All Partitions" msgstr "" #. pushbutton to (rightaway) boot the system selected above -#: src/include/rootpart.ycp:133 +#: src/include/rootpart.ycp:135 msgid "&Boot" msgstr "" #. continue-cancel popup -#: src/include/rootpart.ycp:198 +#: src/include/rootpart.ycp:200 msgid "" "No installed system that can be upgraded with this product was found\n" "on the selected partition." msgstr "" #. continue-cancel popup -#: src/include/rootpart.ycp:205 +#: src/include/rootpart.ycp:207 msgid "" "The architecture of the system installed in the selected partition\n" "is different than the one of this product." @@ -445,7 +524,8 @@ #. * #. * Link to SDB article concerning renaming of devices. #. -#: src/modules/RootPart.ycp:106 +#: src/modules/RootPart.ycp:83 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:83 #, ycp-format msgid "" "See the SBD article at %1 for details\n" @@ -453,7 +533,8 @@ msgstr "" #. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.ycp:188 +#: src/modules/RootPart.ycp:176 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:176 #, ycp-format msgid "" "Cannot unmount partition %1.\n" @@ -464,18 +545,21 @@ msgstr "" #. label, %1 is partition -#: src/modules/RootPart.ycp:254 +#: src/modules/RootPart.ycp:240 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:240 #, ycp-format msgid "Checking partition %1" msgstr "" #. yes-no popup -#: src/modules/RootPart.ycp:589 +#: src/modules/RootPart.ycp:517 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:517 msgid "Incorrect password. Try again?" msgstr "" #. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.ycp:700 +#: src/modules/RootPart.ycp:635 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:635 #, ycp-format msgid "" "The partition %1 could not be mounted.\n" @@ -489,45 +573,53 @@ msgstr "" #. push button -#: src/modules/RootPart.ycp:714 +#: src/modules/RootPart.ycp:649 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:649 msgid "&Specify Mount Options" msgstr "" #. popup heading -#: src/modules/RootPart.ycp:733 +#: src/modules/RootPart.ycp:668 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:668 msgid "Mount Options" msgstr "" #. text entry label -#: src/modules/RootPart.ycp:736 +#: src/modules/RootPart.ycp:671 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:671 msgid "&Mount Point" msgstr "" #. tex entry label -#: src/modules/RootPart.ycp:739 +#: src/modules/RootPart.ycp:674 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:674 msgid "&Device" msgstr "" #. text entry label -#: src/modules/RootPart.ycp:742 +#: src/modules/RootPart.ycp:677 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:677 msgid "" "&File System\n" "(empty for autodetection)" msgstr "" #. error message -#: src/modules/RootPart.ycp:812 +#: src/modules/RootPart.ycp:747 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:747 #, ycp-format msgid "The /var partition %1 could not be mounted.\n" msgstr "" #. error message -#: src/modules/RootPart.ycp:857 +#: src/modules/RootPart.ycp:792 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:792 msgid "Unable to mount /var partition with this disk configuration.\n" msgstr "" #. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.ycp:882 +#: src/modules/RootPart.ycp:817 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:817 #, ycp-format msgid "" "Partitions could not be mounted.\n" @@ -536,27 +628,32 @@ msgstr "" #. error message -#: src/modules/RootPart.ycp:918 +#: src/modules/RootPart.ycp:855 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:855 msgid "No fstab found." msgstr "" #. message part 1 -#: src/modules/RootPart.ycp:944 +#: src/modules/RootPart.ycp:881 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:881 msgid "The root partition in /etc/fstab has an invalid root device.\n" msgstr "" #. message part 2 -#: src/modules/RootPart.ycp:946 +#: src/modules/RootPart.ycp:883 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:883 #, ycp-format msgid "It is currently mounted as %1 but listed as %2.\n" msgstr "" #. intermediate popup while mounting partitions -#: src/modules/RootPart.ycp:1169 +#: src/modules/RootPart.ycp:1112 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:1112 msgid "Mounting partitions. One moment please..." msgstr "" #. label -#: src/modules/RootPart.ycp:1184 +#: src/modules/RootPart.ycp:1127 +#: yast2-update-2.13.25/src/modules/RootPart.ycp:1127 msgid "Evaluating root partition. One moment please..." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.27/yast2-update-2.13.25/update.pot new/yast2-update-2.13.29/yast2-update-2.13.25/update.pot --- old/yast2-update-2.13.27/yast2-update-2.13.25/update.pot 2005-09-09 16:22:12.000000000 +0200 +++ new/yast2-update-2.13.29/yast2-update-2.13.25/update.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,562 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-09 16:22+0200\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" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:42 -msgid "Create Backup of Modified Files" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:47 -msgid "Create Backup of /etc/sysconfig Directory" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:52 -msgid "Do Not Create Backups" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:57 -msgid "Remove Backups from Previous Updates" -msgstr "" - -#. this is a heading -#: src/clients/backup_proposal.ycp:88 -msgid "Backup" -msgstr "" - -#. this is a menu entry -#: src/clients/backup_proposal.ycp:90 -msgid "&Backup" -msgstr "" - -#. error popup, user did not enter a valid directory specification -#: src/clients/inst_backup.ycp:38 -msgid "Invalid backup path." -msgstr "" - -#. there is not enough space for the backup during update -#. inform the user about this (MB==megabytes) -#: src/clients/inst_backup.ycp:78 -#, ycp-format -msgid "Minimum disk space of %1 MB required." -msgstr "" - -#. screen title for software selection -#: src/clients/inst_backup.ycp:90 -msgid "Backup System Before Update" -msgstr "" - -#. checkbox label if user wants to backup modified files -#: src/clients/inst_backup.ycp:100 -msgid "Create &Backup of Modified Files" -msgstr "" - -#. checkbox label if user wants to backup /etc/sysconfig -#: src/clients/inst_backup.ycp:103 -msgid "Create a &Complete Backup of /etc/sysconfig" -msgstr "" - -#. checkbox label if user wants remove old backup stuff -#: src/clients/inst_backup.ycp:107 -msgid "Remove &Old Backups from the Backup Directory" -msgstr "" - -#. help text for backup dialog during update 1/7 -#: src/clients/inst_backup.ycp:112 -msgid "" -"To avoid any loss of information during update,\n" -"it is possible to create a backup prior to updating.\n" -msgstr "" - -#. help text for backup dialog during update 2/7 -#: src/clients/inst_backup.ycp:117 -msgid "" -"Warning: This will not be a complete\n" -"backup. Only modified files will be saved.\n" -msgstr "" - -#. help text for backup dialog during update 3/7 -#: src/clients/inst_backup.ycp:122 -msgid "Select the desired options.\n" -msgstr "" - -#. help text for backup dialog during update 4/7 -#: src/clients/inst_backup.ycp:126 -msgid "" -"Create a Backup of Modified Files:\n" -"Stores those modified files that are replaced during update.\n" -msgstr "" - -#. help text for backup dialog during update 5/7 -#: src/clients/inst_backup.ycp:131 -msgid "" -"Create a Complete Backup of\n" -"/etc/sysconfig: This covers all configuration files that are part of the\n" -"sysconfig mechanism, even those that are not replaced.\n" -msgstr "" - -#. help text for backup dialog during update 6/7 -#: src/clients/inst_backup.ycp:137 -msgid "" -"Remove Old Backups from the Backup\n" -"Directory: If your current system already is the result of an earlier\n" -"update, there may be old configuration file backups. Select this option to\n" -"remove them.\n" -msgstr "" - -#. help text for backup dialog during update 7/7 -#: src/clients/inst_backup.ycp:144 -#, ycp-format -msgid "All backups are placed in %1." -msgstr "" - -#. screen title for update options -#. this is a heading -#: src/clients/inst_update.ycp:27 src/clients/update_proposal.ycp:288 -msgid "Update Options" -msgstr "" - -#. Display warning message -#: src/clients/inst_update.ycp:56 -msgid "" -"You have already chosen software from \"Detailed selection\".\n" -"You will lose that selection if you change the basic selection." -msgstr "" - -#. Unkown for unknown system -#. label for an unknown installed system -#: src/clients/inst_update.ycp:64 src/include/rootpart.ycp:30 -#: src/include/rootpart.ycp:33 src/modules/RootPart.ycp:117 -#: src/modules/RootPart.ycp:1067 -msgid "Unknown" -msgstr "" - -#. label showing from what version to what version we are updating -#: src/clients/inst_update.ycp:69 -#, ycp-format -msgid "Update from %1 to %2" -msgstr "" - -#. frame title for update selection -#: src/clients/inst_update.ycp:72 -msgid "Update Mode" -msgstr "" - -#. radio button label for update including new packages -#: src/clients/inst_update.ycp:79 -msgid "" -"&Update with Installation of New Software and Features\n" -"Based on the Selection:\n" -msgstr "" - -#. radio button label for update of already installed packages only -#: src/clients/inst_update.ycp:90 -msgid "Only U&pdate Installed Packages" -msgstr "" - -#. check box label -#. translator: add a & shortcut -#: src/clients/inst_update.ycp:100 -msgid "&Delete Unmaintained Packages" -msgstr "" - -#. help text for dialog "update options" 1/4 -#: src/clients/inst_update.ycp:108 -msgid "" -"The update option differs between two modes. In\n" -"either case, it is recommended to make a backup of your personal data.\n" -msgstr "" - -#. help text for dialog "update options" 2/4 -#: src/clients/inst_update.ycp:113 -msgid "" -"With New Software: This default setting\n" -"updates the existing software and installs all new features and benefits of\n" -"the new &product; version. The selection is based on the former predefined\n" -"software selection.\n" -msgstr "" - -#. help text for dialog "update options" 3/4 -#: src/clients/inst_update.ycp:120 -msgid "" -"Only Installed Packages: This selection\n" -"only updates the packages already installed on your system. Note:\n" -"New software in the predefined software selection, such as new YaST modules, is\n" -"not available after the update. You might miss advertised features.\n" -msgstr "" - -#. help text for dialog "update options" 4/4 -#: src/clients/inst_update.ycp:127 -msgid "" -"After the update, some software might not\n" -"function anymore. Activate Delete Unmaintained Packages to delete those\n" -"packages during the update.\n" -msgstr "" - -#. yes/no question -#: src/clients/inst_update.ycp:186 -msgid "" -"Do you really want\n" -"to reset your detailed selection?" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:74 -#, ycp-format -msgid "Packages to Update: %1" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:77 -#, ycp-format -msgid "New Packages to Install: %1" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:80 -#, ycp-format -msgid "Packages to Remove: %1" -msgstr "" - -#. part of summary, %1 is size of packages (in MB or GB) -#: src/clients/packages_proposal.ycp:83 -#, ycp-format -msgid "Total Size of Packages to Update: %1" -msgstr "" - -#. warning text -#: src/clients/packages_proposal.ycp:91 -msgid "Cannot solve all conflicts, requires manual intervention" -msgstr "" - -#. this is a heading -#: src/clients/packages_proposal.ycp:138 -msgid "Packages" -msgstr "" - -#. this is a menu entry -#: src/clients/packages_proposal.ycp:140 -msgid "&Packages" -msgstr "" - -#. Proposal for system to update -#: src/clients/rootpart_proposal.ycp:50 -msgid "No root partition found" -msgstr "" - -#. Proposal for system to update -#: src/clients/rootpart_proposal.ycp:85 -#, ycp-format -msgid "%1 on root partition %2" -msgstr "" - -#. inform user in the proposal about the failed mount -#: src/clients/rootpart_proposal.ycp:94 -msgid "Failed to mount target system" -msgstr "" - -#. this is a heading -#: src/clients/rootpart_proposal.ycp:138 -msgid "Selected for Update" -msgstr "" - -#. this is a menu entry -#: src/clients/rootpart_proposal.ycp:140 -msgid "&Selected for Update" -msgstr "" - -#. intermediate popup while initializing internal packagemanagement -#: src/clients/update_proposal.ycp:62 -msgid "Reading package information. One moment please..." -msgstr "" - -#. continue-cancel popup -#: src/clients/update_proposal.ycp:138 -msgid "" -"The installed product is not compatible with the product\n" -"on the installation media. If you try to update using the\n" -"current installation media, the system may not start or\n" -"some applications may not run properly." -msgstr "" - -#. error message in proposal -#: src/clients/update_proposal.ycp:195 -msgid "The installed product is not compatible with the product on the installatin media." -msgstr "" - -#. Can't find any software data, probably a installation media error -#. error message -#: src/clients/update_proposal.ycp:209 -msgid "Cannot read package data from installation media. Media error?" -msgstr "" - -#. proposal error -#: src/clients/update_proposal.ycp:220 -msgid "Updating to another version is not supported from the running system." -msgstr "" - -#. summary text (%1 is package selection) -#: src/clients/update_proposal.ycp:229 -#, ycp-format -msgid "Update to %1" -msgstr "" - -#. Proposal for backup during update -#: src/clients/update_proposal.ycp:234 -msgid "Only Update Installed Packages" -msgstr "" - -#. Proposal for selection during update -#: src/clients/update_proposal.ycp:242 -#, ycp-format -msgid "Update Based on Selection \"%1\"" -msgstr "" - -#. Proposal for backup during update -#: src/clients/update_proposal.ycp:252 -msgid "Delete Old Packages" -msgstr "" - -#. this is a menu entry -#: src/clients/update_proposal.ycp:290 -msgid "&Update Options" -msgstr "" - -#: src/config/update.glade:15 src/config/update.glade:38 -msgid "Update Settings" -msgstr "" - -#: src/config/update.glade:30 -msgid "Update" -msgstr "" - -#: src/config/update.glade:44 src/config/update.glade:48 -msgid "Perform Update" -msgstr "" - -#: src/config/update.glade:59 -msgid "Clean Up" -msgstr "" - -#: src/config/update.glade:63 -msgid "Update System Configuration" -msgstr "" - -#: src/config/update.glade:71 -msgid "Update Configuration" -msgstr "" - -#. label for selection of root partition (for boot) -#: src/include/rootpart.ycp:56 -msgid "Partition or System to Boot:" -msgstr "" - -#. help text for root partition dialog (for boot) -#: src/include/rootpart.ycp:59 -msgid "" -"\n" -"Select the partition or system to boot.\n" -"\n" -msgstr "" - -#. label for selection of root partition (for update) -#: src/include/rootpart.ycp:67 -msgid "Partition or System to Update:" -msgstr "" - -#. help text for root partition dialog (for update) -#: src/include/rootpart.ycp:70 -msgid "" -"\n" -"Select the partition or system to update.\n" -"\n" -msgstr "" - -#. headline for dialog "Select for update" -#: src/include/rootpart.ycp:78 -msgid "Select for Update" -msgstr "" - -#. help text for root partition dialog (general part) -#: src/include/rootpart.ycp:83 -msgid "" -"\n" -"Show All Partitions expands the list to a\n" -"general overview of your system's partitions.\n" -"\n" -msgstr "" - -#. table header -#: src/include/rootpart.ycp:99 -msgid "System" -msgstr "" - -#. table header -#: src/include/rootpart.ycp:101 -msgid "Partition" -msgstr "" - -#. table header -#: src/include/rootpart.ycp:103 -msgid "Architecture" -msgstr "" - -#. check box -#: src/include/rootpart.ycp:107 -msgid "&Show All Partitions" -msgstr "" - -#. pushbutton to (rightaway) boot the system selected above -#: src/include/rootpart.ycp:133 -msgid "&Boot" -msgstr "" - -#. continue-cancel popup -#: src/include/rootpart.ycp:198 -msgid "" -"No installed system that can be upgraded with this product was found\n" -"on the selected partition." -msgstr "" - -#. continue-cancel popup -#: src/include/rootpart.ycp:205 -msgid "" -"The architecture of the system installed in the selected partition\n" -"is different than the one of this product." -msgstr "" - -#. * -#. * Link to SDB article concerning renaming of devices. -#. -#: src/modules/RootPart.ycp:106 -#, ycp-format -msgid "" -"See the SBD article at %1 for details\n" -"about how to solve this problem." -msgstr "" - -#. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.ycp:188 -#, ycp-format -msgid "" -"Cannot unmount partition %1.\n" -"\n" -"It is currently in use. If the partition stays mounted,\n" -"the data may be lost. Unmount the partition manually\n" -"or restart your computer.\n" -msgstr "" - -#. label, %1 is partition -#: src/modules/RootPart.ycp:254 -#, ycp-format -msgid "Checking partition %1" -msgstr "" - -#. yes-no popup -#: src/modules/RootPart.ycp:589 -msgid "Incorrect password. Try again?" -msgstr "" - -#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.ycp:700 -#, ycp-format -msgid "" -"The partition %1 could not be mounted.\n" -"\n" -"%2\n" -"\n" -"If you are sure that the partition is not necessary for the\n" -"update (it is not any system partition), click Continue.\n" -"To check or fix the mount options, click Specify Mount Options.\n" -"To abort update, click Cancel." -msgstr "" - -#. push button -#: src/modules/RootPart.ycp:714 -msgid "&Specify Mount Options" -msgstr "" - -#. popup heading -#: src/modules/RootPart.ycp:733 -msgid "Mount Options" -msgstr "" - -#. text entry label -#: src/modules/RootPart.ycp:736 -msgid "&Mount Point" -msgstr "" - -#. tex entry label -#: src/modules/RootPart.ycp:739 -msgid "&Device" -msgstr "" - -#. text entry label -#: src/modules/RootPart.ycp:742 -msgid "" -"&File System\n" -"(empty for autodetection)" -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:812 -#, ycp-format -msgid "The /var partition %1 could not be mounted.\n" -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:857 -msgid "Unable to mount /var partition with this disk configuration.\n" -msgstr "" - -#. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.ycp:882 -#, ycp-format -msgid "" -"Partitions could not be mounted.\n" -"\n" -"Check the log file %1." -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:918 -msgid "No fstab found." -msgstr "" - -#. message part 1 -#: src/modules/RootPart.ycp:944 -msgid "The root partition in /etc/fstab has an invalid root device.\n" -msgstr "" - -#. message part 2 -#: src/modules/RootPart.ycp:946 -#, ycp-format -msgid "It is currently mounted as %1 but listed as %2.\n" -msgstr "" - -#. intermediate popup while mounting partitions -#: src/modules/RootPart.ycp:1169 -msgid "Mounting partitions. One moment please..." -msgstr "" - -#. label -#: src/modules/RootPart.ycp:1184 -msgid "Evaluating root partition. One moment please..." -msgstr "" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-power-management
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-power-management checked in at Fri May 26 15:47:57 CEST 2006. -------- --- arch/i386/yast2-power-management/yast2-power-management.changes 2006-03-27 16:19:38.000000000 +0200 +++ yast2-power-management/yast2-power-management.changes 2006-05-25 14:52:27.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 14:40:46 CEST 2006 - jsrain(a)suse.cz + +- do not restart powersaved during autoinstallation (#177706) +- 2.13.7 + +------------------------------------------------------------------- Old: ---- yast2-power-management-2.13.6.tar.bz2 New: ---- yast2-power-management-2.13.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-power-management.spec ++++++ --- /var/tmp/diff_new_pack.GQBFnJ/_old 2006-05-26 15:47:41.000000000 +0200 +++ /var/tmp/diff_new_pack.GQBFnJ/_new 2006-05-26 15:47:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-power-management (Version 2.13.6) +# spec file for package yast2-power-management (Version 2.13.7) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-power-management -Version: 2.13.6 +Version: 2.13.7 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-power-management-2.13.6.tar.bz2 +Source0: yast2-power-management-2.13.7.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 gettext @@ -33,7 +33,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-power-management-2.13.6 +%setup -n yast2-power-management-2.13.7 %build %{prefix}/bin/y2tool y2autoconf @@ -68,6 +68,9 @@ %doc %{prefix}/share/doc/packages/yast2-power-management %changelog -n yast2-power-management +* Thu May 25 2006 - jsrain(a)suse.cz +- do not restart powersaved during autoinstallation (#177706) +- 2.13.7 * Mon Mar 27 2006 - jsrain(a)suse.de - updated BuildRequires - 2.13.6 ++++++ yast2-power-management-2.13.6.tar.bz2 -> yast2-power-management-2.13.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/Makefile.am new/yast2-power-management-2.13.7/Makefile.am --- old/yast2-power-management-2.13.6/Makefile.am 2006-03-27 16:18:16.000000000 +0200 +++ new/yast2-power-management-2.13.7/Makefile.am 2006-05-25 14:51:33.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/Makefile.in new/yast2-power-management-2.13.7/Makefile.in --- old/yast2-power-management-2.13.6/Makefile.in 2006-03-27 16:18:23.000000000 +0200 +++ new/yast2-power-management-2.13.7/Makefile.in 2006-05-25 14:51:43.000000000 +0200 @@ -198,6 +198,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -227,7 +228,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am @@ -724,7 +725,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -745,7 +746,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -772,15 +773,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -827,12 +828,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/VERSION new/yast2-power-management-2.13.7/VERSION --- old/yast2-power-management-2.13.6/VERSION 2006-03-27 16:17:38.000000000 +0200 +++ new/yast2-power-management-2.13.7/VERSION 2006-05-25 14:41:48.000000000 +0200 @@ -1 +1 @@ -2.13.6 +2.13.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/configure new/yast2-power-management-2.13.7/configure --- old/yast2-power-management-2.13.6/configure 2006-03-27 16:18:21.000000000 +0200 +++ new/yast2-power-management-2.13.7/configure 2006-05-25 14:51:39.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-power-management 2.13.6. +# Generated by GNU Autoconf 2.59 for yast2-power-management 2.13.7. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,9 +269,9 @@ # Identity of this package. PACKAGE_NAME='yast2-power-management' PACKAGE_TARNAME='yast2-power-management' -PACKAGE_VERSION='2.13.6' -PACKAGE_STRING='yast2-power-management 2.13.6' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.7' +PACKAGE_STRING='yast2-power-management 2.13.7' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-power-management 2.13.6 to adapt to many kinds of systems. +\`configure' configures yast2-power-management 2.13.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-power-management 2.13.6:";; + short | recursive ) echo "Configuration of yast2-power-management 2.13.7:";; esac cat <<\_ACEOF @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-power-management configure 2.13.6 +yast2-power-management configure 2.13.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-power-management $as_me 2.13.6, which was +It was created by yast2-power-management $as_me 2.13.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-power-management' - VERSION='2.13.6' + VERSION='2.13.7' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.6" +VERSION="2.13.7" RPMNAME="yast2-power-management" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-power-management $as_me 2.13.6, which was +This file was extended by yast2-power-management $as_me 2.13.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-power-management config.status 2.13.6 +yast2-power-management config.status 2.13.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/configure.in new/yast2-power-management-2.13.7/configure.in --- old/yast2-power-management-2.13.6/configure.in 2006-03-27 16:18:15.000000000 +0200 +++ new/yast2-power-management-2.13.7/configure.in 2006-05-25 14:51:33.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-power-management dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-power-management, 2.13.6, http://www.suse.de/feedback, yast2-power-management) +AC_INIT(yast2-power-management, 2.13.7, http://bugs.opensuse.org/, yast2-power-management) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.6" +VERSION="2.13.7" RPMNAME="yast2-power-management" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/power-management.pot new/yast2-power-management-2.13.7/power-management.pot --- old/yast2-power-management-2.13.6/power-management.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-power-management-2.13.7/power-management.pot 2005-08-26 07:48:50.000000000 +0200 @@ -0,0 +1,1099 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-08-26 07:48+0200\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. PowerManagement read dialog caption +#: src/PowerManagement.ycp:177 +msgid "Initializing Configuration" +msgstr "" + +#. Progress stage 1/3 +#: src/PowerManagement.ycp:190 +msgid "Check the environment" +msgstr "" + +#. Progress stage 2/3 +#: src/PowerManagement.ycp:192 +msgid "Read general settings" +msgstr "" + +#. Progress stage 3/3 +#: src/PowerManagement.ycp:194 +msgid "Read power saving schemes" +msgstr "" + +#. Progress step 1/3 +#: src/PowerManagement.ycp:197 +msgid "Checking the environment..." +msgstr "" + +#. Progress step 2/3 +#: src/PowerManagement.ycp:199 +msgid "Reading general settings..." +msgstr "" + +#. Progress step 3/3 +#: src/PowerManagement.ycp:201 +msgid "Reading power saving schemes..." +msgstr "" + +#. Progress finished +#: src/PowerManagement.ycp:203 src/PowerManagement.ycp:351 +msgid "Finished" +msgstr "" + +#. error report +#: src/PowerManagement.ycp:230 +msgid "This system does not support ACPI or APM." +msgstr "" + +#. Error message +#: src/PowerManagement.ycp:270 +msgid "Cannot read the general settings." +msgstr "" + +#. Error message +#: src/PowerManagement.ycp:298 +msgid "Cannot read power saving schemes." +msgstr "" + +#. PowerManagement read dialog caption +#: src/PowerManagement.ycp:325 +msgid "Saving Configuration" +msgstr "" + +#. Progress stage 1/3 +#: src/PowerManagement.ycp:338 +msgid "Write schemes" +msgstr "" + +#. Progress stage 2/3 +#: src/PowerManagement.ycp:340 +msgid "Write general settings" +msgstr "" + +#. Progress stage 3/3 +#: src/PowerManagement.ycp:342 +msgid "Restart powersave daemon" +msgstr "" + +#. Progress step 1/3 +#: src/PowerManagement.ycp:345 +msgid "Writing schemes..." +msgstr "" + +#. Progress step 2/3 +#: src/PowerManagement.ycp:347 +msgid "Writing general settings..." +msgstr "" + +#. Progress step 3/3 +#: src/PowerManagement.ycp:349 +msgid "Restarting powersave daemon..." +msgstr "" + +#. Error message +#: src/PowerManagement.ycp:404 +msgid "Cannot write power saving schemes." +msgstr "" + +#. Error message +#: src/PowerManagement.ycp:425 +msgid "Cannot write general settings." +msgstr "" + +#. Error message +#: src/PowerManagement.ycp:442 +msgid "Cannot restart the powersave daemon." +msgstr "" + +#. summary text, %1 is scheme name +#: src/PowerManagement.ycp:514 src/commandline.ycp:81 +#, ycp-format +msgid "AC Scheme: %1" +msgstr "" + +#. summary text, %1 is scheme name +#: src/PowerManagement.ycp:516 src/commandline.ycp:93 +#, ycp-format +msgid "Battery Scheme: %1" +msgstr "" + +#. cmdline output, %1 is scheme name +#: src/commandline.ycp:47 +#, ycp-format +msgid "Scheme Name: %1" +msgstr "" + +#. cmdline output, %1 is scheme description +#: src/commandline.ycp:50 +#, ycp-format +msgid "Scheme Description: %1" +msgstr "" + +#. header for commandline output +#: src/commandline.ycp:69 +msgid "Power Saving Schemes:\n" +msgstr "" + +#. cmdline about power saving schemes, %1 is list of schemes, +#: src/commandline.ycp:101 +#, ycp-format +msgid "Available Schemes: %1" +msgstr "" + +#. header for commandline output +#: src/commandline.ycp:110 +msgid "Battery Capacity Feedback:\n" +msgstr "" + +#. cmdline about battery feedback, %1 is capacity level, +#. %2 is the action if level reached (e.g., suspend to disk) +#: src/commandline.ycp:114 +#, ycp-format +msgid "Warning Capacity: %1%%, Action: %2" +msgstr "" + +#. cmdline about battery feedback, %1 is capacity level, +#. %2 is the action if level reached (e.g., suspend to disk) +#: src/commandline.ycp:117 +#, ycp-format +msgid "Low Capacity: %1%%, Action: %2" +msgstr "" + +#. cmdline about batter feedback, %1 is capacity level, +#. %2 is the action if level reached (e.g., suspend to disk) +#: src/commandline.ycp:120 +#, ycp-format +msgid "Critical Capacity: %1%%, Action: %2" +msgstr "" + +#. header for commandline output +#: src/commandline.ycp:137 +msgid "ACPI Button Actions:\n" +msgstr "" + +#. cmdline information about actions to be done if event occurs +#. %1 is the action (e.g., suspend to disk) +#: src/commandline.ycp:141 +#, ycp-format +msgid "Power Button Action: %1" +msgstr "" + +#. cmdline information about actions to be done if event occurs +#. %1 is the action (e.g., suspend to disk) +#: src/commandline.ycp:144 +#, ycp-format +msgid "Sleep Button Action: %1" +msgstr "" + +#. cmdline information about actions to be done if event occurs +#. %1 is the action (e.g., suspend to disk) +#: src/commandline.ycp:147 +#, ycp-format +msgid "Laptop Lid Closed Action: %1" +msgstr "" + +#. header for commandline output +#: src/commandline.ycp:162 +msgid "Actions Allowed for Users:\n" +msgstr "" + +#. cmdline information about operation permission, %1 = Yes or No +#: src/commandline.ycp:165 +#, ycp-format +msgid "Suspend to Disk Allowed: %1" +msgstr "" + +#. cmdline information about operation permission, %1 = Yes or No +#: src/commandline.ycp:167 +#, ycp-format +msgid "Suspend to RAM Allowed: %1" +msgstr "" + +#. cmdline information about operation permission, %1 = Yes or No +#: src/commandline.ycp:169 +#, ycp-format +msgid "Standby Allowed: %1" +msgstr "" + +#. label to be put to messages like Suspend to Disk Allowed: %1 +#: src/commandline.ycp:175 +msgid "Yes" +msgstr "" + +#. label to be put to messages like Suspend to Disk Allowed: %1 +#: src/commandline.ycp:177 +msgid "No" +msgstr "" + +#. error report +#: src/commandline.ycp:196 +msgid "Battery capacity not specified." +msgstr "" + +#. error report +#: src/commandline.ycp:202 src/commandline.ycp:223 +msgid "Action not specified." +msgstr "" + +#. error report +#: src/commandline.ycp:211 +#, ycp-format +msgid "Capacity must be higher than 0%% and lower than 100%%." +msgstr "" + +#. error report +#: src/commandline.ycp:236 +msgid "Specify whether the operation should be allowed." +msgstr "" + +#. error report +#: src/commandline.ycp:265 +msgid "Specified battery scheme not found." +msgstr "" + +#. error report +#: src/commandline.ycp:275 +msgid "Specified AC scheme not found." +msgstr "" + +#. error report +#: src/commandline.ycp:294 +msgid "Operation with the scheme not specified." +msgstr "" + +#. error report +#: src/commandline.ycp:300 +msgid "Scheme name not specified." +msgstr "" + +#. command line help text for power management module +#: src/commandline.ycp:360 +msgid "Power management configuration module" +msgstr "" + +#. command line help text for an action +#: src/commandline.ycp:368 +msgid "Display current settings" +msgstr "" + +#. command line help text for an action +#: src/commandline.ycp:373 +msgid "Set general settings" +msgstr "" + +#. command line help text for an action +#: src/commandline.ycp:378 +msgid "Set options of a scheme" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:386 +msgid "Display only specified scheme" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:390 +msgid "Display only battery feedback configuration" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:394 +msgid "Display only ACPI button configuration" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:398 +msgid "Display only actions allowed for users" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:402 +msgid "Display only schemes selected for AC and battery power" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:406 +msgid "The battery capacity level" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:412 +msgid "The capacity of the battery for the level (in percent)" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:417 +msgid "The action to perform when the specified capacity level is reached" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:423 +msgid "The ACPI button to set the action for" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:429 +msgid "The action to perform when the specified ACPI button is pressed" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:435 +msgid "Sets whether the specified operation should be allowed for users" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:440 +msgid "Scheme to use when running on AC power source" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:445 +msgid "Scheme to use when running on battery power" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:450 +msgid "The scheme name" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:455 +msgid "Add a new scheme" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:459 +msgid "Edit an existing scheme" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:463 +msgid "Remove an existing scheme" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:467 +msgid "The description of the scheme" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:472 +msgid "The scheme to clone" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:477 +msgid "Option of a scheme to modify" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:482 +msgid "Value of the specified option to set" +msgstr "" + +#. command line help text for an option +#: src/commandline.ycp:487 +msgid "New name of the scheme to rename" +msgstr "" + +#. yes-no popup +#: src/dialogs.ycp:68 +msgid "" +"If you abort writing now, the saved\n" +"settings may be inconsistent.\n" +"Really abort?" +msgstr "" + +#. dialog caption +#: src/dialogs.ycp:121 +msgid "Power Management Settings" +msgstr "" + +#. message popup +#: src/dialogs.ycp:147 +msgid "" +"Buttons can be configured only for ACPI. Your\n" +"system probably does not support ACPI and uses APM." +msgstr "" + +#. dialog caption +#: src/dialogs.ycp:159 +msgid "ACPI Buttons" +msgstr "" + +#. dialog caption +#. frame +#: src/dialogs.ycp:186 src/widgets.ycp:61 +msgid "Battery Capacity Feedback" +msgstr "" + +#. frame +#: src/dialogs.ycp:209 +msgid "Power-Saving Modes to Allow" +msgstr "" + +#. dialog caption +#: src/dialogs.ycp:226 +msgid "Modes Permitted for Users" +msgstr "" + +#. dialog caption +#: src/dialogs.ycp:254 src/dialogs.ycp:289 src/dialogs.ycp:318 +#: src/dialogs.ycp:361 +msgid "Power Management Scheme Setup" +msgstr "" + +#. Read dialog help 1/2 +#: src/helps.ycp:20 +msgid "" +"<big>Initializing Power Management Configuration</big> \n" +"Please wait... " +msgstr "" + +#. Read dialog help 2/2 +#: src/helps.ycp:24 +msgid "" +"<big>Aborting Initialization</big> \n" +"Safely abort the configuration utility by pressing Abort now." +msgstr "" + +#. Write dialog help 1/2 +#: src/helps.ycp:29 +msgid "" +"<big>Saving Power Management Configuration</big> \n" +"Please wait... " +msgstr "" + +#. Write dialog help 2/2 +#: src/helps.ycp:33 +msgid "" +"<big>Aborting Saving</big> \n" +"Abort the save procedure by pressing Abort." +msgstr "" + +#. Battery warning dialog help 1/3 +#: src/helps.ycp:38 +msgid "" +"<big>Battery Capacity Feedback</big> \n" +"Set three battery capacity levels and assign actions for\n" +"each of these capacity levels." +msgstr "" + +#. Battery warning dialog help 2/3 +#: src/helps.ycp:43 +msgid "" +"Use Warning Capacity, Low Capacity, and\n" +"Critical Capacity to set battery levels as a percentage of full\n" +"capacity." +msgstr "" + +#. Battery warning dialog help 3/3 +#: src/helps.ycp:48 +msgid "" +"Use Warning Level Action, Low Level Action, and\n" +"Critical Level Action to set actions to perform if the relevant\n" +"battery level is reached." +msgstr "" + +#. ACPI buttons dialog help 1/1 +#: src/helps.ycp:54 +msgid "" +"<big>ACPI Buttons</big> \n" +"Assign events to perform after a button is\n" +"pressed. Events can be set for the Power Button and Sleep Button.\n" +"To assign an event to perform when the lid of the laptop is\n" +"closed, use Laptop Lid Closing." +msgstr "" + +#. enabling standby/suspend dialog help 1/6 +#: src/helps.ycp:61 +msgid "" +"<big>Modes Permitted for Users</big> \n" +"Configure which power-saving modes users should be able to switch to." +msgstr "" + +#. enabling standby/suspend dialog help 2/6 +#: src/helps.ycp:65 +msgid "" +"Suspend to Disk allows users to suspend the \n" +"computer to the disk (ACPI mode 4).\n" +"Resuming after suspending to disk takes longer than resuming\n" +"after suspending to RAM." +msgstr "" + +#. enabling standby/suspend dialog help 3/6 +#: src/helps.ycp:71 +msgid "" +"Suspend to RAM allows users to suspend \n" +"the computer to RAM (ACPI mode 3).\n" +"A computer suspended to RAM still consumes electricity and\n" +"unsaved data will be lost if it is disconnected or the battery drains." +msgstr "" + +#. enabling standby/suspend dialog help 4/6 +#: src/helps.ycp:77 +msgid "" +"Standby Mode allows users to \n" +"switch the computer to the standby power saving mode\n" +"(ACPI mode 1)." +msgstr "" + +#. enabling standby/suspend dialog help 5/6 +#: src/helps.ycp:82 +msgid "" +"<big>Supported Power-Saving Modes\n" +"</big> \n" +"Some machines do not support all power-saving modes. If a mode is not supported\n" +"by your machine, the appropriate check box is disabled.\n" +msgstr "" + +#. enabling standby/suspend dialog help 6/6 +#: src/helps.ycp:89 +msgid "" +"<big>Warning</big> \n" +"Depending on your hardware, suspend to RAM or standby could fail and you may \n" +"need to push the reset button to reboot your computer. This could lead to \n" +"data loss.\n" +"See <tt>/usr/share/doc/packages/powersave/README.suspend</tt> for details." +msgstr "" + +#. Main dialog help 1/6 +#: src/helps.ycp:96 +msgid "" +"<big>Energy Saving Schemes</big> \n" +"Use AC Powered to adjust the energy saving scheme to use when your\n" +"computer is AC powered.\n" +"Use Battery Powered to adjust the energy saving scheme to use when your\n" +"computer is powered by internal battery." +msgstr "" + +#. Main dialog help 2/6 +#: src/helps.ycp:103 +msgid "" +"Below the selected schemes, descriptions of both selected schemes\n" +"are displayed." +msgstr "" + +#. Main dialog help 3/6 +#: src/helps.ycp:107 +msgid "" +"<big>Adjusting Energy Saving Schemes</big> \n" +"To adjust energy saving schemes, delete existing ones, or create new ones,\n" +"use Edit Schemes." +msgstr "" + +#. Main dialog help 4/6 +#: src/helps.ycp:112 +msgid "" +"<big>Battery Warning</big> \n" +"To adjust levels of battery status and actions to perform on these levels\n" +"of battery capacity, use Battery Warning." +msgstr "" + +#. Main dialog help 5/6 +#: src/helps.ycp:117 +msgid "" +"<big>ACPI Settings</big> \n" +"To adjust operations to perform when an ACPI button is pressed, use\n" +"ACPI Settings." +msgstr "" + +#. Main dialog help 6/6 +#: src/helps.ycp:122 +msgid "" +"<big>Suspend Permissions</big> \n" +"To set if users are allowed to switch the computer to the standby or\n" +"suspend mode, use Suspend Permissions." +msgstr "" + +#. Schemes list dialog 1/3 +#: src/helps.ycp:128 +msgid "" +"<big>Scheme Setup</big> \n" +"Here, adjust the energy saving schemes. To modify a scheme, select\n" +"it and click Edit." +msgstr "" + +#. Schemes list dialog 2/3 +#: src/helps.ycp:133 +msgid "" +"To add a new scheme, select a scheme to clone then click\n" +"Add. To delete an existing scheme, select it and click \n" +"Delete." +msgstr "" + +#. Schemes list dialog 3/3 +#: src/helps.ycp:138 +msgid "" +"In the main dialog, assign schemes to use when you \n" +"work on battery or AC power." +msgstr "" + +#. Scheme editation dialog 1 help 1/5 +#: src/helps.ycp:142 +msgid "" +"<big>Scheme Setup</big>\n" +"Configure the settings of the scheme. Enter its name in Scheme Name\n" +"and optionally a description in Scheme Description." +msgstr "" + +#. Scheme editation dialog 1 help 3/5 +#: src/helps.ycp:151 +msgid "" +"<big>CPU Settings</big> \n" +"Use Frequency Scaling to adjust the frequency of the CPU. If you set it\n" +"to Dynamic Frequency Scaling, the CPU frequency is adjusted automatically\n" +"according to the current CPU load." +msgstr "" + +#. Scheme editation dialog 1 help 4/5 +#: src/helps.ycp:157 +msgid "" +"Set Allow Throttling to turn CPU throttling on and adjust\n" +"Max % to set the maximum CPU throttling. Throttling is supported\n" +"only on ACPI machines." +msgstr "" + +#. Scheme editation dialog 1 help 5/5 +#: src/helps.ycp:162 +msgid "" +"If your processor does not support CPU frequency scaling, \n" +"you may want to let your processor be constantly \n" +"slowed down when working on battery to save power. To do this, set\n" +"Always Throttle. This setting \n" +"might be useful on long-distance trips where you do not need the entire \n" +"performance of your machine.\n" +msgstr "" + +#. Scheme editation dialog 2 help 1/2 +#: src/helps.ycp:171 +msgid "" +"<big>Hard Disk Settings</big> \n" +"Use Standby Policy to adjust the power saving policy of the hard disks.\n" +"Remember that more power saving also means waiting more often until the disk\n" +"drive is ready.\n" +"Use Acoustic Policy to adjust the acoustic policy of the disk. The noise\n" +"produced by the disk may be lowered by moving disk heads more slowly. Not all\n" +"disks support this feature." +msgstr "" + +#. Scheme editation dialog 2 help 2/2 +#: src/helps.ycp:180 +msgid "" +"<big>Cooling Policy</big> \n" +"Use the cooling policy Status to adjust the active or passive cooling policy.\n" +"Active means that the cooling fan is\n" +"turned on if the system starts overheating.\n" +"If the system continues overheating, the CPU frequency and voltage are\n" +"reduced. Passive means that the system first reduces frequency then, if\n" +"that does not help, turns the cooling fan on.\n" +"To specify actions to perform when the system overheats\n" +"or reaches critical temperature, use Overheat Temperature Action and\n" +"Critical Temperature Action." +msgstr "" + +#. Scheme editation dialog 3 help 1/2 +#: src/helps.ycp:192 +msgid "" +"<big>Enable Screen Saver</big> \n" +"To enable the screen saver in this scheme, set Enable Screen Saver.\n" +"Disabling the screen saver is useful for schemes used, for example, for\n" +"presentations." +msgstr "" + +#. Scheme editation dialog 3 help 2/2 +#. Display is a substantive (screen) +#: src/helps.ycp:199 +msgid "" +"<big>Display Blanking</big> \n" +"To allow blanking the display using DPMS, set\n" +"Enable Display Power Management.\n" +"To set the standby, suspend, and power off time-outs use\n" +"Display Standby Time-Out, Display Suspend Time-Out, and\n" +"Display Power Off Time-Out. To disable a time-out,\n" +"set its value to 0." +msgstr "" + +#. combo box item +#: src/misc.ycp:23 +msgid "Notify" +msgstr "" + +#. combo box item +#: src/misc.ycp:25 +msgid "Shut Down" +msgstr "" + +#. combo box item +#: src/misc.ycp:27 +msgid "Log Out" +msgstr "" + +#. combo box item +#: src/misc.ycp:29 +msgid "Switch to Standby" +msgstr "" + +#. combo box item +#: src/misc.ycp:31 +msgid "Suspend to RAM" +msgstr "" + +#. combo box item +#: src/misc.ycp:33 +msgid "Suspend to Disk" +msgstr "" + +#. combo box item +#: src/misc.ycp:35 +msgid "Start Screen Saver" +msgstr "" + +#. combo box item +#: src/misc.ycp:37 +msgid "Ignore" +msgstr "" + +#. int field +#: src/widgets.ycp:68 +msgid "&Warning Capacity" +msgstr "" + +#. int field +#: src/widgets.ycp:74 +msgid "&Low Capacity" +msgstr "" + +#. int field +#: src/widgets.ycp:80 +msgid "&Critical Capacity" +msgstr "" + +#. combo box +#: src/widgets.ycp:90 +msgid "War&ning Level Action" +msgstr "" + +#. combo box +#: src/widgets.ycp:96 +msgid "Low Level &Action" +msgstr "" + +#. combo box +#: src/widgets.ycp:102 +msgid "Cr&itical Level Action" +msgstr "" + +#. frame +#: src/widgets.ycp:148 +msgid "ACPI Button Configuration" +msgstr "" + +#. combo box +#: src/widgets.ycp:155 +msgid "&Power Button" +msgstr "" + +#. combo box +#: src/widgets.ycp:161 +msgid "&Sleep Button" +msgstr "" + +#. combo box +#: src/widgets.ycp:167 +msgid "&Laptop Lid Closing" +msgstr "" + +#. check box +#: src/widgets.ycp:213 +msgid "Suspend to &Disk" +msgstr "" + +#. popup message +#: src/widgets.ycp:262 +msgid "" +"Use caution because suspending the machine to RAM fails\n" +"on many machines. See the help for details.\n" +msgstr "" + +#. check box +#: src/widgets.ycp:277 +msgid "&Suspend to RAM" +msgstr "" + +#. popup message +#: src/widgets.ycp:355 +msgid "" +"Use caution because putting the machine to the standby state\n" +"fails on many machines. See the help for details.\n" +msgstr "" + +#. check box +#: src/widgets.ycp:370 +msgid "S&tandby Mode" +msgstr "" + +#. push button, opens battery capacity feedback dialog +#: src/widgets.ycp:401 +msgid "Batt&ery Warning..." +msgstr "" + +#. push button, opens ACPI button configuration dialog +#: src/widgets.ycp:427 +msgid "AC&PI Settings..." +msgstr "" + +#. push button, opens +#: src/widgets.ycp:455 +msgid "&Suspend Permissions..." +msgstr "" + +#. fallback scheme description, displayed in a rich text +#. but without HTML tags!!! +#. fallback scheme description, table entre +#: src/widgets.ycp:488 src/widgets.ycp:599 +msgid "No scheme description available" +msgstr "" + +#. combo box +#: src/widgets.ycp:511 src/widgets.ycp:554 +msgid "&AC Powered" +msgstr "" + +#. combo box +#: src/widgets.ycp:515 src/widgets.ycp:561 +msgid "&Battery Powered" +msgstr "" + +#. frame +#: src/widgets.ycp:548 +msgid "Energy Saving Schemes" +msgstr "" + +#. push button +#: src/widgets.ycp:569 +msgid "Ed&it Schemes" +msgstr "" + +#. popup message +#: src/widgets.ycp:638 src/widgets.ycp:661 +msgid "No scheme selected." +msgstr "" + +#. popup message +#: src/widgets.ycp:646 +msgid "" +"The selected scheme cannot be modified.\n" +"Add a new one instead." +msgstr "" + +#. table header +#: src/widgets.ycp:707 +msgid "Scheme Name" +msgstr "" + +#. table header +#: src/widgets.ycp:709 +msgid "Scheme Description" +msgstr "" + +#. popup message +#: src/widgets.ycp:756 +msgid "Scheme name must be set." +msgstr "" + +#. popup message +#: src/widgets.ycp:767 +msgid "The specified scheme name is not unique." +msgstr "" + +#. pop-up message +#: src/widgets.ycp:774 +msgid "The scheme name must not be longer than 32 characters." +msgstr "" + +#. text entry +#: src/widgets.ycp:820 +msgid "S&cheme Name" +msgstr "" + +#. text entry +#: src/widgets.ycp:864 +msgid "Scheme &Description" +msgstr "" + +#. frame, +#: src/widgets.ycp:910 +msgid "Hard Disk" +msgstr "" + +#. combo box +#: src/widgets.ycp:915 +msgid "&Standby Policy" +msgstr "" + +#. combo box item +#: src/widgets.ycp:919 src/widgets.ycp:937 src/widgets.ycp:1085 +msgid "Maximum Performance" +msgstr "" + +#. combo box item +#: src/widgets.ycp:922 +msgid "Power Saving" +msgstr "" + +#. combo box item +#: src/widgets.ycp:925 +msgid "Aggressive Power Saving" +msgstr "" + +#. combo box item +#: src/widgets.ycp:928 src/widgets.ycp:946 +msgid "Disabled" +msgstr "" + +#. combo box +#: src/widgets.ycp:933 +msgid "&Acoustic Policy" +msgstr "" + +#. combo box item +#: src/widgets.ycp:940 +msgid "Quiet" +msgstr "" + +#. combo box item +#: src/widgets.ycp:943 +msgid "Maximally Quiet" +msgstr "" + +#. frame +#: src/widgets.ycp:998 +msgid "Cooling Policy" +msgstr "" + +#. combo box +#: src/widgets.ycp:1000 +msgid "&Status" +msgstr "" + +#. combo box item +#: src/widgets.ycp:1002 +msgid "Active" +msgstr "" + +#. combo box item +#: src/widgets.ycp:1004 +msgid "Passive" +msgstr "" + +#. combo box +#: src/widgets.ycp:1009 +msgid "&Overheat Temperature Action" +msgstr "" + +#. combo box +#: src/widgets.ycp:1014 +msgid "&Critical Temperature Action" +msgstr "" + +#. frame +#: src/widgets.ycp:1078 +msgid "CPU" +msgstr "" + +#. combo box +#: src/widgets.ycp:1082 +msgid "&Frequency Scaling" +msgstr "" + +#. combo box item +#: src/widgets.ycp:1087 +msgid "Maximum Energy Saving" +msgstr "" + +#. combo box item +#: src/widgets.ycp:1089 +msgid "Dynamic Frequency Scaling" +msgstr "" + +#. check box +#: src/widgets.ycp:1097 +msgid "&Allow Throttling" +msgstr "" + +#. integer field +#: src/widgets.ycp:1100 +msgid "&Max. %" +msgstr "" + +#. check box +#: src/widgets.ycp:1104 +msgid "A&lways Throttle" +msgstr "" + +#. frame +#: src/widgets.ycp:1150 +msgid "Screen Saver Settings" +msgstr "" + +#. check box +#: src/widgets.ycp:1157 +msgid "Enable &Screen Saver" +msgstr "" + +#. frame +#. Display is a substantive (screen) +#: src/widgets.ycp:1233 +msgid "Display Power Management Settings" +msgstr "" + +#. check box +#. Display is a substantive (screen) +#: src/widgets.ycp:1241 +msgid "Enable &Display Power Management" +msgstr "" + +#. int field +#. Display is a substantive (screen) +#: src/widgets.ycp:1246 +msgid "Display S&tandby Time-Out (minutes)" +msgstr "" + +#. int field +#. Display is a substantive (screen) +#: src/widgets.ycp:1250 +msgid "Display &Suspend Time-Out (minutes)" +msgstr "" + +#. int field +#. Display is a substantive (screen) +#: src/widgets.ycp:1254 +msgid "Display Power &Off Time-Out (minutes)" +msgstr "" + +#. Initialization dialog caption +#: src/wizards.ycp:165 +msgid "Power Management Configuration" +msgstr "" + +#. Initialization dialog contents +#: src/wizards.ycp:167 +msgid "Initializing..." +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-power-management-2.13.6/src/PowerManagement.ycp new/yast2-power-management-2.13.7/src/PowerManagement.ycp --- old/yast2-power-management-2.13.6/src/PowerManagement.ycp 2006-02-19 23:18:47.000000000 +0100 +++ new/yast2-power-management-2.13.7/src/PowerManagement.ycp 2006-05-25 14:41:20.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: PowerManagement settings, input and output functions * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: PowerManagement.ycp 28157 2006-02-19 22:18:17Z jsrain $ + * $Id: PowerManagement.ycp 31148 2006-05-25 12:41:10Z jsrain $ * * Representation of the configuration of power-management. * Input and output routines. @@ -463,7 +463,8 @@ Progress::NextStage (); y2milestone ("Restarting powersave daemon"); - stage_success = Service::Restart ("powersaved"); + if (! write_only) + stage_success = Service::Restart ("powersaved"); stage_success = Service::Enable ("powersaved") && stage_success; if(! stage_success) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-pkg-bindings
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Fri May 26 15:47:33 CEST 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-22 15:51:46.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-05-25 17:42:02.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 17:41:32 CEST 2006 - mvidner(a)suse.cz + +- Added SourceSaveAll which always saves and does not disable (#176013). +- 2.13.80 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.79.tar.bz2 New: ---- yast2-pkg-bindings-2.13.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.6RWV9L/_old 2006-05-26 15:35:49.000000000 +0200 +++ /var/tmp/diff_new_pack.6RWV9L/_new 2006-05-26 15:35:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.79) +# spec file for package yast2-pkg-bindings (Version 2.13.80) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.79 +Version: 2.13.80 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.79.tar.bz2 +Source0: yast2-pkg-bindings-2.13.80.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools Summary: YaST2 Package Manager Access @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.79 +%setup -n yast2-pkg-bindings-2.13.80 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +67,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Thu May 25 2006 - mvidner(a)suse.cz +- Added SourceSaveAll which always saves and does not disable (#176013). +- 2.13.80 * Mon May 22 2006 - lslezak(a)suse.cz - Pkg::DoProvide - select only the newest item for installation, remove the flag from other versions (#176854) ++++++ yast2-pkg-bindings-2.13.79.tar.bz2 -> yast2-pkg-bindings-2.13.80.tar.bz2 ++++++ ++++ 13654 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-pkg-bindings-2.13.79/VERSION new/yast2-pkg-bindings-2.13.80/VERSION --- old/yast2-pkg-bindings-2.13.79/VERSION 2006-05-22 13:23:43.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.80/VERSION 2006-05-25 17:40:51.000000000 +0200 @@ -1 +1 @@ -2.13.79 +2.13.80 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-pkg-bindings-2.13.79/configure.in new/yast2-pkg-bindings-2.13.80/configure.in --- old/yast2-pkg-bindings-2.13.79/configure.in 2006-05-22 15:43:51.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.80/configure.in 2006-05-25 17:46:01.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.79, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.80, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.79" +VERSION="2.13.80" RPMNAME="yast2-pkg-bindings" MAINTAINER="Michael Andres <ma(a)suse.de>" 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-pkg-bindings-2.13.79/src/PkgModule.cc new/yast2-pkg-bindings-2.13.80/src/PkgModule.cc --- old/yast2-pkg-bindings-2.13.79/src/PkgModule.cc 2006-02-14 10:12:13.000000000 +0100 +++ new/yast2-pkg-bindings-2.13.80/src/PkgModule.cc 2006-05-25 17:25:47.000000000 +0200 @@ -25,6 +25,9 @@ #include <zypp/base/LogControl.h> #include <zypp/Pathname.h> +// it is never deleted :-/ +// which may be a good thing, because ~PkgModuleFunctions would call +// the badly designed SourceFinishAll. #176013 PkgModule* PkgModule::current_pkg = NULL; struct YaSTZyppLogger : public zypp::base::LogControl::LineWriter 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-pkg-bindings-2.13.79/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.80/src/PkgModuleFunctions.h --- old/yast2-pkg-bindings-2.13.79/src/PkgModuleFunctions.h 2006-05-22 13:23:26.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.80/src/PkgModuleFunctions.h 2006-05-25 17:18:10.000000000 +0200 @@ -229,6 +229,8 @@ /* TYPEINFO: boolean(integer)*/ YCPValue SourceFinish (const YCPInteger&); /* TYPEINFO: boolean()*/ + YCPValue SourceSaveAll (); + /* TYPEINFO: boolean()*/ YCPValue SourceFinishAll (); /* TYPEINFO: map<string,any>(integer)*/ YCPValue SourceGeneralData (const YCPInteger&); 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-pkg-bindings-2.13.79/src/Source.cc new/yast2-pkg-bindings-2.13.80/src/Source.cc --- old/yast2-pkg-bindings-2.13.79/src/Source.cc 2006-05-19 09:46:48.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.80/src/Source.cc 2006-05-25 17:40:12.000000000 +0200 @@ -289,10 +289,39 @@ return YCPBoolean(true); } +/****************************************************************************** + * @builtin SourceSaveAll + * + * @short Save all InstSrces. + * @return boolean + **/ +YCPValue +PkgModuleFunctions::SourceSaveAll () +{ + try + { + y2milestone( "Storing the source setup in %s", _target_root.asString().c_str()) ; + zypp::SourceManager::sourceManager()->store( _target_root, true ); + } + catch (zypp::Exception & excpt) + { + y2error("Pkg::SourceSaveAll has failed: %s", excpt.msg().c_str() ); + _last_error.setLastError(excpt.asUserString()); + return YCPBoolean(false); + } + + y2milestone( "All sources saved"); + + return YCPBoolean(true); +} + /**************************************************************************************** * @builtin SourceFinishAll * - * @short Disable all InstSrces. + * @short Save and then disable all InstSrces. + * @description + * If there are no enabled sources, do nothing + * (idempotence hack, broken design: #155459, #176013, use SourceSaveAll). * @return boolean **/ YCPValue ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-packager checked in at Fri May 26 15:35:44 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-05-24 13:39:03.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-05-25 17:50:20.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 25 17:50:04 CEST 2006 - mvidner(a)suse.cz + +- Use Pkg::SourceSaveAll which always saves even if no sources are + enabled (#176013). +- 2.13.120 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.119.tar.bz2 New: ---- yast2-packager-2.13.120.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.PoZQqN/_old 2006-05-26 15:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.PoZQqN/_new 2006-05-26 15:35:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.119) +# spec file for package yast2-packager (Version 2.13.120) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,15 +11,17 @@ # norootforbuild Name: yast2-packager -Version: 2.13.119 +Version: 2.13.120 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.119.tar.bz2 +Source0: yast2-packager-2.13.120.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country +# Pkg::SourceSaveAll +Requires: yast2-pkg-bindings >= 2.13.80 Provides: yast2-config-package-manager Obsoletes: yast2-config-package-manager Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg @@ -41,7 +43,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.119 +%setup -n yast2-packager-2.13.120 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +80,10 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Thu May 25 2006 - mvidner(a)suse.cz +- Use Pkg::SourceSaveAll which always saves even if no sources are + enabled (#176013). +- 2.13.120 * Wed May 24 2006 - jsrain(a)suse.cz - properly integrate YCP code for add-on product installation if add-on product media booted (if YCP code present) (#178311) ++++++ yast2-packager-2.13.119.tar.bz2 -> yast2-packager-2.13.120.tar.bz2 ++++++ ++++ 6099 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-packager-2.13.119/VERSION new/yast2-packager-2.13.120/VERSION --- old/yast2-packager-2.13.119/VERSION 2006-05-24 13:04:23.000000000 +0200 +++ new/yast2-packager-2.13.120/VERSION 2006-05-25 17:49:19.000000000 +0200 @@ -1 +1 @@ -2.13.119 +2.13.120 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-packager-2.13.119/configure.in new/yast2-packager-2.13.120/configure.in --- old/yast2-packager-2.13.119/configure.in 2006-05-24 13:36:16.000000000 +0200 +++ new/yast2-packager-2.13.120/configure.in 2006-05-25 18:10:32.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.119, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.120, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.119" +VERSION="2.13.120" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(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-packager-2.13.119/src/clients/inst_source.ycp new/yast2-packager-2.13.120/src/clients/inst_source.ycp --- old/yast2-packager-2.13.119/src/clients/inst_source.ycp 2006-05-15 13:28:30.000000000 +0200 +++ new/yast2-packager-2.13.120/src/clients/inst_source.ycp 2006-05-25 17:48:33.000000000 +0200 @@ -224,7 +224,7 @@ }); // store in the persistent libzypp storage - success = success && Pkg::SourceFinishAll(); + success = success && Pkg::SourceSaveAll(); // #176013 return success; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-core
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-core checked in at Fri May 26 15:35:19 CEST 2006. -------- --- yast2-core/yast2-core.changes 2006-05-02 16:30:07.000000000 +0200 +++ yast2-core/yast2-core.changes 2006-05-25 10:43:54.000000000 +0200 @@ -1,0 +2,7 @@ +Thu May 25 10:43:24 CEST 2006 - mvidner(a)suse.cz + +- Use [:alpha:] instead of A-Za-z to catch all ASCII letters even in + Estonian (#177560). +- 2.13.23 + +------------------------------------------------------------------- Old: ---- yast2-core-2.13.22.tar.bz2 New: ---- yast2-core-2.13.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.cK3Xy6/_old 2006-05-26 15:34:47.000000000 +0200 +++ /var/tmp/diff_new_pack.cK3Xy6/_new 2006-05-26 15:34:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-core (Version 2.13.22) +# spec file for package yast2-core (Version 2.13.23) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-core -Version: 2.13.22 +Version: 2.13.23 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.13.22.tar.bz2 +Source0: yast2-core-2.13.23.tar.bz2 prefix: /usr BuildRequires: ElectricFence blocxx-devel curl-devel dejagnu docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt liby2util-devel openslp-devel perl-XML-Writer popt-devel sgml-skel udev yast2-devtools Summary: YaST2 - Core Libraries @@ -93,7 +93,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-core-2.13.22 +%setup -n yast2-core-2.13.23 %build %{prefix}/bin/y2tool y2autoconf @@ -164,6 +164,10 @@ /usr/share/YaST2/data/devtools/bin/generateYCPWrappers %changelog -n yast2-core +* Thu May 25 2006 - mvidner(a)suse.cz +- Use [:alpha:] instead of A-Za-z to catch all ASCII letters even in + Estonian (#177560). +- 2.13.23 * Tue May 02 2006 - lslezak(a)suse.cz - ag_background - use unlimited buffer size as default, do not block the subprocess (#169648), update of the example ++++++ yast2-core-2.13.22.tar.bz2 -> yast2-core-2.13.23.tar.bz2 ++++++ ++++ 13677 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-core-2.13.22/Makefile.am new/yast2-core-2.13.23/Makefile.am --- old/yast2-core-2.13.22/Makefile.am 2006-05-02 16:24:24.000000000 +0200 +++ new/yast2-core-2.13.23/Makefile.am 2006-05-25 10:49:48.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules 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-core-2.13.22/VERSION new/yast2-core-2.13.23/VERSION --- old/yast2-core-2.13.22/VERSION 2006-05-02 16:18:04.000000000 +0200 +++ new/yast2-core-2.13.23/VERSION 2006-05-25 10:41:32.000000000 +0200 @@ -1 +1 @@ -2.13.22 +2.13.23 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-core-2.13.22/agent-ini/src/IniAgent.cc new/yast2-core-2.13.23/agent-ini/src/IniAgent.cc --- old/yast2-core-2.13.22/agent-ini/src/IniAgent.cc 2006-01-06 16:17:34.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/src/IniAgent.cc 2006-05-25 10:44:35.000000000 +0200 @@ -8,7 +8,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: IniAgent.cc 26855 2006-01-06 09:49:16Z mvidner $ + * $Id: IniAgent.cc 31143 2006-05-25 08:44:19Z mvidner $ */ #include "IniAgent.h" @@ -209,29 +209,29 @@ YCPMap param; YCPList lp; l = YCPList (); - lp->add (YCPString ("([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"")); + lp->add (YCPString ("([[:alnum:]_]+)[ \t]*=[ \t]*\"([^\"]*)\"")); lp->add (YCPString ("%s=\"%s\"")); param->add (YCPString ("match"), lp); lp = YCPList (); - lp->add (YCPString ("([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)")); + lp->add (YCPString ("([[:alnum:]_]+)[ \t]*=[ \t]*\"([^\"]*)")); lp->add (YCPString ("([^\"]*)\"")); param->add (YCPString ("multiline"), lp); l->add (param); lp = YCPList (); param = YCPMap (); - lp->add (YCPString ("^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*=[ \t]*'([^']*)'")); + lp->add (YCPString ("^[ \t]*([[:alpha:]_][[:alnum:]_]*)[ \t]*=[ \t]*'([^']*)'")); lp->add (YCPString ("%s='%s'")); param->add (YCPString ("match"), lp); lp = YCPList (); - lp->add (YCPString ("([a-zA-Z_][a-zA-Z0-9_]*)[ \t]*=[ \t]*'([^']*)")); + lp->add (YCPString ("([[:alpha:]_][[:alnum:]_]*)[ \t]*=[ \t]*'([^']*)")); lp->add (YCPString ("([^']*)'")); param->add (YCPString ("multiline"), lp); l->add (param); lp = YCPList (); param = YCPMap (); - lp->add (YCPString ("([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$")); + lp->add (YCPString ("([[:alnum:]_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$")); lp->add (YCPString ("%s=\"%s\"")); param->add (YCPString ("match"), lp); l->add (param); 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-core-2.13.22/agent-ini/testsuite/debug/chg-repeat.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg-repeat.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/chg-repeat.scr 2005-01-21 18:50:41.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg-repeat.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/chg1.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/chg1.scr 2005-01-21 18:50:42.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg1.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/chg2.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg2.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/chg2.scr 2005-01-21 18:50:42.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg2.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/chg3.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg3.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/chg3.scr 2005-01-21 18:50:42.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/chg3.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/err1.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/err1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/err1.scr 2005-01-21 18:50:41.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/err1.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/wr_add.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_add.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/wr_add.scr 2005-01-21 18:50:40.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_add.scr 2006-05-24 16:12:03.000000000 +0200 @@ -8,8 +8,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/wr_addsec.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_addsec.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/wr_addsec.scr 2005-01-21 18:50:40.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_addsec.scr 2006-05-24 16:12:03.000000000 +0200 @@ -8,8 +8,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/wr_chg.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_chg.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/wr_chg.scr 2005-01-21 18:50:40.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_chg.scr 2006-05-24 16:12:03.000000000 +0200 @@ -8,8 +8,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/wr_chgsec.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_chgsec.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/wr_chgsec.scr 2005-01-21 18:50:41.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_chgsec.scr 2006-05-24 16:12:03.000000000 +0200 @@ -8,8 +8,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/wr_deep.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_deep.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/wr_deep.scr 2005-01-21 18:50:41.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/wr_deep.scr 2006-05-24 16:12:03.000000000 +0200 @@ -8,8 +8,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/write1.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/write1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/write1.scr 2005-01-21 18:50:40.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/write1.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/debug/write2.scr new/yast2-core-2.13.23/agent-ini/testsuite/debug/write2.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/debug/write2.scr 2005-01-21 18:50:40.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/debug/write2.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/tests/add1.scr new/yast2-core-2.13.23/agent-ini/testsuite/tests/add1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/tests/add1.scr 2005-01-21 18:50:35.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/tests/add1.scr 2006-05-24 16:12:03.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/tests/del1.scr new/yast2-core-2.13.23/agent-ini/testsuite/tests/del1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/tests/del1.scr 2005-01-21 18:50:38.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/tests/del1.scr 2006-05-24 16:12:04.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "params" : [ 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-core-2.13.22/agent-ini/testsuite/tests/icreg1.scr new/yast2-core-2.13.23/agent-ini/testsuite/tests/icreg1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/tests/icreg1.scr 2005-01-21 18:50:38.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/tests/icreg1.scr 2006-05-24 16:12:04.000000000 +0200 @@ -8,12 +8,12 @@ "comments": [ "^[ \t]*;.*", ";.*", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "Section=([a-zA-Z0-9]+)", "Section=%s" ], + "begin" : [ "Section=([[:alnum:]]+)", "Section=%s" ], ], ], "params" : [ $[ - "match" : [ "Value=([a-zA-Z0-9]+)=(.*)$" , "Value=%s=%s"], + "match" : [ "Value=([[:alnum:]]+)=(.*)$" , "Value=%s=%s"], ], ], ] 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-core-2.13.22/agent-ini/testsuite/tests/icreg2.scr new/yast2-core-2.13.23/agent-ini/testsuite/tests/icreg2.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/tests/icreg2.scr 2005-01-21 18:50:35.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/tests/icreg2.scr 2006-05-24 16:12:04.000000000 +0200 @@ -8,12 +8,12 @@ "comments": [ "^[ \t]*;.*", ";.*", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "Section=([a-zA-Z0-9]+)", "Section=%s" ], + "begin" : [ "Section=([[:alnum:]]+)", "Section=%s" ], ], ], "params" : [ $[ - "match" : [ "Value=([a-zA-Z0-9]+)=(.*)$" , "Value=%s=%s"], + "match" : [ "Value=([[:alnum:]]+)=(.*)$" , "Value=%s=%s"], ], ], ] 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-core-2.13.22/agent-ini/testsuite/tests/n1.scr new/yast2-core-2.13.23/agent-ini/testsuite/tests/n1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/tests/n1.scr 2005-01-21 18:50:38.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/tests/n1.scr 2006-05-24 16:12:04.000000000 +0200 @@ -7,8 +7,8 @@ "comments": [ "^[ \t]*;.*", ";.*", "\\{[^}]*\\}", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\+([A-Za-z0-9_]+)[ \t]*", "+%s" ], - "end" : [ "[ \t]*\\-([A-Za-z0-9_]+)[ \t]*", "-%s" ], + "begin" : [ "[ \t]*\\+([[:alnum:]_]+)[ \t]*", "+%s" ], + "end" : [ "[ \t]*\\-([[:alnum:]_]+)[ \t]*", "-%s" ], ], ], "subindent" : " ", 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-core-2.13.22/agent-ini/testsuite/tests/type1.scr new/yast2-core-2.13.23/agent-ini/testsuite/tests/type1.scr --- old/yast2-core-2.13.22/agent-ini/testsuite/tests/type1.scr 2005-01-21 18:50:36.000000000 +0100 +++ new/yast2-core-2.13.23/agent-ini/testsuite/tests/type1.scr 2006-05-24 16:12:04.000000000 +0200 @@ -7,24 +7,24 @@ "comments": [ "^[ \t]*$" ], "sections" : [ $[ - "begin" : ["1[ \t]+([a-zA-Z0-9]+)[ \t]*$", "1 %s", ] + "begin" : ["1[ \t]+([[:alnum:]]+)[ \t]*$", "1 %s", ] ], $[ - "begin" : ["2[ \t]+([a-zA-Z0-9]+)[ \t]*$", "2 %s", ] + "begin" : ["2[ \t]+([[:alnum:]]+)[ \t]*$", "2 %s", ] ], $[ - "begin" : ["3[ \t]+([a-zA-Z0-9]+)[ \t]*$", "3 %s", ] + "begin" : ["3[ \t]+([[:alnum:]]+)[ \t]*$", "3 %s", ] ], ], "params" : [ $[ - "match" : [ "^V1 ([a-zA-Z0-9]+) = (.*)$", "V1 %s = %s" ], + "match" : [ "^V1 ([[:alnum:]]+) = (.*)$", "V1 %s = %s" ], ], $[ - "match" : [ "^V2 ([a-zA-Z0-9]+) # (.*)$", "V2 %s # %s" ], + "match" : [ "^V2 ([[:alnum:]]+) # (.*)$", "V2 %s # %s" ], ], $[ - "match" : [ "^V3 ([a-zA-Z0-9]+) % (.*)$", "V3 %s %% %s" ], + "match" : [ "^V3 ([[:alnum:]]+) % (.*)$", "V3 %s %% %s" ], ], ], ] 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-core-2.13.22/agent-modules/testsuite/tests/dir.scr new/yast2-core-2.13.23/agent-modules/testsuite/tests/dir.scr --- old/yast2-core-2.13.22/agent-modules/testsuite/tests/dir.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/agent-modules/testsuite/tests/dir.scr 2006-05-24 16:42:40.000000000 +0200 @@ -0,0 +1,6 @@ +. + +`ag_modules( + `ModulesConf("tests/dir.in.test") +) + 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-core-2.13.22/agent-modules/testsuite/tests/missing.scr new/yast2-core-2.13.23/agent-modules/testsuite/tests/missing.scr --- old/yast2-core-2.13.22/agent-modules/testsuite/tests/missing.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/agent-modules/testsuite/tests/missing.scr 2006-05-24 16:41:52.000000000 +0200 @@ -0,0 +1,6 @@ +. + +`ag_modules( + `ModulesConf("tests/missing.in.test") +) + 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-core-2.13.22/agent-modules/testsuite/tests/read1.scr new/yast2-core-2.13.23/agent-modules/testsuite/tests/read1.scr --- old/yast2-core-2.13.22/agent-modules/testsuite/tests/read1.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/agent-modules/testsuite/tests/read1.scr 2006-05-24 16:41:50.000000000 +0200 @@ -0,0 +1,6 @@ +. + +`ag_modules( + `ModulesConf("tests/read1.in.test") +) + 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-core-2.13.22/agent-modules/testsuite/tests/write1.scr new/yast2-core-2.13.23/agent-modules/testsuite/tests/write1.scr --- old/yast2-core-2.13.22/agent-modules/testsuite/tests/write1.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/agent-modules/testsuite/tests/write1.scr 2006-05-24 16:41:53.000000000 +0200 @@ -0,0 +1,6 @@ +. + +`ag_modules( + `ModulesConf("tests/write1.in.test") +) + 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-core-2.13.22/agent-modules/testsuite/tests/write2.scr new/yast2-core-2.13.23/agent-modules/testsuite/tests/write2.scr --- old/yast2-core-2.13.22/agent-modules/testsuite/tests/write2.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/agent-modules/testsuite/tests/write2.scr 2006-05-24 16:42:13.000000000 +0200 @@ -0,0 +1,6 @@ +. + +`ag_modules( + `ModulesConf("tests/write2.in.test") +) + 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-core-2.13.22/agent-modules/testsuite/tests/write3.scr new/yast2-core-2.13.23/agent-modules/testsuite/tests/write3.scr --- old/yast2-core-2.13.22/agent-modules/testsuite/tests/write3.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/agent-modules/testsuite/tests/write3.scr 2006-05-24 16:42:26.000000000 +0200 @@ -0,0 +1,6 @@ +. + +`ag_modules( + `ModulesConf("tests/write3.in.test") +) + 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-core-2.13.22/configure.in new/yast2-core-2.13.23/configure.in --- old/yast2-core-2.13.22/configure.in 2006-05-02 16:24:23.000000000 +0200 +++ new/yast2-core-2.13.23/configure.in 2006-05-25 10:49:47.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-core dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.13.22, http://www.suse.de/feedback, yast2-core) +AC_INIT(yast2-core, 2.13.23, http://bugs.opensuse.org/, yast2-core) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.22" +VERSION="2.13.23" RPMNAME="yast2-core" MAINTAINER="Stanislav Visnovsky <visnov(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-core-2.13.22/libycp/src/parser.h new/yast2-core-2.13.23/libycp/src/parser.h --- old/yast2-core-2.13.22/libycp/src/parser.h 2006-04-10 10:27:50.000000000 +0200 +++ new/yast2-core-2.13.23/libycp/src/parser.h 2005-04-19 11:07:11.000000000 +0200 @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* A Bison parser, made by GNU Bison 1.875. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* As a special exception, when this file is copied by Bison into a Bison output file, you may use that output file without restriction. @@ -95,7 +95,6 @@ UMINUS = 321 }; #endif -/* Tokens. */ #define SCANNER_ERROR 258 #define END_OF_FILE 259 #define EMPTY 260 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-core-2.13.22/libycp/testsuite/tests/builtin/Builtin-String1.err new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin-String1.err --- old/yast2-core-2.13.22/libycp/testsuite/tests/builtin/Builtin-String1.err 2005-12-09 15:31:13.000000000 +0100 +++ new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin-String1.err 2006-05-24 16:34:00.000000000 +0200 @@ -142,7 +142,7 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- -(regexptokenize ("aaabbBb", "(.*[A-Z]).*") == ["aaabbB"]) +(regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == ["aaabbB"]) ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- 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-core-2.13.22/libycp/testsuite/tests/builtin/Builtin-String1.ycp new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin-String1.ycp --- old/yast2-core-2.13.22/libycp/testsuite/tests/builtin/Builtin-String1.ycp 2005-12-09 15:31:13.000000000 +0100 +++ new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin-String1.ycp 2006-05-24 15:55:40.000000000 +0200 @@ -66,7 +66,7 @@ (regexpsub ("aaabbb", "(.*ab).*", "s_\\1_e") == "s_aaab_e") (regexpsub ("aaabbb", "(.*abb)(.*)", "s_\\1_e\\2") == "s_aaabb_eb") -(regexptokenize ("aaabbBb", "(.*[A-Z]).*") == [ "aaabbB" ]) +(regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == [ "aaabbB" ]) (regexptokenize ("aaabbb", "(.*ab)(.*)") == ["aaab", "bb"]) (regexptokenize ("aaabbb", "(.*ba).*") == []) (regexptokenize ("aaabbb", "(.*ba).*()") == []) 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-core-2.13.22/libycp/testsuite/tests/builtin/Builtin_XI.err new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin_XI.err --- old/yast2-core-2.13.22/libycp/testsuite/tests/builtin/Builtin_XI.err 2005-01-21 18:48:39.000000000 +0100 +++ new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin_XI.err 2006-05-24 16:34:21.000000000 +0200 @@ -40,7 +40,7 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- -(regexptokenize ("aaabbBb", "(.*[A-Z]).*") == ["aaabbB"]) +(regexptokenize ("aaabbBb", "(.*[[:upper:]]).*") == ["aaabbB"]) ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- 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-core-2.13.22/libycp/testsuite/tests/builtin/Builtin_XI.ycp new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin_XI.ycp --- old/yast2-core-2.13.22/libycp/testsuite/tests/builtin/Builtin_XI.ycp 2005-01-21 18:48:39.000000000 +0100 +++ new/yast2-core-2.13.23/libycp/testsuite/tests/builtin/Builtin_XI.ycp 2006-05-24 15:55:05.000000000 +0200 @@ -11,7 +11,7 @@ ( regexpsub( "aaabbb", "(.*ab).*", "s_\\1_e" ) == "s_aaab_e" ) ( regexpsub( "aaabbb", "(.*abb)(.*)", "s_\\1_e\\2" ) == "s_aaabb_eb" ) -( regexptokenize( "aaabbBb", "(.*[A-Z]).*") == [ "aaabbB" ] ) +( regexptokenize( "aaabbBb", "(.*[[:upper:]]).*") == [ "aaabbB" ] ) ( regexptokenize( "aaabbb", "(.*ab)(.*)") == [ "aaab", "bb" ] ) ( regexptokenize( "aaabbb", "(.*ba).*") == [] ) ( regexptokenize( "aaabbb", "(.*ba).*()") == [] ) 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-core-2.13.22/libyui/doc/examples/Layout-Stretchable2.ycp new/yast2-core-2.13.23/libyui/doc/examples/Layout-Stretchable2.ycp --- old/yast2-core-2.13.22/libyui/doc/examples/Layout-Stretchable2.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-2.13.23/libyui/doc/examples/Layout-Stretchable2.ycp 2005-12-13 14:46:32.000000000 +0100 @@ -0,0 +1,35 @@ +{ + // Layout example: + // + // Build a dialog with three widgets without any weights. + // + // Each widget will get its "nice size", i.e. the size that makes + // the widget's contents fit into it. + // + // Upon resize the first and the last widgets will stretch, the + // center widget will retain its size. + // + // The stretchable widgets will get an equal share of the extra + // space in addition to their "nice size". They are not + // (generally) of equal size! + // + + UI::OpenDialog( + `VBox ( + `HBox( + `TextEntry( `opt(`hstretch, `default), "I am stretchable" ), + `TextEntry( "I am not" ), + `TextEntry( `opt(`hstretch ), "I am stretchable, too" ) + ), + `HBox( + `PushButton( `opt(`hstretch, `default), "I am stretchable" ), + `PushButton( "I am not" ), + `PushButton( `opt(`hstretch ), "I am stretchable, too" ) + ) + ) + ); + + UI::UserInput(); + UI::CloseDialog(); +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-CASA
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package yast2-CASA checked in at Fri May 26 15:34:38 CEST 2006. -------- --- yast2-CASA/yast2-CASA.changes 2006-05-23 05:37:24.000000000 +0200 +++ yast2-CASA/yast2-CASA.changes 2006-05-25 21:02:56.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 25 10:19:39 MDT 2006 - cmashayekhi(a)novell.com + +- Buttons start in grayed out state before internal check + for insattation or not. + +------------------------------------------------------------------- Old: ---- yast2-CASA-1.6.641.tar.bz2 New: ---- yast2-CASA-1.6.658.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-CASA.spec ++++++ --- /var/tmp/diff_new_pack.2iYhRi/_old 2006-05-26 15:33:49.000000000 +0200 +++ /var/tmp/diff_new_pack.2iYhRi/_new 2006-05-26 15:33:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-CASA (Version 1.6.641) +# spec file for package yast2-CASA (Version 1.6.658) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: yast2-CASA URL: http://forge.novell.com BuildRequires: update-desktop-files yast2-devel yast2-devtools -Version: 1.6.641 +Version: 1.6.658 Release: 1 License: LGPL Group: System/YaST @@ -35,7 +35,7 @@ Cameron Mashayekhi %prep -%setup -n yast2-CASA-1.6.641 +%setup -n yast2-CASA-1.6.658 %build %{prefix}/bin/y2tool y2autoconf @@ -89,6 +89,9 @@ %doc %{prefix}/share/doc/packages/yast2-CASA %changelog -n yast2-CASA +* Thu May 25 2006 - cmashayekhi(a)novell.com +- Buttons start in grayed out state before internal check + for insattation or not. * Mon May 22 2006 - cmashayekhi(a)novell.com - Bug 171136. Fixed to gray out proper button before and after configuration in yast. ++++++ yast2-CASA-1.6.641.tar.bz2 -> yast2-CASA-1.6.658.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.6.641/VERSION new/yast2-CASA-1.6.658/VERSION --- old/yast2-CASA-1.6.641/VERSION 2006-05-23 05:25:29.000000000 +0200 +++ new/yast2-CASA-1.6.658/VERSION 2006-05-25 19:06:46.000000000 +0200 @@ -1 +1 @@ -1.6.641 +1.6.658 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.6.641/configure new/yast2-CASA-1.6.658/configure --- old/yast2-CASA-1.6.641/configure 2006-05-23 05:25:34.000000000 +0200 +++ new/yast2-CASA-1.6.658/configure 2006-05-25 19:06:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.641. +# Generated by GNU Autoconf 2.59 for yast2-CASA 1.6.658. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-CASA' PACKAGE_TARNAME='yast2-CASA' -PACKAGE_VERSION='1.6.641' -PACKAGE_STRING='yast2-CASA 1.6.641' +PACKAGE_VERSION='1.6.658' +PACKAGE_STRING='yast2-CASA 1.6.658' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-CASA 1.6.641 to adapt to many kinds of systems. +\`configure' configures yast2-CASA 1.6.658 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-CASA 1.6.641:";; + short | recursive ) echo "Configuration of yast2-CASA 1.6.658:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-CASA configure 1.6.641 +yast2-CASA configure 1.6.658 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-CASA $as_me 1.6.641, which was +It was created by yast2-CASA $as_me 1.6.658, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-CASA' - VERSION='1.6.641' + VERSION='1.6.658' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="1.6.641" +VERSION="1.6.658" RPMNAME="yast2-CASA" MAINTAINER="casa <casa(a)novell.com>" @@ -2647,7 +2647,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-CASA $as_me 1.6.641, which was +This file was extended by yast2-CASA $as_me 1.6.658, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2702,7 +2702,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-CASA config.status 1.6.641 +yast2-CASA config.status 1.6.658 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.6.641/configure.in new/yast2-CASA-1.6.658/configure.in --- old/yast2-CASA-1.6.641/configure.in 2006-05-23 05:25:30.000000000 +0200 +++ new/yast2-CASA-1.6.658/configure.in 2006-05-25 19:06:47.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-CASA, 1.6.641, http://www.suse.de/feedback, yast2-CASA) +AC_INIT(yast2-CASA, 1.6.658, http://www.suse.de/feedback, yast2-CASA) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="1.6.641" +VERSION="1.6.658" RPMNAME="yast2-CASA" MAINTAINER="casa <casa(a)novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.6.641/pofiles/Makefile.am new/yast2-CASA-1.6.658/pofiles/Makefile.am --- old/yast2-CASA-1.6.641/pofiles/Makefile.am 2006-05-23 05:25:29.000000000 +0200 +++ new/yast2-CASA-1.6.658/pofiles/Makefile.am 2006-05-25 19:06:46.000000000 +0200 @@ -16,52 +16,69 @@ zhCNdir = /usr/share/YaST2/locale/zh_CN/LC_MESSAGES zhTWdir = /usr/share/YaST2/locale/zh_TW/LC_MESSAGES -cs_DATA = \ - cs/CASA.mo +cs_DIR = cs +de_DIR = de +es_DIR = es +fr_DIR = fr +hu_DIR = hu +it_DIR = it +ja_DIR = ja +pl_DIR = pl +ptBR_DIR = pt_BR +ru_DIR = ru +sk_DIR = sk +sv_DIR = sv +zhCN_DIR = zh_CN +zhTW_DIR = zh_TW -de_DATA = \ - de/CASA.mo + +#cs_DATA = \ +# cs + +#de_DATA = \ +# de/CASA.mo enUS_DATA = \ en_US/CASA.mo -es_DATA = \ - es/CASA.mo +#es_DATA = \ +# es/CASA.mo + +#fr_DATA = \ +# fr/CASA.mo -fr_DATA = \ - fr/CASA.mo +#hu_DATA = \ +# hu/CASA.mo -hu_DATA = \ - hu/CASA.mo +#it_DATA = \ +# it/CASA.mo -it_DATA = \ - it/CASA.mo +#ja_DATA = \ +# ja/CASA.mo -ja_DATA = \ - ja/CASA.mo +#pl_DATA = \ +# pl/CASA.mo -pl_DATA = \ - pl/CASA.mo +#ptBR_DATA = \ +# pt_BR/CASA.mo -ptBR_DATA = \ - pt_BR/CASA.mo +#ru_DATA = \ +# ru/CASA.mo -ru_DATA = \ - ru/CASA.mo +#sk_DATA = \ +# sk/CASA.mo -sk_DATA = \ - sk/CASA.mo +#sv_DATA = \ +# sv/CASA.mo -sv_DATA = \ - sv/CASA.mo +#zhCN_DATA = \ +# zh_CN/CASA.mo -zhCN_DATA = \ - zh_CN/CASA.mo +#zhTW_DATA = \ +# zh_TW/CASA.mo -zhTW_DATA = \ - zh_TW/CASA.mo +EXTRA_DIST = $(cs_DIR) $(de_DIR) $(enUS_DATA) $(es_DIR) $(fr_DIR) $(hu_DIR) \ + $(it_DIR) $(ja_DIR) $(pl_DIR) $(ptBR_DIR) $(ru_DIR) $(sk_DIR) \ + $(sv_DIR) $(zhCN_DIR) $(zhTW_DIR) -EXTRA_DIST = $(cs_DATA) $(de_DATA) $(enUS_DATA) $(es_DATA) $(fr_DATA) $(hu_DATA) \ - $(it_DATA) $(ja_DATA) $(pl_DATA) $(ptBR_DATA) $(ru_DATA) $(sk_DATA) \ - $(sv_DATA) $(zhCN_DATA) $(zhTW_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.6.641/pofiles/Makefile.in new/yast2-CASA-1.6.658/pofiles/Makefile.in --- old/yast2-CASA-1.6.641/pofiles/Makefile.in 2006-05-23 05:25:35.000000000 +0200 +++ new/yast2-CASA-1.6.658/pofiles/Makefile.in 2006-05-25 19:06:51.000000000 +0200 @@ -55,31 +55,9 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(csdir)" "$(DESTDIR)$(dedir)" \ - "$(DESTDIR)$(enUSdir)" "$(DESTDIR)$(esdir)" \ - "$(DESTDIR)$(frdir)" "$(DESTDIR)$(hudir)" "$(DESTDIR)$(itdir)" \ - "$(DESTDIR)$(jadir)" "$(DESTDIR)$(pldir)" \ - "$(DESTDIR)$(ptBRdir)" "$(DESTDIR)$(rudir)" \ - "$(DESTDIR)$(skdir)" "$(DESTDIR)$(svdir)" \ - "$(DESTDIR)$(zhCNdir)" "$(DESTDIR)$(zhTWdir)" -csDATA_INSTALL = $(INSTALL_DATA) -deDATA_INSTALL = $(INSTALL_DATA) +am__installdirs = "$(DESTDIR)$(enUSdir)" enUSDATA_INSTALL = $(INSTALL_DATA) -esDATA_INSTALL = $(INSTALL_DATA) -frDATA_INSTALL = $(INSTALL_DATA) -huDATA_INSTALL = $(INSTALL_DATA) -itDATA_INSTALL = $(INSTALL_DATA) -jaDATA_INSTALL = $(INSTALL_DATA) -plDATA_INSTALL = $(INSTALL_DATA) -ptBRDATA_INSTALL = $(INSTALL_DATA) -ruDATA_INSTALL = $(INSTALL_DATA) -skDATA_INSTALL = $(INSTALL_DATA) -svDATA_INSTALL = $(INSTALL_DATA) -zhCNDATA_INSTALL = $(INSTALL_DATA) -zhTWDATA_INSTALL = $(INSTALL_DATA) -DATA = $(cs_DATA) $(de_DATA) $(enUS_DATA) $(es_DATA) $(fr_DATA) \ - $(hu_DATA) $(it_DATA) $(ja_DATA) $(pl_DATA) $(ptBR_DATA) \ - $(ru_DATA) $(sk_DATA) $(sv_DATA) $(zhCN_DATA) $(zhTW_DATA) +DATA = $(enUS_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -199,54 +177,68 @@ svdir = /usr/share/YaST2/locale/sv/LC_MESSAGES zhCNdir = /usr/share/YaST2/locale/zh_CN/LC_MESSAGES zhTWdir = /usr/share/YaST2/locale/zh_TW/LC_MESSAGES -cs_DATA = \ - cs/CASA.mo +cs_DIR = cs +de_DIR = de +es_DIR = es +fr_DIR = fr +hu_DIR = hu +it_DIR = it +ja_DIR = ja +pl_DIR = pl +ptBR_DIR = pt_BR +ru_DIR = ru +sk_DIR = sk +sv_DIR = sv +zhCN_DIR = zh_CN +zhTW_DIR = zh_TW -de_DATA = \ - de/CASA.mo +#cs_DATA = \ +# cs +#de_DATA = \ +# de/CASA.mo enUS_DATA = \ en_US/CASA.mo -es_DATA = \ - es/CASA.mo -fr_DATA = \ - fr/CASA.mo +#es_DATA = \ +# es/CASA.mo -hu_DATA = \ - hu/CASA.mo +#fr_DATA = \ +# fr/CASA.mo -it_DATA = \ - it/CASA.mo +#hu_DATA = \ +# hu/CASA.mo -ja_DATA = \ - ja/CASA.mo +#it_DATA = \ +# it/CASA.mo -pl_DATA = \ - pl/CASA.mo +#ja_DATA = \ +# ja/CASA.mo -ptBR_DATA = \ - pt_BR/CASA.mo +#pl_DATA = \ +# pl/CASA.mo -ru_DATA = \ - ru/CASA.mo +#ptBR_DATA = \ +# pt_BR/CASA.mo -sk_DATA = \ - sk/CASA.mo +#ru_DATA = \ +# ru/CASA.mo -sv_DATA = \ - sv/CASA.mo +#sk_DATA = \ +# sk/CASA.mo -zhCN_DATA = \ - zh_CN/CASA.mo +#sv_DATA = \ +# sv/CASA.mo -zhTW_DATA = \ - zh_TW/CASA.mo +#zhCN_DATA = \ +# zh_CN/CASA.mo -EXTRA_DIST = $(cs_DATA) $(de_DATA) $(enUS_DATA) $(es_DATA) $(fr_DATA) $(hu_DATA) \ - $(it_DATA) $(ja_DATA) $(pl_DATA) $(ptBR_DATA) $(ru_DATA) $(sk_DATA) \ - $(sv_DATA) $(zhCN_DATA) $(zhTW_DATA) +#zhTW_DATA = \ +# zh_TW/CASA.mo +EXTRA_DIST = $(cs_DIR) $(de_DIR) $(enUS_DATA) $(es_DIR) $(fr_DIR) $(hu_DIR) \ + $(it_DIR) $(ja_DIR) $(pl_DIR) $(ptBR_DIR) $(ru_DIR) $(sk_DIR) \ + $(sv_DIR) $(zhCN_DIR) $(zhTW_DIR) all: all-am @@ -281,40 +273,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: -install-csDATA: $(cs_DATA) - @$(NORMAL_INSTALL) - test -z "$(csdir)" || $(mkdir_p) "$(DESTDIR)$(csdir)" - @list='$(cs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(csDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(csdir)/$$f'"; \ - $(csDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(csdir)/$$f"; \ - done - -uninstall-csDATA: - @$(NORMAL_UNINSTALL) - @list='$(cs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(csdir)/$$f'"; \ - rm -f "$(DESTDIR)$(csdir)/$$f"; \ - done -install-deDATA: $(de_DATA) - @$(NORMAL_INSTALL) - test -z "$(dedir)" || $(mkdir_p) "$(DESTDIR)$(dedir)" - @list='$(de_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(deDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dedir)/$$f'"; \ - $(deDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dedir)/$$f"; \ - done - -uninstall-deDATA: - @$(NORMAL_UNINSTALL) - @list='$(de_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(dedir)/$$f'"; \ - rm -f "$(DESTDIR)$(dedir)/$$f"; \ - done install-enUSDATA: $(enUS_DATA) @$(NORMAL_INSTALL) test -z "$(enUSdir)" || $(mkdir_p) "$(DESTDIR)$(enUSdir)" @@ -332,210 +290,6 @@ echo " rm -f '$(DESTDIR)$(enUSdir)/$$f'"; \ rm -f "$(DESTDIR)$(enUSdir)/$$f"; \ done -install-esDATA: $(es_DATA) - @$(NORMAL_INSTALL) - test -z "$(esdir)" || $(mkdir_p) "$(DESTDIR)$(esdir)" - @list='$(es_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(esDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(esdir)/$$f'"; \ - $(esDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(esdir)/$$f"; \ - done - -uninstall-esDATA: - @$(NORMAL_UNINSTALL) - @list='$(es_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(esdir)/$$f'"; \ - rm -f "$(DESTDIR)$(esdir)/$$f"; \ - done -install-frDATA: $(fr_DATA) - @$(NORMAL_INSTALL) - test -z "$(frdir)" || $(mkdir_p) "$(DESTDIR)$(frdir)" - @list='$(fr_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(frDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(frdir)/$$f'"; \ - $(frDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(frdir)/$$f"; \ - done - -uninstall-frDATA: - @$(NORMAL_UNINSTALL) - @list='$(fr_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(frdir)/$$f'"; \ - rm -f "$(DESTDIR)$(frdir)/$$f"; \ - done -install-huDATA: $(hu_DATA) - @$(NORMAL_INSTALL) - test -z "$(hudir)" || $(mkdir_p) "$(DESTDIR)$(hudir)" - @list='$(hu_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(huDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hudir)/$$f'"; \ - $(huDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hudir)/$$f"; \ - done - -uninstall-huDATA: - @$(NORMAL_UNINSTALL) - @list='$(hu_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(hudir)/$$f'"; \ - rm -f "$(DESTDIR)$(hudir)/$$f"; \ - done -install-itDATA: $(it_DATA) - @$(NORMAL_INSTALL) - test -z "$(itdir)" || $(mkdir_p) "$(DESTDIR)$(itdir)" - @list='$(it_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(itDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(itdir)/$$f'"; \ - $(itDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(itdir)/$$f"; \ - done - -uninstall-itDATA: - @$(NORMAL_UNINSTALL) - @list='$(it_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(itdir)/$$f'"; \ - rm -f "$(DESTDIR)$(itdir)/$$f"; \ - done -install-jaDATA: $(ja_DATA) - @$(NORMAL_INSTALL) - test -z "$(jadir)" || $(mkdir_p) "$(DESTDIR)$(jadir)" - @list='$(ja_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(jaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(jadir)/$$f'"; \ - $(jaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(jadir)/$$f"; \ - done - -uninstall-jaDATA: - @$(NORMAL_UNINSTALL) - @list='$(ja_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(jadir)/$$f'"; \ - rm -f "$(DESTDIR)$(jadir)/$$f"; \ - done -install-plDATA: $(pl_DATA) - @$(NORMAL_INSTALL) - test -z "$(pldir)" || $(mkdir_p) "$(DESTDIR)$(pldir)" - @list='$(pl_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(plDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pldir)/$$f'"; \ - $(plDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pldir)/$$f"; \ - done - -uninstall-plDATA: - @$(NORMAL_UNINSTALL) - @list='$(pl_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pldir)/$$f'"; \ - rm -f "$(DESTDIR)$(pldir)/$$f"; \ - done -install-ptBRDATA: $(ptBR_DATA) - @$(NORMAL_INSTALL) - test -z "$(ptBRdir)" || $(mkdir_p) "$(DESTDIR)$(ptBRdir)" - @list='$(ptBR_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(ptBRDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ptBRdir)/$$f'"; \ - $(ptBRDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ptBRdir)/$$f"; \ - done - -uninstall-ptBRDATA: - @$(NORMAL_UNINSTALL) - @list='$(ptBR_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(ptBRdir)/$$f'"; \ - rm -f "$(DESTDIR)$(ptBRdir)/$$f"; \ - done -install-ruDATA: $(ru_DATA) - @$(NORMAL_INSTALL) - test -z "$(rudir)" || $(mkdir_p) "$(DESTDIR)$(rudir)" - @list='$(ru_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(ruDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rudir)/$$f'"; \ - $(ruDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rudir)/$$f"; \ - done - -uninstall-ruDATA: - @$(NORMAL_UNINSTALL) - @list='$(ru_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(rudir)/$$f'"; \ - rm -f "$(DESTDIR)$(rudir)/$$f"; \ - done -install-skDATA: $(sk_DATA) - @$(NORMAL_INSTALL) - test -z "$(skdir)" || $(mkdir_p) "$(DESTDIR)$(skdir)" - @list='$(sk_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(skDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(skdir)/$$f'"; \ - $(skDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(skdir)/$$f"; \ - done - -uninstall-skDATA: - @$(NORMAL_UNINSTALL) - @list='$(sk_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(skdir)/$$f'"; \ - rm -f "$(DESTDIR)$(skdir)/$$f"; \ - done -install-svDATA: $(sv_DATA) - @$(NORMAL_INSTALL) - test -z "$(svdir)" || $(mkdir_p) "$(DESTDIR)$(svdir)" - @list='$(sv_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(svDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(svdir)/$$f'"; \ - $(svDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(svdir)/$$f"; \ - done - -uninstall-svDATA: - @$(NORMAL_UNINSTALL) - @list='$(sv_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(svdir)/$$f'"; \ - rm -f "$(DESTDIR)$(svdir)/$$f"; \ - done -install-zhCNDATA: $(zhCN_DATA) - @$(NORMAL_INSTALL) - test -z "$(zhCNdir)" || $(mkdir_p) "$(DESTDIR)$(zhCNdir)" - @list='$(zhCN_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(zhCNDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(zhCNdir)/$$f'"; \ - $(zhCNDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(zhCNdir)/$$f"; \ - done - -uninstall-zhCNDATA: - @$(NORMAL_UNINSTALL) - @list='$(zhCN_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(zhCNdir)/$$f'"; \ - rm -f "$(DESTDIR)$(zhCNdir)/$$f"; \ - done -install-zhTWDATA: $(zhTW_DATA) - @$(NORMAL_INSTALL) - test -z "$(zhTWdir)" || $(mkdir_p) "$(DESTDIR)$(zhTWdir)" - @list='$(zhTW_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(zhTWDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(zhTWdir)/$$f'"; \ - $(zhTWDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(zhTWdir)/$$f"; \ - done - -uninstall-zhTWDATA: - @$(NORMAL_UNINSTALL) - @list='$(zhTW_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(zhTWdir)/$$f'"; \ - rm -f "$(DESTDIR)$(zhTWdir)/$$f"; \ - done tags: TAGS TAGS: @@ -544,7 +298,7 @@ distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/cs $(distdir)/de $(distdir)/en_US $(distdir)/es $(distdir)/fr $(distdir)/hu $(distdir)/it $(distdir)/ja $(distdir)/pl $(distdir)/pt_BR $(distdir)/ru $(distdir)/sk $(distdir)/sv $(distdir)/zh_CN $(distdir)/zh_TW + $(mkdir_p) $(distdir)/en_US @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -575,7 +329,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(csdir)" "$(DESTDIR)$(dedir)" "$(DESTDIR)$(enUSdir)" "$(DESTDIR)$(esdir)" "$(DESTDIR)$(frdir)" "$(DESTDIR)$(hudir)" "$(DESTDIR)$(itdir)" "$(DESTDIR)$(jadir)" "$(DESTDIR)$(pldir)" "$(DESTDIR)$(ptBRdir)" "$(DESTDIR)$(rudir)" "$(DESTDIR)$(skdir)" "$(DESTDIR)$(svdir)" "$(DESTDIR)$(zhCNdir)" "$(DESTDIR)$(zhTWdir)"; do \ + for dir in "$(DESTDIR)$(enUSdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -620,11 +374,7 @@ info-am: -install-data-am: install-csDATA install-deDATA install-enUSDATA \ - install-esDATA install-frDATA install-huDATA install-itDATA \ - install-jaDATA install-plDATA install-ptBRDATA install-ruDATA \ - install-skDATA install-svDATA install-zhCNDATA \ - install-zhTWDATA +install-data-am: install-enUSDATA install-exec-am: @@ -650,29 +400,17 @@ ps-am: -uninstall-am: uninstall-csDATA uninstall-deDATA uninstall-enUSDATA \ - uninstall-esDATA uninstall-frDATA uninstall-huDATA \ - uninstall-info-am uninstall-itDATA uninstall-jaDATA \ - uninstall-plDATA uninstall-ptBRDATA uninstall-ruDATA \ - uninstall-skDATA uninstall-svDATA uninstall-zhCNDATA \ - uninstall-zhTWDATA +uninstall-am: uninstall-enUSDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-csDATA install-data install-data-am \ - install-deDATA install-enUSDATA install-esDATA install-exec \ - install-exec-am install-frDATA install-huDATA install-info \ - install-info-am install-itDATA install-jaDATA install-man \ - install-plDATA install-ptBRDATA install-ruDATA install-skDATA \ - install-strip install-svDATA install-zhCNDATA install-zhTWDATA \ - installcheck installcheck-am installdirs maintainer-clean \ + install install-am install-data install-data-am \ + install-enUSDATA install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-csDATA \ - uninstall-deDATA uninstall-enUSDATA uninstall-esDATA \ - uninstall-frDATA uninstall-huDATA uninstall-info-am \ - uninstall-itDATA uninstall-jaDATA uninstall-plDATA \ - uninstall-ptBRDATA uninstall-ruDATA uninstall-skDATA \ - uninstall-svDATA uninstall-zhCNDATA uninstall-zhTWDATA + pdf-am ps ps-am uninstall uninstall-am uninstall-enUSDATA \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. Binary files old/yast2-CASA-1.6.641/pofiles/cs/CASA.mo and new/yast2-CASA-1.6.658/pofiles/cs/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/de/CASA.mo and new/yast2-CASA-1.6.658/pofiles/de/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/es/CASA.mo and new/yast2-CASA-1.6.658/pofiles/es/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/fr/CASA.mo and new/yast2-CASA-1.6.658/pofiles/fr/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/hu/CASA.mo and new/yast2-CASA-1.6.658/pofiles/hu/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/it/CASA.mo and new/yast2-CASA-1.6.658/pofiles/it/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/ja/CASA.mo and new/yast2-CASA-1.6.658/pofiles/ja/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/pl/CASA.mo and new/yast2-CASA-1.6.658/pofiles/pl/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/pt_BR/CASA.mo and new/yast2-CASA-1.6.658/pofiles/pt_BR/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/ru/CASA.mo and new/yast2-CASA-1.6.658/pofiles/ru/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/sk/CASA.mo and new/yast2-CASA-1.6.658/pofiles/sk/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/sv/CASA.mo and new/yast2-CASA-1.6.658/pofiles/sv/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/zh_CN/CASA.mo and new/yast2-CASA-1.6.658/pofiles/zh_CN/CASA.mo differ Binary files old/yast2-CASA-1.6.641/pofiles/zh_TW/CASA.mo and new/yast2-CASA-1.6.658/pofiles/zh_TW/CASA.mo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-CASA-1.6.641/src/complex.ycp new/yast2-CASA-1.6.658/src/complex.ycp --- old/yast2-CASA-1.6.641/src/complex.ycp 2006-05-23 00:39:40.000000000 +0200 +++ new/yast2-CASA-1.6.658/src/complex.ycp 2006-05-25 18:38:54.000000000 +0200 @@ -112,20 +112,25 @@ `VSpacing(), `VSpacing() )); + Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", Label::BackButton(), Label::FinishButton()); + UI::ChangeWidget(`id(`install_casa_button), `Enabled, false); + UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false); + + integer iConfig_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/iscasaconfiged"); if(iConfig_CASAReturn == 0) { - UI::ChangeWidget(`id(`install_casa_button), `Enabled, false); + UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, true); } else { - UI::ChangeWidget(`id(`uninstall_casa_button), `Enabled, false); + UI::ChangeWidget(`id(`install_casa_button), `Enabled, true); } any ret = nil; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Fri May 26 15:33:42 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-05-19 12:48:31.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-05-25 20:56:49.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 22 23:15:23 CEST 2006 - sndirsch(a)suse.de + +- p_xlib_skip_ext_env.diff: + * added support for disabling extensions through environment + variables (Bug #167317) +- no longer remove NVIDIA installer in %pre of xorg-x11-server-glx, + since it's no longer conflicting with the NVIDIA driver package + (Bug #175683) +- make sure that /usr/X11R6/lib/X11/fonts/misc/fonts.dir is not + empty (Bug #178315) + +------------------------------------------------------------------- New: ---- p_xlib_skip_ext_env.diff pc_xf86-pci.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.aqnlNN/_old 2006-05-26 15:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.aqnlNN/_new 2006-05-26 15:30:54.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 52 +Release: 53 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -122,6 +122,8 @@ Patch363: p_xrender-mitri.diff Patch364: p_pci-legacy-mmap.diff Patch365: p_xorg-fbcompose-radek2.diff +Patch366: pc_xf86-pci.diff +Patch367: p_xlib_skip_ext_env.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1556,6 +1558,11 @@ %endif pushd programs/Xserver/ %patch365 -p0 +# needs to be rewritten first +#%patch366 -p0 +popd +pushd lib/X11 +%patch367 -p0 popd # UTS_RELEASE=`uname -r` @@ -1716,6 +1723,8 @@ make install DESTDIR=$RPM_BUILD_ROOT make install.man DESTDIR=$RPM_BUILD_ROOT make install.sdk DESTDIR=$RPM_BUILD_ROOT +# make sure that fonts.dir is not empty (Bug #178315) +test -s $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/fonts.dir # build libxf86config also for s390/s390x (Bug #145823) %ifarch s390 s390x make -C programs/Xserver/hw/xfree86/parser install DESTDIR=$RPM_BUILD_ROOT @@ -2147,12 +2156,6 @@ fi exit 0 %ifarch %ix86 x86_64 - -%pre server-glx -# nvidia driver might be installed; uninstall it cleanly -test -x usr/bin/nvidia-installer && \ - usr/bin/nvidia-installer -s --uninstall &> /dev/null -exit 0 %if !%{USE_EXTERNAL_MESA} %pre Mesa @@ -2713,6 +2716,15 @@ %clean %changelog -n xorg-x11 +* Mon May 22 2006 - sndirsch(a)suse.de +- p_xlib_skip_ext_env.diff: + * added support for disabling extensions through environment + variables (Bug #167317) +- no longer remove NVIDIA installer in %%pre of xorg-x11-server-glx, + since it's no longer conflicting with the NVIDIA driver package + (Bug #175683) +- make sure that /usr/X11R6/lib/X11/fonts/misc/fonts.dir is not + empty (Bug #178315) * Fri May 19 2006 - sndirsch(a)suse.de - /etc/X11/xdm/Xsetup: * start compiz on gdm when GLX_EXT_texture_from_pixmap is ++++++ FILES ++++++ --- xorg-x11/FILES 2006-05-11 14:47:26.000000000 +0200 +++ xorg-x11/FILES 2006-05-22 23:24:27.000000000 +0200 @@ -171,3 +171,9 @@ - fixes massive Xrender corruption (Bug #152730, X.Org Bug #6827) p_xrender-mitri.diff [KEEP?] - fixed buffer overflow in Xrender (CVE-2006-1526, Bug #168712) +pc_xf86-pci.diff [KEEP?] +- fixes crashes and hangs on dual-card systems (Bug #171453, + X.Org Bug #6751) +p_xlib_skip_ext_env.diff [KEEP?] +- added support for disabling extensions through environment + variables (Bug #167317) ++++++ p_xlib_skip_ext_env.diff ++++++ --- QuExt.c 2006-05-12 20:46:51.000000000 +0200 +++ QuExt.c 2006-05-20 21:07:13.000000000 +0200 @@ -43,6 +43,20 @@ xQueryExtensionReply rep; register xQueryExtensionReq *req; + if (name && strlen (name) < 256) + { + char var[256 + 15]; + int i; + + strcpy (var, "XLIB_SKIP_EXT_"); + for (i = 0; name[i]; i++) + var[i + 14] = name[i] == '-' ? '_' : name[i]; + + var[i + 14] = 0; + if (getenv (var)) + return False; + } + LockDisplay(dpy); GetReq(QueryExtension, req); req->nbytes = name ? strlen(name) : 0; ++++++ pc_xf86-pci.diff ++++++ --- hw/xfree86/os-support/bus/Pci.c.orig 2006-05-23 11:26:01.000000000 +0200 +++ hw/xfree86/os-support/bus/Pci.c 2006-05-23 11:37:57.000000000 +0200 @@ -233,6 +233,8 @@ static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, }; +static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len); + /* * Platform specific PCI function pointers. * @@ -266,6 +268,11 @@ #endif } +void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)) +{ + pciOSHandleBIOS = bios_fn; +} + PCITAG pciFindFirst(CARD32 id, CARD32 mask) { @@ -1376,6 +1383,13 @@ PCITAG *pTag; int i; + /* fall back to the old code if the OS code fails */ + if (pciOSHandleBIOS) { + n = pciOSHandleBIOS(Tag, basereg, func, ptr); + if (n) + return n; + } + n = handlePciBIOS(Tag,basereg,func,ptr); if (n) return n; --- hw/xfree86/os-support/bus/Pci.h.orig 2006-05-23 11:26:01.000000000 +0200 +++ hw/xfree86/os-support/bus/Pci.h 2006-05-23 11:26:01.000000000 +0200 @@ -431,6 +431,7 @@ Bool pciMfDev(int, int); ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS); +extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)); extern PCITAG (*pciFindFirstFP)(void); extern PCITAG (*pciFindNextFP)(void); --- hw/xfree86/os-support/bus/linuxPci.c.orig 2006-05-23 11:26:01.000000000 +0200 +++ hw/xfree86/os-support/bus/linuxPci.c 2006-05-23 12:01:26.000000000 +0200 @@ -74,6 +74,7 @@ static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val); static CARD16 linuxPciCfgReadWord(PCITAG tag, int off); static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val); +static int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len); static Bool linuxDomainSupport(void); static pciBusFuncs_t linuxFuncs0 = { @@ -133,6 +134,7 @@ pciBusInfo[0] = &linuxPci0; pciFindFirstFP = pciGenFindFirst; pciFindNextFP = pciGenFindNext; + pciSetOSBIOSPtr(linuxPciHandleBIOS); return; } @@ -943,6 +945,47 @@ #endif /* !INCLUDE_XF86_NO_DOMAIN */ +int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len) +{ + unsigned int dom, bus, dev, func; + unsigned int fd; + char file[256]; + struct stat st; + int ret; + int sofar = 0; + + dom = PCI_DOM_FROM_TAG(Tag); + bus = PCI_BUS_FROM_TAG(Tag); + dev = PCI_DEV_FROM_TAG(Tag); + func = PCI_FUNC_FROM_TAG(Tag); + sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom", + dom, bus, dev, func); + + if (stat(file, &st) == 0) + { + if ((fd = open(file, O_RDWR))) + basereg = 0x0; + + /* enable the ROM first */ + write(fd, "1", 2); + lseek(fd, 0, SEEK_SET); + do { + /* copy the ROM until we hit Len, EOF or read error */ + ret = read(fd, buf+sofar, len-sofar); + if (ret <= 0) + break; + sofar += ret; + } while (sofar < len); + + write(fd, "0", 2); + close(fd); + if (sofar < len) + xf86MsgVerb(X_INFO, 3, "Attempted to read BIOS %dKB from %s: got %dKB\n", len/1024, file, sofar/1024); + return sofar; + } + return 0; +} + #ifdef __ia64__ static PCITAG ia64linuxPciFindFirst(void); static PCITAG ia64linuxPciFindNext(void); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xgl
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package xgl checked in at Fri May 26 15:29:51 CEST 2006. -------- --- xgl/xgl.changes 2006-05-22 02:31:24.000000000 +0200 +++ xgl/xgl.changes 2006-05-26 11:58:06.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 11:56:55 CEST 2006 - dreveman(a)suse.de + +- Adjust for capStyle correctly in xglFillSegment. (bnc #178234) +- Add info logging. (bnc #178214) + +------------------------------------------------------------------- New: ---- 178214.diff 178234.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.V3Eowc/_old 2006-05-26 15:29:39.000000000 +0200 +++ /var/tmp/diff_new_pack.V3Eowc/_new 2006-05-26 15:29:39.000000000 +0200 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 1 +Release: 2 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -42,6 +42,8 @@ Patch1: xgl-security-file-dir.diff Patch2: xgl-xpstubs-link-hack.diff Patch3: xgl-maprules-tolower-fix.diff +Patch4: 178214.diff +Patch5: 178234.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -79,6 +81,8 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-security-file-dir.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xpstubs-link-hack.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-maprules-tolower-fix.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178214.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234.diff || exit 1 %build PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl @@ -141,6 +145,9 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Fri May 26 2006 - dreveman(a)suse.de +- Adjust for capStyle correctly in xglFillSegment. (bnc #178234) +- Add info logging. (bnc #178214) * Mon May 22 2006 - dreveman(a)suse.de - Fix pbuffer resize issue that caused the server to crash when using fglrx driver. (bnc #175637) ++++++ 178214.diff ++++++ diff -ur xorg-server-1.1.99.1/hw/xgl/Makefile.am ./hw/xgl/Makefile.am --- xorg-server-1.1.99.1/hw/xgl/Makefile.am 2006-04-08 12:48:38.000000000 +0200 +++ ./hw/xgl/Makefile.am 2006-05-24 11:15:48.000000000 +0200 @@ -28,6 +28,10 @@ -I@MESA_SOURCE@/src/mesa/glapi \ $(XGLMODULES_CFLAGS) +if MMX_CAPABLE +AM_CFLAGS += -DUSE_MMX +endif + noinst_LIBRARIES = libxgl.a libxgl_a_SOURCES = \ diff -ur xorg-server-1.1.99.1/hw/xgl/Makefile.in ./hw/xgl/Makefile.in --- xorg-server-1.1.99.1/hw/xgl/Makefile.in 2006-05-02 01:28:54.000000000 +0200 +++ ./hw/xgl/Makefile.in 2006-05-24 11:16:02.000000000 +0200 @@ -37,6 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@MMX_CAPABLE_TRUE@am__append_1 = -DUSE_MMX bin_PROGRAMS = $(am__EXEEXT_1) subdir = hw/xgl DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -556,16 +557,10 @@ $(XGLX_SUBDIRS) \ $(XEGL_SUBDIRS) -AM_CFLAGS = \ - @SERVER_DEFINES@ \ - -DHAVE_XGL_CONFIG_H \ - -DHAVE_DIX_CONFIG_H \ - -I$(top_srcdir)/GL/glx \ - -I$(top_srcdir)/GL/include \ - -I@MESA_SOURCE@/include \ - -I@MESA_SOURCE@/src/mesa/glapi \ - $(XGLMODULES_CFLAGS) - +AM_CFLAGS = @SERVER_DEFINES@ -DHAVE_XGL_CONFIG_H -DHAVE_DIX_CONFIG_H \ + -I$(top_srcdir)/GL/glx -I$(top_srcdir)/GL/include \ + -I@MESA_SOURCE@/include -I@MESA_SOURCE@/src/mesa/glapi \ + $(XGLMODULES_CFLAGS) $(am__append_1) noinst_LIBRARIES = libxgl.a libxgl_a_SOURCES = \ xgl.h \ diff -ur xorg-server-1.1.99.1/hw/xgl/egl/xeglinit.c ./hw/xgl/egl/xeglinit.c --- xorg-server-1.1.99.1/hw/xgl/egl/xeglinit.c 2006-04-13 13:42:18.000000000 +0200 +++ ./hw/xgl/egl/xeglinit.c 2006-05-24 14:01:47.000000000 +0200 @@ -46,6 +46,8 @@ static Bool loadGlx = TRUE; #endif +char *xglLogFile = 0; + void InitOutput (ScreenInfo *pScreenInfo, int argc, diff -ur xorg-server-1.1.99.1/hw/xgl/xgl.h ./hw/xgl/xgl.h --- xorg-server-1.1.99.1/hw/xgl/xgl.h 2006-05-19 13:08:33.000000000 +0200 +++ ./hw/xgl/xgl.h 2006-05-24 13:55:29.000000000 +0200 @@ -67,6 +67,7 @@ #define VERSION "0.0.1" extern WindowPtr *WindowTable; +extern char *xglLogFile; #define XGL_DEFAULT_PBO_MASK 0 diff -ur xorg-server-1.1.99.1/hw/xgl/xglinit.c ./hw/xgl/xglinit.c --- xorg-server-1.1.99.1/hw/xgl/xglinit.c 2006-04-13 13:42:12.000000000 +0200 +++ ./hw/xgl/xglinit.c 2006-05-24 14:02:00.000000000 +0200 @@ -63,6 +63,9 @@ #endif +char logFile[260]; +char *xglLogFile = 0; + typedef struct _xglDDXFunc { void (*initOutput) (ScreenInfo *pScreenInfo, int argc, @@ -188,6 +191,15 @@ int argc, char **argv) { + char oldLogFile[260]; + + snprintf (logFile, 256, "/var/log/Xgl.%s.log", display); + snprintf (oldLogFile, 260, "/var/log/Xgl.%s.log.old", display); + + rename (logFile, oldLogFile); + + xglLogFile = logFile; + (void) symTab; if (!xglEnsureDDXModule ()) diff -ur xorg-server-1.1.99.1/hw/xgl/xglscreen.c ./hw/xgl/xglscreen.c --- xorg-server-1.1.99.1/hw/xgl/xglscreen.c 2006-04-13 13:55:19.000000000 +0200 +++ ./hw/xgl/xglscreen.c 2006-05-24 13:57:59.000000000 +0200 @@ -112,6 +112,184 @@ return TRUE; } +#include "fbmmx.h" +#include <errno.h> + +static Bool +printFmt (FILE *logFp, + glitz_drawable_format_t *format) +{ + if (format) + { + fprintf (logFp, "0x%x\t%d/%d/%d/%d \t%d\t%d\t%c\t%d\n", + (int) format->id, + format->color.red_size, + format->color.green_size, + format->color.blue_size, + format->color.alpha_size, + format->depth_size, + format->stencil_size, + (format->doublebuffer) ? 'y' : '.', + format->samples); + + return TRUE; + } + + return FALSE; +} + +static void +xglLogScreen (ScreenPtr pScreen) +{ + FILE *logFp; + + XGL_SCREEN_PRIV (pScreen); + + if (!xglLogFile) + return; + + logFp = fopen (xglLogFile, "a"); + if (logFp) + { + static char *geometryDataTypeName[] = { + "short", + "float" + }; + static char *geometryUsageName[] = { + "stream", + "static", + "dynamic", + "sysmem" + }; + glitz_drawable_t *drawable = pScreenPriv->drawable; + glitz_format_t *formats; + int i; + + fprintf (logFp, "screen %d - %dx%d @ %d:\n", pScreen->myNum, + pScreen->width, pScreen->height, pScreen->rootDepth); + + fprintf (logFp, "\n"); + fprintf (logFp, "GL vendor: %s\n", + glitz_drawable_get_gl_string (drawable, + GLITZ_GL_STRING_VENDOR)); + fprintf (logFp, "GL renderer: %s\n", + glitz_drawable_get_gl_string (drawable, + GLITZ_GL_STRING_RENDERER)); + fprintf (logFp, "GL version: %s\n", + glitz_drawable_get_gl_string (drawable, + GLITZ_GL_STRING_VERSION)); + fprintf (logFp, "GL extensions: %s\n", + glitz_drawable_get_gl_string (drawable, + GLITZ_GL_STRING_EXTENSIONS)); + + fprintf (logFp, "\n"); + fprintf (logFp, "geometry data type: %s\n", + geometryDataTypeName[pScreenPriv->geometryDataType]); + fprintf (logFp, "geometry usage: %s\n", + geometryUsageName[pScreenPriv->geometryUsage]); + fprintf (logFp, "Y inverted: %d\n", pScreenPriv->yInverted); + fprintf (logFp, "PBO mask: 0x%08x\n", pScreenPriv->pboMask); + fprintf (logFp, "lines: %d\n", pScreenPriv->lines); + fprintf (logFp, "YUV: %d\n", !pScreenPriv->noYuv); + fprintf (logFp, "XV filter: %s\n", pScreenPriv->xvFilter); + fprintf (logFp, "accel:\n"); + fprintf (logFp, " pixmap: %d %d - %dx%d - %dx%d\n", + pScreenPriv->accel.pixmap.enabled, + pScreenPriv->accel.pixmap.pbuffer, + pScreenPriv->accel.pixmap.size.minWidth, + pScreenPriv->accel.pixmap.size.minHeight, + pScreenPriv->accel.pixmap.size.aboveWidth, + pScreenPriv->accel.pixmap.size.aboveHeight); + fprintf (logFp, " window: %d %d - %dx%d - %dx%d\n", + pScreenPriv->accel.window.enabled, + pScreenPriv->accel.window.pbuffer, + pScreenPriv->accel.window.size.minWidth, + pScreenPriv->accel.window.size.minHeight, + pScreenPriv->accel.window.size.aboveWidth, + pScreenPriv->accel.window.size.aboveHeight); + fprintf (logFp, " glx: %d %d - %dx%d - %dx%d\n", + pScreenPriv->accel.glx.enabled, + pScreenPriv->accel.glx.pbuffer, + pScreenPriv->accel.glx.size.minWidth, + pScreenPriv->accel.glx.size.minHeight, + pScreenPriv->accel.glx.size.aboveWidth, + pScreenPriv->accel.glx.size.aboveHeight); + fprintf (logFp, " xv: %d %d - %dx%d - %dx%d\n", + pScreenPriv->accel.xv.enabled, + pScreenPriv->accel.xv.pbuffer, + pScreenPriv->accel.xv.size.minWidth, + pScreenPriv->accel.xv.size.minHeight, + pScreenPriv->accel.xv.size.aboveWidth, + pScreenPriv->accel.xv.size.aboveHeight); + fprintf (logFp, "features: 0x%08x\n", pScreenPriv->features); + fprintf (logFp, "MMX: %d\n", fbHaveMMX ()); + +#if IMAGE_BYTE_ORDER == MSBFirst + fprintf (logFp, "byte order: MSB\n"); +#else + fprintf (logFp, "byte order: LSB\n"); +#endif + + fprintf (logFp, "\n"); + fprintf (logFp, "drawable format:\n"); + printFmt (logFp, glitz_drawable_get_format (drawable)); + + fprintf (logFp, "\n"); + fprintf (logFp, "pbuffer formats:\n"); + + i = 0; + while (printFmt (logFp, glitz_find_pbuffer_format (drawable, 0, 0, i))) + i++; + + fprintf (logFp, "\n"); + fprintf (logFp, "fbo formats:\n"); + + i = 0; + while (printFmt (logFp, glitz_find_drawable_format (drawable, 0, 0, i))) + i++; + + fprintf (logFp, "\n"); + fprintf (logFp, "surface formats:\n"); + + i = 0; + do { + formats = glitz_find_format (drawable, 0, NULL, i++); + + if (formats) + { + fprintf (logFp, "0x%x\t", (int) formats->id); + + switch (formats->color.fourcc) { + case GLITZ_FOURCC_RGB: + fprintf (logFp, "color\tRGB\t%d/%d/%d/%d", + formats->color.red_size, + formats->color.green_size, + formats->color.blue_size, + formats->color.alpha_size); + break; + case GLITZ_FOURCC_YV12: + fprintf (logFp, "color\tYV12"); + break; + case GLITZ_FOURCC_YUY2: + fprintf (logFp, "color\tYUY2"); + break; + } + + fprintf (logFp, "\n"); + } + } while (formats); + + fprintf (logFp, "\n"); + + fclose (logFp); + } + else + { + ErrorF ("Couldn't open log file '%s' for writing: %s\n", + xglLogFile, strerror (errno)); + } +} + Bool xglScreenInit (ScreenPtr pScreen) { @@ -390,6 +568,8 @@ return FALSE; #endif + xglLogScreen (pScreen); + return TRUE; } ++++++ 178234.diff ++++++ --- hw/xgl/xglfill.c 18 Jan 2006 07:15:54 -0000 1.9 +++ hw/xgl/xglfill.c 26 May 2006 08:24:30 -0000 @@ -585,15 +585,19 @@ { full.x1 = pSegInit->x1; full.x2 = pSegInit->x2; + if (pGC->capStyle != CapNotLast) + full.x2++; } else { full.x1 = pSegInit->x2; - full.x2 = pSegInit->x1; + full.x2 = pSegInit->x1 + 1; + if (pGC->capStyle == CapNotLast) + full.x1++; } full.x1 += pDrawable->x; - full.x2 += pDrawable->x + 1; + full.x2 += pDrawable->x; full.y1 = pSegInit->y1 + pDrawable->y; full.y2 = full.y1 + 1; } @@ -603,15 +607,19 @@ { full.y1 = pSegInit->y1; full.y2 = pSegInit->y2; + if (pGC->capStyle != CapNotLast) + full.y2++; } else { full.y1 = pSegInit->y2; full.y2 = pSegInit->y1; + if (pGC->capStyle == CapNotLast) + full.y1++; } full.y1 += pDrawable->y; - full.y2 += pDrawable->y + 1; + full.y2 += pDrawable->y; full.x1 = pSegInit->x1 + pDrawable->x; full.x2 = full.x1 + 1; } ++++++ glitz-0.5.6.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.6/ChangeLog new/glitz-0.5.6/ChangeLog --- old/glitz-0.5.6/ChangeLog 2006-05-22 02:24:14.000000000 +0200 +++ new/glitz-0.5.6/ChangeLog 2006-05-24 14:10:15.000000000 +0200 @@ -1,3 +1,12 @@ +2006-05-24 David Reveman <davidr(a)novell.com> + + * src/glx/glitz_glx_context.c (_glitz_glx_context_initialize): + * src/glitz.h: Add direct rendering to feature mask. + + * src/glitz_drawable.c: + * src/glitzint.h: + * src/glitz.h: Add glitz_drawable_get_gl_string. + 2006-05-22 David Reveman <davidr(a)novell.com> * src/glx/glitz_glx_context.c (_glitz_glx_context_update): Update diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.6/src/glitz.h new/glitz-0.5.6/src/glitz.h --- old/glitz-0.5.6/src/glitz.h 2006-05-20 22:30:03.000000000 +0200 +++ new/glitz-0.5.6/src/glitz.h 2006-05-24 14:07:29.000000000 +0200 @@ -130,6 +130,7 @@ #define GLITZ_FEATURE_MULTI_DRAW_ARRAYS_MASK (1L << 15) #define GLITZ_FEATURE_FRAMEBUFFER_OBJECT_MASK (1L << 16) #define GLITZ_FEATURE_COPY_SUB_BUFFER_MASK (1L << 17) +#define GLITZ_FEATURE_DIRECT_RENDERING_MASK (1L << 18) /* glitz_format.c */ @@ -282,6 +283,17 @@ glitz_drawable_format_t * glitz_drawable_get_format (glitz_drawable_t *drawable); +typedef enum { + GLITZ_GL_STRING_VENDOR, + GLITZ_GL_STRING_RENDERER, + GLITZ_GL_STRING_VERSION, + GLITZ_GL_STRING_EXTENSIONS +} glitz_gl_string_t; + +const char * +glitz_drawable_get_gl_string (glitz_drawable_t *drawable, + glitz_gl_string_t name); + /* glitz_surface.c */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.6/src/glitz_drawable.c new/glitz-0.5.6/src/glitz_drawable.c --- old/glitz-0.5.6/src/glitz_drawable.c 2006-03-13 14:49:42.000000000 +0100 +++ new/glitz-0.5.6/src/glitz_drawable.c 2006-05-24 14:08:00.000000000 +0200 @@ -408,3 +408,36 @@ return &drawable->format->d; } slim_hidden_def(glitz_drawable_get_format); + +const char * +glitz_drawable_get_gl_string (glitz_drawable_t *drawable, + glitz_gl_string_t name) +{ + const glitz_gl_ubyte_t *string; + glitz_gl_enum_t gl_name; + + switch (name) { + case GLITZ_GL_STRING_VENDOR: + gl_name = GLITZ_GL_VENDOR; + break; + case GLITZ_GL_STRING_RENDERER: + gl_name = GLITZ_GL_RENDERER; + break; + case GLITZ_GL_STRING_VERSION: + gl_name = GLITZ_GL_VERSION; + break; + case GLITZ_GL_STRING_EXTENSIONS: + gl_name = GLITZ_GL_EXTENSIONS; + break; + default: + return NULL; + } + + drawable->backend->push_current (drawable, NULL, GLITZ_CONTEXT_CURRENT, + NULL); + string = drawable->backend->gl->get_string (gl_name); + drawable->backend->pop_current (drawable); + + return (const char *) string; +} +slim_hidden_def(glitz_drawable_get_gl_string); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.6/src/glitz_gl.h new/glitz-0.5.6/src/glitz_gl.h --- old/glitz-0.5.6/src/glitz_gl.h 2006-03-13 14:43:57.000000000 +0100 +++ new/glitz-0.5.6/src/glitz_gl.h 2006-05-24 13:06:06.000000000 +0200 @@ -60,6 +60,8 @@ #define GLITZ_GL_NO_ERROR 0x0 #define GLITZ_GL_INVALID_OPERATION 0x0502 +#define GLITZ_GL_VENDOR 0x1F00 +#define GLITZ_GL_RENDERER 0x1F01 #define GLITZ_GL_VERSION 0x1F02 #define GLITZ_GL_EXTENSIONS 0x1F03 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.6/src/glitzint.h new/glitz-0.5.6/src/glitzint.h --- old/glitz-0.5.6/src/glitzint.h 2006-03-13 14:43:57.000000000 +0100 +++ new/glitz-0.5.6/src/glitzint.h 2006-05-24 13:13:14.000000000 +0200 @@ -1077,6 +1077,7 @@ slim_hidden_proto(glitz_drawable_finish) slim_hidden_proto(glitz_drawable_get_features) slim_hidden_proto(glitz_drawable_get_format) +slim_hidden_proto(glitz_drawable_get_gl_string) slim_hidden_proto(glitz_surface_set_transform) slim_hidden_proto(glitz_surface_set_fill) slim_hidden_proto(glitz_surface_set_component_alpha) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glitz-0.5.6/src/glx/glitz_glx_context.c new/glitz-0.5.6/src/glx/glitz_glx_context.c --- old/glitz-0.5.6/src/glx/glitz_glx_context.c 2006-05-22 02:17:11.000000000 +0200 +++ new/glitz-0.5.6/src/glx/glitz_glx_context.c 2006-05-24 12:46:01.000000000 +0200 @@ -368,6 +368,9 @@ if (screen_info->glx_feature_mask & GLITZ_GLX_FEATURE_COPY_SUB_BUFFER_MASK) context->backend.feature_mask |= GLITZ_FEATURE_COPY_SUB_BUFFER_MASK; + if (glXIsDirect (screen_info->display_info->display, context->context)) + context->backend.feature_mask |= GLITZ_FEATURE_DIRECT_RENDERING_MASK; + context->initialized = 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xboard
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package xboard checked in at Fri May 26 15:29:32 CEST 2006. -------- --- xboard/xboard.changes 2006-01-25 21:42:59.000000000 +0100 +++ xboard/xboard.changes 2006-05-26 12:37:47.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 12:37:41 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- xboard-4.2.7-strip.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xboard.spec ++++++ --- /var/tmp/diff_new_pack.QmlMaV/_old 2006-05-26 15:29:27.000000000 +0200 +++ /var/tmp/diff_new_pack.QmlMaV/_new 2006-05-26 15:29:27.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package xboard (Version 4.2.7) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,13 +17,14 @@ Requires: chess_backend Autoreqprov: on Version: 4.2.7 -Release: 48 +Release: 60 Summary: X Window System Interface for GNU Chess Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: %name.png Patch: %{name}-%{version}.patch Patch1: %{name}-%{version}-flex.patch +Patch2: %{name}-%{version}-strip.patch URL: http://www.tim-mann.org/xboard.html BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -44,6 +45,7 @@ %setup -q %patch -p1 %patch1 +%patch2 %build %{suse_update_config -f .} @@ -54,7 +56,6 @@ make %install -rm -rf $RPM_BUILD_ROOT make bindir=$RPM_BUILD_ROOT/usr/bin \ man6dir=$RPM_BUILD_ROOT/usr/share/man/man6 \ infodir=$RPM_BUILD_ROOT/%{_infodir} \ @@ -84,6 +85,8 @@ /usr/share/pixmaps/%name.png %changelog -n xboard +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Dec 06 2005 - mmarek(a)suse.cz ++++++ xboard-4.2.7-strip.patch ++++++ --- Makefile.in +++ Makefile.in @@ -63,8 +63,8 @@ all: default pseudosource info FAQ html dvi ps install: installdirs default - $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard - $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm + $(INSTALL_PROGRAM) xboard $(bindir)/xboard + $(INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm $(INSTALL_PROGRAM) cmail $(bindir)/cmail $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit vsftpd
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package vsftpd checked in at Fri May 26 15:25:49 CEST 2006. -------- --- vsftpd/vsftpd.changes 2006-04-20 18:05:04.000000000 +0200 +++ vsftpd/vsftpd.changes 2006-05-26 11:50:13.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 11:50:07 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsftpd.spec ++++++ --- /var/tmp/diff_new_pack.AtGaIU/_old 2006-05-26 15:25:32.000000000 +0200 +++ /var/tmp/diff_new_pack.AtGaIU/_new 2006-05-26 15:25:32.000000000 +0200 @@ -13,7 +13,7 @@ Name: vsftpd BuildRequires: libcap-devel openssl-devel pam-devel Version: 2.0.4 -Release: 15 +Release: 19 Summary: Very Secure FTP Daemon - Written from Scratch License: GPL Group: Productivity/Networking/Ftp/Servers @@ -64,7 +64,7 @@ %build rm -f dummyinc/sys/capability.h make CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fPIE -fstack-protector" \ - LDFLAGS="-pie" + LDFLAGS="-pie" LINK= %install mkdir -p $RPM_BUILD_ROOT/usr/share/empty @@ -106,6 +106,8 @@ %doc README.SUSE %changelog -n vsftpd +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Thu Apr 20 2006 - hvogel(a)suse.de - revert the rename to vsftp for the xinetd config file. chkconfig knows on for init and xinetd. So this wasnt a bug but a misusage ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit vacation
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package vacation checked in at Fri May 26 15:25:26 CEST 2006. -------- --- vacation/vacation.changes 2006-01-25 21:31:05.000000000 +0100 +++ vacation/vacation.changes 2006-05-26 12:56:33.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 12:56:28 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- vacation-1.2.6.1.strip.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vacation.spec ++++++ --- /var/tmp/diff_new_pack.YSMrnf/_old 2006-05-26 15:25:20.000000000 +0200 +++ /var/tmp/diff_new_pack.YSMrnf/_new 2006-05-26 15:25:20.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package vacation (Version 1.2.6.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,7 +15,7 @@ Group: Productivity/Networking/Email/Utilities Autoreqprov: on Version: 1.2.6.1 -Release: 138 +Release: 150 Summary: A way to automatically reply to incoming e-mail Source: vacation-%{version}.tar.bz2 Patch: vacation-%{version}.dif @@ -25,6 +25,7 @@ # Problem: it breaks olf vacation programs using gdbm # and it requires db1 (to be independent from db version) Patch2: vacation-%{version}.db.dif +Patch3: vacation-%{version}.strip.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,6 +45,7 @@ %setup %patch %patch1 +%patch3 %build # %ifarch ia64 x86_64 s390x ppc64 @@ -59,7 +61,6 @@ # # neededforbuild gdbm-32bit gdbm-devel-32bit glibc-devel-32bit # RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -m32" # %endif - rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT%{_mandir}/man{1,5} make install MANDIR=$RPM_BUILD_ROOT%{_mandir}/man BINDIR=$RPM_BUILD_ROOT/usr/bin rm -f $RPM_BUILD_ROOT%{_mandir}/man5/forward.5 @@ -79,6 +80,8 @@ %{_mandir}/man5/forward.5.gz %changelog -n vacation +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jul 28 2005 - werner(a)suse.de ++++++ vacation-1.2.6.1.strip.diff ++++++ --- Makefile +++ Makefile @@ -43,8 +43,8 @@ all: $(BIN) install: all - install -s -m 755 $(BIN) $(VACATION) - install -s -m 755 vaclook $(VACLOOK) + install -m 755 $(BIN) $(VACATION) + install -m 755 vaclook $(VACLOOK) install -m 444 vacation.man $(MANDIR)$(MANEXT1)/vacation.$(MANEXT1) install -m 444 vaclook.man $(MANDIR)$(MANEXT1)/vaclook.$(MANEXT1) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit urlview
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package urlview checked in at Fri May 26 15:25:14 CEST 2006. -------- --- urlview/urlview.changes 2006-01-25 21:42:28.000000000 +0100 +++ urlview/urlview.changes 2006-05-26 11:47:28.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 11:47:22 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ urlview.spec ++++++ --- /var/tmp/diff_new_pack.YYaTXj/_old 2006-05-26 15:25:03.000000000 +0200 +++ /var/tmp/diff_new_pack.YYaTXj/_new 2006-05-26 15:25:03.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package urlview (Version 0.9) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Productivity/Networking/Web/Browsers Autoreqprov: on Version: 0.9 -Release: 581 +Release: 592 Summary: An URL extractor/viewer Source: urlview-%{version}.tar.bz2 Patch: urlview-%{version}.dif @@ -52,9 +52,8 @@ make %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{etc,usr/share/man/man1} -make DESTDIR=$RPM_BUILD_ROOT install-strip +make DESTDIR=$RPM_BUILD_ROOT install install -m 755 url_handler.sh.suse $RPM_BUILD_ROOT/usr/bin/url_handler.sh install -m 644 urlview.conf.suse $RPM_BUILD_ROOT/etc/urlview.conf @@ -71,6 +70,8 @@ %doc %{_mandir}/man1/urlview.1* %changelog -n urlview +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Nov 08 2005 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit udev
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package udev checked in at Fri May 26 15:24:57 CEST 2006. -------- --- udev/udev.changes 2006-05-19 16:41:34.000000000 +0200 +++ udev/udev.changes 2006-05-25 15:43:50.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 15:42:10 CEST 2006 - kay.sievers(a)suse.de + +- remove boot.proc dependency from boot.udev (#178754) +- fix '==' vs. '=' in rules + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.JjDvD8/_old 2006-05-26 15:23:36.000000000 +0200 +++ /var/tmp/diff_new_pack.JjDvD8/_new 2006-05-26 15:23:36.000000000 +0200 @@ -13,7 +13,7 @@ Name: udev URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ Version: 085 -Release: 32 +Release: 33 License: GPL Group: System/Kernel Summary: A rule based device node and kernel event manager @@ -238,6 +238,9 @@ %attr(600,root,root) %dev(c,10,200) /lib/udev/devices/fwmonitor %changelog -n udev +* Thu May 25 2006 - kay.sievers(a)suse.de +- remove boot.proc dependency from boot.udev (#178754) +- fix '==' vs. '=' in rules * Fri May 19 2006 - hare(a)suse.de - Add path_id for iSCSI devices (#176804) * Wed May 10 2006 - kay.sievers(a)suse.de ++++++ 60-persistent-input.rules ++++++ --- udev/60-persistent-input.rules 2006-03-21 17:35:17.000000000 +0100 +++ udev/60-persistent-input.rules 2006-05-25 15:42:08.000000000 +0200 @@ -4,8 +4,8 @@ # usb devices BUS=="usb", IMPORT{program}="/sbin/usb_id -x" -BUS=="usb", SYSFS{bInterfaceClass}="03", SYSFS{bInterfaceProtocol}="01", ENV{ID_CLASS}="kbd" -BUS=="usb", SYSFS{bInterfaceClass}="03", SYSFS{bInterfaceProtocol}="02", ENV{ID_CLASS}="mouse" +BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd" +BUS=="usb", SYSFS{bInterfaceClass}=="03", SYSFS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse" # by-id links KERNEL=="mouse*", ENV{ID_BUS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_CLASS}" ++++++ boot.udev ++++++ --- udev/boot.udev 2006-04-27 23:25:40.000000000 +0200 +++ udev/boot.udev 2006-05-25 15:41:40.000000000 +0200 @@ -2,11 +2,10 @@ # ### BEGIN INIT INFO # Provides: boot.udev -# Required-Start: boot.proc # Should-Start: boot.preload_early # Default-Start: B # Default-Stop: -# Description: Start udevd to manage /dev and kernel events. +# Description: Start udevd to manage /dev and kernel device events. ### END INIT INFO . /etc/rc.status ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit tuxcards
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package tuxcards checked in at Fri May 26 15:23:28 CEST 2006. -------- --- tuxcards/tuxcards.changes 2006-01-25 21:42:19.000000000 +0100 +++ tuxcards/tuxcards.changes 2006-05-26 12:40:50.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 12:40:44 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxcards.spec ++++++ --- /var/tmp/diff_new_pack.bQ5MTV/_old 2006-05-26 15:23:08.000000000 +0200 +++ /var/tmp/diff_new_pack.bQ5MTV/_new 2006-05-26 15:23:08.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package tuxcards (Version 1.2) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,7 +14,7 @@ BuildRequires: libdrm-devel libjpeg-devel qt3-devel update-desktop-files Summary: Manage Notes within a Hierarchical Tree Version: 1.2 -Release: 5 +Release: 17 License: GPL Group: Productivity/Office/Organizers Source: tuxcards-%{version}.tar.bz2 @@ -58,11 +58,10 @@ make MOC=%{qtdir}/bin/moc %install -[ "$RPM_BUILD_ROOT" != "/" -a -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; #make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/share/tuxcards -install -m 755 -s tuxcards $RPM_BUILD_ROOT/usr/bin +install -m 755 tuxcards $RPM_BUILD_ROOT/usr/bin install -m 644 src/gui/cactusbar/flowers/*.gif $RPM_BUILD_ROOT/usr/share/tuxcards install -m 644 src/gui/cactusbar/flowers/cactus.egg $RPM_BUILD_ROOT/usr/share/tuxcards %suse_update_desktop_file -i %name Utility TextEditor @@ -79,6 +78,8 @@ %{_datadir}/applications/* %changelog -n tuxcards +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Oct 12 2005 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sfftobmp
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package sfftobmp checked in at Fri May 26 15:23:02 CEST 2006. -------- --- sfftobmp/sfftobmp.changes 2006-01-25 21:41:34.000000000 +0100 +++ sfftobmp/sfftobmp.changes 2006-05-26 12:48:48.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 12:39:45 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sfftobmp.spec ++++++ --- /var/tmp/diff_new_pack.LFP3kB/_old 2006-05-26 15:19:39.000000000 +0200 +++ /var/tmp/diff_new_pack.LFP3kB/_new 2006-05-26 15:19:39.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package sfftobmp (Version 2.2 ) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Group: Hardware/ISDN Autoreqprov: on Version: 2.2 -Release: 173 +Release: 184 Summary: Tool to convert Structured Fax Files (.sff) to other image formats Source: http://prdownloads.sourceforge.net/sfftools/sfftobmp_2_2.tgz URL: http://sfftools.sourceforge.net/ @@ -46,7 +46,7 @@ %patch -P 2 -p1 %build -make +make OPTFLAGS="$RPM_OPT_FLAGS" STRIP=: %install install -d $RPM_BUILD_ROOT/usr/bin @@ -63,6 +63,9 @@ %doc %{_defaultdocdir}/sfftobmp %changelog -n sfftobmp +* Fri May 26 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Nov 08 2005 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit scsi-changer
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package scsi-changer checked in at Fri May 26 15:19:33 CEST 2006. -------- --- scsi-changer/scsi-changer.changes 2006-01-25 21:41:30.000000000 +0100 +++ scsi-changer/scsi-changer.changes 2006-05-26 13:17:16.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 13:17:10 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- New: ---- scsi-changer-0.20.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scsi-changer.spec ++++++ --- /var/tmp/diff_new_pack.YwrBWG/_old 2006-05-26 15:18:10.000000000 +0200 +++ /var/tmp/diff_new_pack.YwrBWG/_new 2006-05-26 15:18:10.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package scsi-changer (Version 0.20) # -# Copyright (c) 2004 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,10 +17,11 @@ Group: Hardware/Other Autoreqprov: on Version: 0.20 -Release: 505 +Release: 520 Summary: SCSI Media Changer Tools Source: %{name}-%{version}.tar.gz Source1: %name.desktop +Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,14 +36,13 @@ %prep %setup -q -n changer +%patch %build make OPTFLAGS="$RPM_OPT_FLAGS" \ XLIB="/usr/X11R6/%{_lib}" %install -test "%{buildroot}" != "" -a "%{buildroot}" != "/" &&\ - rm -rf "%{buildroot}" make OPTFLAGS="$RPM_OPT_FLAGS" \ XLIB="/usr/X11R6/%{_lib}" \ DESTDIR="%{buildroot}" \ @@ -68,6 +68,8 @@ rm -rf "%{buildroot}" %changelog -n scsi-changer +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Dec 16 2004 - hvogel(a)suse.de ++++++ scsi-changer-0.20.diff ++++++ --- Makefile +++ Makefile @@ -48,13 +48,13 @@ install: $(PROGS) mkdir -p $(etc) $(bindir) $(sbindir) mkdir -p $(mandir)/man1 $(mandir)/man8 - install -s -m755 mover $(bindir) + install -m755 mover $(bindir) install -m644 mover.man $(mandir)/man1/mover.1 - install -s -m755 autojuke $(sbindir) + install -m755 autojuke $(sbindir) install -m644 autojuke.man $(mandir)/man8/autojuke.8 install -m644 autojuke.conf $(etc) ifeq ($(MOTIF),yes) - install -s -m755 xmover $(bindir) + install -m755 xmover $(bindir) install -m644 xmover.man $(mandir)/man1/xmover.1 endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sabayon
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package sabayon checked in at Fri May 26 15:18:04 CEST 2006. -------- --- GNOME/sabayon/sabayon.changes 2006-05-23 04:07:15.000000000 +0200 +++ sabayon/sabayon.changes 2006-05-25 21:07:24.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 25 21:06:58 CEST 2006 - hpj(a)suse.de + +- Added patch to make it pick up directory creation. Fixes Novell + bug #177464. + +------------------------------------------------------------------- New: ---- sabayon-2.12.3-notice-dir-creation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sabayon.spec ++++++ --- /var/tmp/diff_new_pack.CHFyYd/_old 2006-05-26 15:17:38.000000000 +0200 +++ /var/tmp/diff_new_pack.CHFyYd/_new 2006-05-26 15:17:38.000000000 +0200 @@ -12,7 +12,7 @@ Name: sabayon Version: 2.12.3 -Release: 25 +Release: 27 Summary: Tool to maintain user profiles in a GNOME desktop Group: System/GUI/GNOME License: GPL @@ -49,6 +49,7 @@ Patch8: sabayon-2.12.3-gnomevfs-monitoring.patch Patch9: sabayon-2.12.3-reset-gconf-keys.patch Patch10: sabayon-2.12.3-no-ads-hosts-as-users.patch +Patch11: sabayon-2.12.3-notice-dir-creation.patch %description Sabayon is a tool to help system administrators and users change and @@ -93,6 +94,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %build rename no nb po/no.* @@ -233,6 +235,9 @@ %{python_sitelib}/%{name}/lockdown %changelog -n sabayon +* Thu May 25 2006 - hpj(a)suse.de +- Added patch to make it pick up directory creation. Fixes Novell + bug #177464. * Tue May 23 2006 - hpj(a)suse.de - Added patch to make it ignore usernames ending in $. Prevents us from showing hosts as if they were users on ADS setups. Fixes ++++++ sabayon-2.12.3-notice-dir-creation.patch ++++++ diff -uprN sabayon-2.12.3-pre/lib/sources/filessource.py sabayon-2.12.3-post/lib/sources/filessource.py --- sabayon-2.12.3-pre/lib/sources/filessource.py 2005-11-07 09:48:55.000000000 -0600 +++ sabayon-2.12.3-post/lib/sources/filessource.py 2006-05-25 13:58:35.000000000 -0500 @@ -84,7 +84,8 @@ class FilesSource (userprofile.ProfileSo self.monitor.set_files_to_ignore (FILES_TO_IGNORE) def __handle_monitor_event (self, path, event): - if event == dirmonitor.DELETED or os.path.isfile (path): + if event == dirmonitor.DELETED or os.path.isfile (path) or \ + os.path.isdir (path): # FIXME: sanity check input (e.g. is change actually in homedir/?) rel_path = path[len (self.home_dir):].lstrip ("/") dprint ("Emitting event '%s' on file '%s'", ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit qt
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package qt checked in at Fri May 26 15:08:34 CEST 2006. -------- --- qt/qt-sql-plugins.changes 2006-05-24 02:49:08.000000000 +0200 +++ qt/qt-sql-plugins.changes 2006-05-26 15:07:01.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 08:50:22 CEST 2006 - dmueller(a)suse.de + +- fix sql plugins version require base package (#159092) + +------------------------------------------------------------------- qt.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.d22Thi/_old 2006-05-26 15:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.d22Thi/_new 2006-05-26 15:07:06.000000000 +0200 @@ -20,7 +20,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.1.3 -Release: 3 +Release: 4 %define x11_free -x11-opensource-src- %define rversion 4.1.3 Source: qt%x11_free%rversion.tar.bz2 @@ -213,6 +213,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog -n qt-sql-plugins +* Fri May 26 2006 - dmueller(a)suse.de +- fix sql plugins version require base package (#159092) * Tue May 23 2006 - adrian(a)suse.de - reapply the 0119-qaction-widgetfactory.diff and 0112-ksyntaxhighlighter-rehighlight-document.diff patch to be ++++++ qt.spec ++++++ --- /var/tmp/diff_new_pack.d22Thi/_old 2006-05-26 15:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.d22Thi/_new 2006-05-26 15:07:06.000000000 +0200 @@ -19,7 +19,7 @@ Summary: C++ Program Library, Core Components # COMMON-BEGIN Version: 4.1.3 -Release: 3 +Release: 4 %define x11_free -x11-opensource-src- %define rversion 4.1.3 Source: qt%x11_free%rversion.tar.bz2 @@ -304,6 +304,8 @@ %_libdir/libQtSql*.so.* %changelog -n qt +* Fri May 26 2006 - dmueller(a)suse.de +- fix sql plugins version require base package (#159092) * Tue May 23 2006 - adrian(a)suse.de - reapply the 0119-qaction-widgetfactory.diff and 0112-ksyntaxhighlighter-rehighlight-document.diff patch to be ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit python-urlgrabber
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package python-urlgrabber checked in at Fri May 26 15:06:49 CEST 2006. -------- --- python-urlgrabber/python-urlgrabber.changes 2006-02-28 16:46:03.000000000 +0100 +++ python-urlgrabber/python-urlgrabber.changes 2006-05-25 14:27:40.000000000 +0200 @@ -1,0 +2,14 @@ +Thu May 25 14:19:34 CEST 2006 - cthiel(a)suse.de + +- update to version 2.9.9 + * Added tests to make sure that the "quote" option works as advertised + * Significant improvement to URL parsing. Parsing is now broken out into + a separate class (URLParser). It will now (by default) guess whether a + URL is already quoted, properly handle local files and URLs on windows, + and display un-quoted versions of the filename in the progress meter. + * Added a reget progress bar patch from Menno, and fixed the annoying next + _IndexError bug. +- added urlgrabber-read-error.patch (from Fedora) +- removed python-urlgrabber-2.9.7-reget.patch (included upstream) + +------------------------------------------------------------------- Old: ---- python-urlgrabber-2.9.7-reget.diff python-urlgrabber-2.9.7.diff urlgrabber-2.9.7.tar.bz2 New: ---- python-urlgrabber-2.9.9.patch urlgrabber-2.9.9.tar.bz2 urlgrabber-read-error.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-urlgrabber.spec ++++++ --- /var/tmp/diff_new_pack.dGSdOG/_old 2006-05-26 15:04:41.000000000 +0200 +++ /var/tmp/diff_new_pack.dGSdOG/_new 2006-05-26 15:04:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-urlgrabber (Version 2.9.7) +# spec file for package python-urlgrabber (Version 2.9.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,15 +12,15 @@ Name: python-urlgrabber BuildRequires: python-devel -Version: 2.9.7 -Release: 6 +Version: 2.9.9 +Release: 1 Summary: A high-level cross-protocol url-grabber Group: Development/Libraries/Python License: LGPL URL: http://linux.duke.edu/projects/urlgrabber/ Source: urlgrabber-%{version}.tar.bz2 -Patch: %{name}-%{version}-reget.diff -Patch1: %{name}-%{version}.diff +Patch: %{name}-%{version}.patch +Patch1: urlgrabber-read-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires @@ -39,7 +39,7 @@ %prep %setup -q -n urlgrabber-%{version} -%patch -p1 +%patch %patch1 %build @@ -59,6 +59,17 @@ %{py_sitedir}/urlgrabber %changelog -n python-urlgrabber +* Thu May 25 2006 - cthiel(a)suse.de +- update to version 2.9.9 + * Added tests to make sure that the "quote" option works as advertised + * Significant improvement to URL parsing. Parsing is now broken out into + a separate class (URLParser). It will now (by default) guess whether a + URL is already quoted, properly handle local files and URLs on windows, + and display un-quoted versions of the filename in the progress meter. + * Added a reget progress bar patch from Menno, and fixed the annoying next + _IndexError bug. +- added urlgrabber-read-error.patch (from Fedora) +- removed python-urlgrabber-2.9.7-reget.patch (included upstream) * Tue Feb 28 2006 - jmatejek(a)suse.cz - updated to reflect python changes due to #149809 * Wed Jan 25 2006 - mls(a)suse.de ++++++ python-urlgrabber-2.9.9.patch ++++++ --- setup.py +++ setup.py @@ -15,8 +15,6 @@ packages = ['urlgrabber'] package_dir = {'urlgrabber':'urlgrabber'} scripts = ['scripts/urlgrabber'] -data_files = [('share/doc/' + name + '-' + version, - ['README','LICENSE', 'TODO', 'ChangeLog'])] options = { 'clean' : { 'all' : 1 } } classifiers = [ 'Development Status :: 4 - Beta', ++++++ urlgrabber-2.9.7.tar.bz2 -> urlgrabber-2.9.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/ChangeLog new/urlgrabber-2.9.9/ChangeLog --- old/urlgrabber-2.9.7/ChangeLog 2005-10-23 00:05:26.000000000 +0200 +++ new/urlgrabber-2.9.9/ChangeLog 2006-03-02 22:06:42.000000000 +0100 @@ -1,3 +1,52 @@ +2006-03-02 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * urlgrabber/__init__.py: + + release 2.9.9 + +2006-03-02 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * test/test_grabber.py: + + Added tests to make sure that the "quote" option works as + advertised. + +2006-03-02 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * scripts/urlgrabber, test/test_grabber.py, urlgrabber/grabber.py: + + Significant improvement to URL parsing. Parsing is now broken out + into a separate class (URLParser). It will now (by default) guess + whether a URL is already quoted, properly handle local files and + URLs on windows, and display un-quoted versions of the filename in + the progress meter. + +2006-02-22 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * ChangeLog: + + updated ChangeLog + +2006-02-22 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * urlgrabber/__init__.py: + + release 2.9.8 + +2006-02-22 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * urlgrabber/: grabber.py, mirror.py: + + Added a reget progress bar patch from Menno, and fixed the annoying + _next IndexError bug. Thanks to Edinelson Keiji Shimokawa for + getting me looking in the right direction. + +2005-10-22 Michael D. Stenner <mstenner(a)linux.duke.edu> + + * ChangeLog: + + updated ChangeLog + 2005-10-22 Michael D. Stenner <mstenner(a)linux.duke.edu> * ChangeLog, TODO, urlgrabber/__init__.py: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/PKG-INFO new/urlgrabber-2.9.9/PKG-INFO --- old/urlgrabber-2.9.7/PKG-INFO 2005-10-23 00:05:37.000000000 +0200 +++ new/urlgrabber-2.9.9/PKG-INFO 2006-03-02 22:06:52.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: urlgrabber -Version: 2.9.7 +Version: 2.9.9 Summary: A high-level cross-protocol url-grabber Home-page: http://linux.duke.edu/projects/urlgrabber/ Author: Michael D. Stenner, Ryan Tomayko diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/scripts/urlgrabber new/urlgrabber-2.9.9/scripts/urlgrabber --- old/urlgrabber-2.9.7/scripts/urlgrabber 2004-09-07 23:19:54.000000000 +0200 +++ new/urlgrabber-2.9.9/scripts/urlgrabber 2006-03-02 21:56:56.000000000 +0100 @@ -62,7 +62,7 @@ explicitly. """ -# $Id: urlgrabber,v 1.4 2004/09/07 21:19:54 mstenner Exp $ +# $Id: urlgrabber,v 1.5 2006/03/02 20:56:56 mstenner Exp $ import sys import urlgrabber.grabber @@ -112,7 +112,7 @@ print 'URL: ', url print 'FILE: ', file - try: from progress import text_progress_meter + try: from urlgrabber.progress import text_progress_meter except ImportError, e: pass else: kwargs['progress_obj'] = text_progress_meter() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/test/test_grabber.py new/urlgrabber-2.9.9/test/test_grabber.py --- old/urlgrabber-2.9.7/test/test_grabber.py 2005-10-22 23:57:27.000000000 +0200 +++ new/urlgrabber-2.9.9/test/test_grabber.py 2006-03-02 22:06:00.000000000 +0100 @@ -21,7 +21,7 @@ """grabber.py tests""" -# $Id: test_grabber.py,v 1.28 2005/10/22 21:57:27 mstenner Exp $ +# $Id: test_grabber.py,v 1.30 2006/03/02 21:06:00 mstenner Exp $ import sys import os @@ -33,30 +33,34 @@ import urlgrabber import urlgrabber.grabber as grabber -from urlgrabber.grabber import URLGrabber, URLGrabError, CallbackObject +from urlgrabber.grabber import URLGrabber, URLGrabError, CallbackObject, \ + URLParser from urlgrabber.progress import text_progress_meter class FileObjectTests(TestCase): def setUp(self): self.filename = tempfile.mktemp() - fo = open(self.filename, 'w') + fo = file(self.filename, 'wb') fo.write(reference_data) fo.close() self.fo_input = cStringIO.StringIO(reference_data) self.fo_output = cStringIO.StringIO() - self.wrapper = grabber.URLGrabberFileObject('file://' + self.filename, self.fo_output, - grabber.default_grabber.opts) + (url, parts) = grabber.default_grabber.opts.urlparser.parse( + self.filename, grabber.default_grabber.opts) + self.wrapper = grabber.URLGrabberFileObject( + url, self.fo_output, grabber.default_grabber.opts) def tearDown(self): + self.wrapper.close() os.unlink(self.filename) def test_readall(self): "URLGrabberFileObject .read() method" s = self.wrapper.read() self.fo_output.write(s) - self.assertEqual(reference_data, self.fo_output.getvalue()) + self.assert_(reference_data == self.fo_output.getvalue()) def test_readline(self): "URLGrabberFileObject .readline() method" @@ -64,13 +68,13 @@ s = self.wrapper.readline() self.fo_output.write(s) if not s: break - self.assertEqual(reference_data, self.fo_output.getvalue()) + self.assert_(reference_data == self.fo_output.getvalue()) def test_readlines(self): "URLGrabberFileObject .readlines() method" li = self.wrapper.readlines() self.fo_output.write(string.join(li, '')) - self.assertEqual(reference_data, self.fo_output.getvalue()) + self.assert_(reference_data == self.fo_output.getvalue()) def test_smallread(self): "URLGrabberFileObject .read(N) with small N" @@ -78,7 +82,7 @@ s = self.wrapper.read(23) self.fo_output.write(s) if not s: break - self.assertEqual(reference_data, self.fo_output.getvalue()) + self.assert_(reference_data == self.fo_output.getvalue()) class HTTPTests(TestCase): def test_reference_file(self): @@ -86,11 +90,11 @@ filename = tempfile.mktemp() grabber.urlgrab(ref_http, filename) - fo = open(filename) + fo = file(filename, 'rb') contents = fo.read() fo.close() - self.assertEqual(contents, reference_data) + self.assert_(contents == reference_data) def test_post(self): "do an HTTP post" @@ -130,7 +134,8 @@ """Test grabber.URLGrabber class""" def setUp(self): - self.meter = text_progress_meter( fo=open('/dev/null', 'w') ) + + self.meter = text_progress_meter( fo=cStringIO.StringIO() ) pass def tearDown(self): @@ -180,49 +185,110 @@ nopts.opener = None self.assertEquals( nopts.opener, None ) - def test_parse_url(self): - """grabber.URLGrabber._parse_url()""" - g = URLGrabber() - (url, parts) = g._parse_url('http://user:pass@host.com/path/part/basename.ext?arg1=val1&arg2=val2#hash') - (scheme, host, path, parm, query, frag) = parts - self.assertEquals('http://host.com/path/part/basename.ext?arg1=val1&arg2=val2#hash',url) - self.assertEquals('http', scheme) - self.assertEquals('host.com', host) - self.assertEquals('/path/part/basename.ext', path) - self.assertEquals('arg1=val1&arg2=val2', query) - self.assertEquals('hash', frag) - - def test_parse_url_local_filename(self): - """grabber.URLGrabber._parse_url('/local/file/path') """ + def test_make_callback(self): + """grabber.URLGrabber._make_callback() tests""" + def cb(e): pass + tup_cb = (cb, ('stuff'), {'some': 'dict'}) g = URLGrabber() - (url, parts) = g._parse_url('/etc/redhat-release') - (scheme, host, path, parm, query, frag) = parts - self.assertEquals('file:///etc/redhat-release',url) - self.assertEquals('file', scheme) - self.assertEquals('', host) - self.assertEquals('/etc/redhat-release', path) - self.assertEquals('', query) - self.assertEquals('', frag) + self.assertEquals(g._make_callback(cb), (cb, (), {})) + self.assertEquals(g._make_callback(tup_cb), tup_cb) + +class URLParserTestCase(TestCase): + def setUp(self): + pass + + def tearDown(self): + pass def test_parse_url_with_prefix(self): - """grabber.URLGrabber._parse_url() with .prefix""" + """grabber.URLParser.parse() with opts.prefix""" base = 'http://foo.com/dir' bases = [base, base+'/'] - file = 'bar/baz' - target = base + '/' + file + filename = 'bar/baz' + target = base + '/' + filename for b in bases: g = URLGrabber(prefix=b) - (url, parts) = g._parse_url(file) + (url, parts) = g.opts.urlparser.parse(filename, g.opts) self.assertEquals(url, target) - def test_make_callback(self): - """grabber.URLGrabber._make_callback() tests""" - def cb(e): pass - tup_cb = (cb, ('stuff'), {'some': 'dict'}) + def _test_url(self, urllist): g = URLGrabber() - self.assertEquals(g._make_callback(cb), (cb, (), {})) - self.assertEquals(g._make_callback(tup_cb), tup_cb) + try: quote = urllist[3] + except IndexError: quote = None + g.opts.quote = quote + (url, parts) = g.opts.urlparser.parse(urllist[0], g.opts) + + if 1: + self.assertEquals(url, urllist[1]) + self.assertEquals(parts, urllist[2]) + else: + if url == urllist[1] and parts == urllist[2]: + print 'OK: %s' % urllist[0] + else: + print 'ERROR: %s' % urllist[0] + print ' ' + urllist[1] + print ' ' + url + print ' ' + urllist[2] + print ' ' + parts + + + url_tests_all = ( + ['http://host.com/path/basename.ext?arg1=val1&arg2=val2#hash', + 'http://host.com/path/basename.ext?arg1=val1&arg2=val2#hash', + ('http', 'host.com', '/path/basename.ext', '', + 'arg1=val1&arg2=val2', 'hash')], + ['http://host.com/Path With Spaces/', + 'http://host.com/Path%20With%20Spaces/', + ('http', 'host.com', '/Path%20With%20Spaces/', '', '', '')], + ['http://user:pass@host.com:80/', + 'http://host.com:80/', + ('http', 'host.com:80', '/', '', '', '')], + ['http://host.com/Already%20Quoted', + 'http://host.com/Already%20Quoted', + ('http', 'host.com', '/Already%20Quoted', '', '', '')], + ['http://host.com/Should Be Quoted', + 'http://host.com/Should Be Quoted', + ('http', 'host.com', '/Should Be Quoted', '', '', ''), 0], + ['http://host.com/Should%20Not', + 'http://host.com/Should%2520Not', + ('http', 'host.com', '/Should%2520Not', '', '', ''), 1], + ) + + url_tests_posix = ( + ['/etc/passwd', + 'file:///etc/passwd', + ('file', '', '/etc/passwd', '', '', '')], + ) + + url_tests_nt = ( + [r'\\foo.com\path\file.ext', + 'file://foo.com/path/file.ext', + ('file', '', '//foo.com/path/file.ext', '', '', '')], + [r'C:\path\file.ext', + 'file:///C|/path/file.ext', + ('file', '', '/C|/path/file.ext', '', '', '')], + ) + + def test_url_parser_all_os(self): + """test url parsing common to all OSs""" + for f in self.url_tests_all: + self._test_url(f) + + def test_url_parser_posix(self): + """test url parsing on posix systems""" + if not os.name == 'posix': + self.skip() + for f in self.url_tests_posix: + self._test_url(f) + + def test_url_parser_nt(self): + """test url parsing on windows systems""" + if not os.name == 'nt': + self.skip() + for f in self.url_tests_nt: + self._test_url(f) + class FailureTestCase(TestCase): """Test failure behavior""" @@ -383,12 +449,12 @@ except: pass def _make_half_zero_file(self): - fo = open(self.filename, 'w') + fo = file(self.filename, 'wb') fo.write('0'*self.hl) fo.close() def _read_file(self): - fo = open(self.filename, 'r') + fo = file(self.filename, 'rb') data = fo.read() fo.close() return data @@ -451,12 +517,14 @@ def setUp(self): self.ref = short_reference_data tmp = tempfile.mktemp() - tmpfo = open(tmp, 'w') + tmpfo = file(tmp, 'wb') tmpfo.write(self.ref) tmpfo.close() self.tmp = tmp - self.url = 'file://' + tmp + (url, parts) = grabber.default_grabber.opts.urlparser.parse( + tmp, grabber.default_grabber.opts) + self.url = url self.grabber = grabber.URLGrabber(reget='check_timestamp', copy_local=1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/urlgrabber/__init__.py new/urlgrabber-2.9.9/urlgrabber/__init__.py --- old/urlgrabber-2.9.7/urlgrabber/__init__.py 2005-10-23 00:05:12.000000000 +0200 +++ new/urlgrabber-2.9.9/urlgrabber/__init__.py 2006-03-02 22:06:35.000000000 +0100 @@ -12,9 +12,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko +# Copyright 2002-2006 Michael D. Stenner, Ryan Tomayko -# $Id: __init__.py,v 1.15 2005/10/22 22:05:12 mstenner Exp $ +# $Id: __init__.py,v 1.17 2006/03/02 21:06:35 mstenner Exp $ """A high-level cross-protocol url-grabber. @@ -44,8 +44,8 @@ automatically switching mirrors if there is a failure. """ -__version__ = '2.9.7' -__date__ = '2005/10/22' +__version__ = '2.9.9' +__date__ = '2006/03/02' __author__ = 'Michael D. Stenner <mstenner(a)linux.duke.edu>, ' \ 'Ryan Tomayko <rtomayko(a)naeblis.cx>' __url__ = 'http://linux.duke.edu/projects/urlgrabber/' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/urlgrabber/grabber.py new/urlgrabber-2.9.9/urlgrabber/grabber.py --- old/urlgrabber-2.9.7/urlgrabber/grabber.py 2005-10-22 23:57:28.000000000 +0200 +++ new/urlgrabber-2.9.9/urlgrabber/grabber.py 2006-03-02 21:56:57.000000000 +0100 @@ -283,6 +283,28 @@ passed the same arguments, so you could use the same function for both. + urlparser = URLParser() + + The URLParser class handles pre-processing of URLs, including + auth-handling for user/pass encoded in http urls, file handing + (that is, filenames not sent as a URL), and URL quoting. If you + want to override any of this behavior, you can pass in a + replacement instance. See also the 'quote' option. + + quote = None + + Whether or not to quote the path portion of a url. + quote = 1 -> quote the URLs (they're not quoted yet) + quote = 0 -> do not quote them (they're already quoted) + quote = None -> guess what to do + + This option only affects proper urls like 'file:///etc/passwd'; it + does not affect 'raw' filenames like '/etc/passwd'. The latter + will always be quoted as they are converted to URLs. Also, only + the path part of a url is quoted. If you need more fine-grained + control, you should probably subclass URLParser and pass it in via + the 'urlparser' option. + BANDWIDTH THROTTLING urlgrabber supports throttling via two values: throttle and @@ -342,7 +364,7 @@ """ -# $Id: grabber.py,v 1.43 2005/10/22 21:57:28 mstenner Exp $ +# $Id: grabber.py,v 1.45 2006/03/02 20:56:57 mstenner Exp $ import os import os.path @@ -593,6 +615,123 @@ return default_grabber.urlread(url, limit, **kwargs) +class URLParser: + """Process the URLs before passing them to urllib2. + + This class does several things: + + * add any prefix + * translate a "raw" file to a proper file: url + * handle any http or https auth that's encoded within the url + * quote the url + + Only the "parse" method is called directly, and it calls sub-methods. + + An instance of this class is held in the options object, which + means that it's easy to change the behavior by sub-classing and + passing the replacement in. It need only have a method like: + + url, parts = urlparser.parse(url, opts) + """ + + def parse(self, url, opts): + """parse the url and return the (modified) url and its parts + + Note: a raw file WILL be quoted when it's converted to a URL. + However, other urls (ones which come with a proper scheme) may + or may not be quoted according to opts.quote + + opts.quote = 1 --> quote it + opts.quote = 0 --> do not quote it + opts.quote = None --> guess + """ + quote = opts.quote + + if opts.prefix: + url = self.add_prefix(url, opts.prefix) + + parts = urlparse.urlparse(url) + (scheme, host, path, parm, query, frag) = parts + + if not scheme or (len(scheme) == 1 and scheme in string.letters): + # if a scheme isn't specified, we guess that it's "file:" + if url[0] not in '/\\': url = os.path.abspath(url) + url = 'file:' + urllib.pathname2url(url) + parts = urlparse.urlparse(url) + quote = 0 # pathname2url quotes, so we won't do it again + + if scheme in ['http', 'https']: + parts = self.process_http(parts) + + if quote is None: + quote = self.guess_should_quote(parts) + if quote: + parts = self.quote(parts) + + url = urlparse.urlunparse(parts) + return url, parts + + def add_prefix(self, url, prefix): + if prefix[-1] == '/' or url[0] == '/': + url = prefix + url + else: + url = prefix + '/' + url + return url + + def process_http(self, parts): + (scheme, host, path, parm, query, frag) = parts + + if '@' in host and auth_handler: + try: + user_pass, host = host.split('@', 1) + if ':' in user_pass: + user, password = user_pass.split(':', 1) + except ValueError, e: + raise URLGrabError(1, _('Bad URL: %s') % url) + if DEBUG: DEBUG.info('adding HTTP auth: %s, %s', user, password) + auth_handler.add_password(None, host, user, password) + + return (scheme, host, path, parm, query, frag) + + def quote(self, parts): + """quote the URL + + This method quotes ONLY the path part. If you need to quote + other parts, you should override this and pass in your derived + class. The other alternative is to quote other parts before + passing into urlgrabber. + """ + (scheme, host, path, parm, query, frag) = parts + path = urllib.quote(path) + return (scheme, host, path, parm, query, frag) + + hexvals = '0123456789ABCDEF' + def guess_should_quote(self, parts): + """ + Guess whether we should quote a path. This amounts to + guessing whether it's already quoted. + + find ' ' -> 1 + find '%' -> 1 + find '%XX' -> 0 + else -> 1 + """ + (scheme, host, path, parm, query, frag) = parts + if ' ' in path: + return 1 + ind = string.find(path, '%') + if ind > -1: + while ind > -1: + if len(path) < ind+3: + return 1 + code = path[ind+1:ind+3].upper() + if code[0] not in self.hexvals or \ + code[1] not in self.hexvals: + return 1 + ind = string.find(path, '%', ind+1) + return 0 + return 1 + class URLGrabberOptions: """Class to ease kwargs handling.""" @@ -667,6 +806,8 @@ self.http_headers = None self.ftp_headers = None self.data = None + self.urlparser = URLParser() + self.quote = None class URLGrabber: """Provides easy opening of URLs with a variety of options. @@ -735,7 +876,7 @@ like any other file object. """ opts = self.opts.derive(**kwargs) - (url,parts) = self._parse_url(url) + (url,parts) = opts.urlparser.parse(url, opts) def retryfunc(opts, url): return URLGrabberFileObject(url, filename=None, opts=opts) return self._retry(opts, retryfunc, url) @@ -747,16 +888,16 @@ different from the passed-in filename if copy_local == 0. """ opts = self.opts.derive(**kwargs) - (url, parts) = self._parse_url(url) + (url,parts) = opts.urlparser.parse(url, opts) (scheme, host, path, parm, query, frag) = parts if filename is None: - if scheme in [ 'http', 'https' ]: - filename = os.path.basename( urllib.unquote(path) ) - else: - filename = os.path.basename( path ) + filename = os.path.basename( urllib.unquote(path) ) if scheme == 'file' and not opts.copy_local: # just return the name of the local file - don't make a # copy currently + path = urllib.url2pathname(path) + if host: + path = os.path.normpath('//' + host + path) if not os.path.exists(path): raise URLGrabError(2, _('Local file does not exist: %s') % (path, )) @@ -791,7 +932,7 @@ into memory, but don't use too much' """ opts = self.opts.derive(**kwargs) - (url, parts) = self._parse_url(url) + (url,parts) = opts.urlparser.parse(url, opts) if limit is not None: limit = limit + 1 @@ -823,41 +964,6 @@ _('Exceeded limit (%i): %s') % (limit, url)) return s - def _parse_url(self,url): - """break up the url into its component parts - - This function disassembles a url and - 1) "normalizes" it, tidying it up a bit - 2) does any authentication stuff it needs to do - - it returns the (cleaned) url and a tuple of component parts - """ - if self.opts.prefix: - p = self.opts.prefix - if p[-1] == '/' or url[0] == '/': url = p + url - else: url = p + '/' + url - - (scheme, host, path, parm, query, frag) = \ - urlparse.urlparse(url) - if not scheme: - if not url[0] == '/': url = os.path.abspath(url) - url = 'file:' + url - (scheme, host, path, parm, query, frag) = \ - urlparse.urlparse(url) - path = os.path.normpath(path) - if scheme in ['http', 'https']: path = urllib.quote(path) - if '@' in host and auth_handler and scheme in ['http', 'https']: - try: - user_pass, host = host.split('@', 1) - if ':' in user_pass: user, password = user_pass.split(':', 1) - except ValueError, e: - raise URLGrabError(1, _('Bad URL: %s') % url) - if DEBUG: DEBUG.info('adding HTTP auth: %s, %s', user, password) - auth_handler.add_password(None, host, user, password) - parts = (scheme, host, path, parm, query, frag) - url = urlparse.urlunparse(parts) - return url, parts - def _make_callback(self, callback_obj): if callable(callback_obj): return callback_obj, (), {} @@ -980,6 +1086,7 @@ fo, hdr = self._make_request(req, opener) (scheme, host, path, parm, query, frag) = urlparse.urlparse(self.url) + path = urllib.unquote(path) if not (self.opts.progress_obj or self.opts.raw_throttle() \ or self.opts.timeout): # if we're not using the progress_obj, throttling, or timeout @@ -989,12 +1096,16 @@ if hasattr(fo, 'readline'): self.readline = fo.readline elif self.opts.progress_obj: - try: length = int(hdr['Content-Length']) - except: length = None - self.opts.progress_obj.start(str(self.filename), self.url, + try: + length = int(hdr['Content-Length']) + length = length + self._amount_read # Account for regets + except (KeyError, ValueError, TypeError): + length = None + + self.opts.progress_obj.start(str(self.filename), + urllib.unquote(self.url), os.path.basename(path), - length, - text=self.opts.text) + length, text=self.opts.text) self.opts.progress_obj.update(0) (self.fo, self.hdr) = (fo, hdr) @@ -1024,6 +1135,10 @@ else: self.reget_time = s[ST_MTIME] reget_length = s[ST_SIZE] + + # Set initial length when regetting + self._amount_read = reget_length + rt = reget_length, '' self.append = 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/urlgrabber-2.9.7/urlgrabber/mirror.py new/urlgrabber-2.9.9/urlgrabber/mirror.py --- old/urlgrabber-2.9.7/urlgrabber/mirror.py 2005-10-22 23:57:28.000000000 +0200 +++ new/urlgrabber-2.9.9/urlgrabber/mirror.py 2006-02-22 19:26:46.000000000 +0100 @@ -86,7 +86,7 @@ """ -# $Id: mirror.py,v 1.13 2005/10/22 21:57:28 mstenner Exp $ +# $Id: mirror.py,v 1.14 2006/02/22 18:26:46 mstenner Exp $ import random import thread # needed for locking to make this threadsafe @@ -346,14 +346,14 @@ del self.mirrors[ind] elif self._next == ind and action.get('increment_master', 1): self._next += 1 - if self._next >= len(self.mirrors): self._next = 0 + if self._next >= len(self.mirrors): self._next = 0 self._lock.release() if action.get('remove', 1): del gr.mirrors[gr._next] elif action.get('increment', 1): gr._next += 1 - if gr._next >= len(gr.mirrors): gr._next = 0 + if gr._next >= len(gr.mirrors): gr._next = 0 if DEBUG: grm = [m['mirror'] for m in gr.mirrors] ++++++ urlgrabber-read-error.patch ++++++ --- urlgrabber/grabber.py +++ urlgrabber/grabber.py @@ -1140,6 +1140,8 @@ raise URLGrabError(4, _('Socket Error: %s') % (e, )) except TimeoutError, e: raise URLGrabError(12, _('Timeout: %s') % (e, )) + except IOError, e: + raise URLGrabError(4, _('IOError: %s') %(e,)) newsize = len(new) if not newsize: break # no more to read ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit python-kid
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package python-kid checked in at Fri May 26 15:04:34 CEST 2006. -------- --- python-kid/python-kid.changes 2006-02-28 16:46:03.000000000 +0100 +++ python-kid/python-kid.changes 2006-05-25 14:52:38.000000000 +0200 @@ -1,0 +2,26 @@ +Thu May 25 14:48:18 CEST 2006 - cthiel(a)suse.de + +- update to version 0.9.1 + * Layout Templates: + o The parameters passed to a template with a py:layout were not visible + in named template functions or match templates. + o A small bug existed in Python 2.3 where the dict.update() method was + being called incorrectly. Python 2.4 allows a list of tuples to be + passed to update(), whereas Python 2.3 does not. + o There is a new feature in Kid for a template to specify a layout + template to which match templates, named template definitions, and + template parameters will be applied. This is useful for applying a + generic set of headers, menus, footers, etc. to a many pages without + duplicating large amounts of code in each page. + * py:match: + o The logic to apply the template matches has been reworked. This was + due to the discovery of some odd behavior when using multiple template + inheritence. + * Convenience Functions + o Kid Template instances now provide convenience funcitons defined(name) + and value_of(name). + * Invisible Comments + o XML comments starting with a ! character will not appear in the + serialized output of a template. + +------------------------------------------------------------------- Old: ---- kid-0.8-setuptools.diff kid-0.8.tar.bz2 New: ---- kid-0.9.1-setuptools.patch kid-0.9.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kid.spec ++++++ --- /var/tmp/diff_new_pack.u5yteT/_old 2006-05-26 15:04:04.000000000 +0200 +++ /var/tmp/diff_new_pack.u5yteT/_new 2006-05-26 15:04:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kid (Version 0.8) +# spec file for package python-kid (Version 0.9.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,14 @@ Name: python-kid BuildRequires: python-devel python-elementtree python-xml -Version: 0.8 -Release: 5 +Version: 0.9.1 +Release: 1 Summary: Kid - A simple and pythonic XML template language Group: Development/Libraries/Python License: X11/MIT URL: http://kid.lesscode.org/ Source: kid-%{version}.tar.bz2 -Patch: kid-%{version}-setuptools.diff +Patch: kid-%{version}-setuptools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-elementtree @@ -44,7 +44,6 @@ %prep %setup -q -n kid-%{version} %patch -rm doc/.guide.html~ doc/\#guide.txt\# %build export CFLAGS="$RPM_OPT_FLAGS" @@ -59,10 +58,32 @@ %files %defattr(-,root,root,-) %doc COPYING HISTORY README doc/ examples/ -%{_bindir}/kid* %{py_sitedir}/kid %changelog -n python-kid +* Thu May 25 2006 - cthiel(a)suse.de +- update to version 0.9.1 + * Layout Templates: + o The parameters passed to a template with a py:layout were not visible + in named template functions or match templates. + o A small bug existed in Python 2.3 where the dict.update() method was + being called incorrectly. Python 2.4 allows a list of tuples to be + passed to update(), whereas Python 2.3 does not. + o There is a new feature in Kid for a template to specify a layout + template to which match templates, named template definitions, and + template parameters will be applied. This is useful for applying a + generic set of headers, menus, footers, etc. to a many pages without + duplicating large amounts of code in each page. + * py:match: + o The logic to apply the template matches has been reworked. This was + due to the discovery of some odd behavior when using multiple template + inheritence. + * Convenience Functions + o Kid Template instances now provide convenience funcitons defined(name) + and value_of(name). + * Invisible Comments + o XML comments starting with a ! character will not appear in the + serialized output of a template. * Tue Feb 28 2006 - jmatejek(a)suse.cz - updated to reflect python changes due to #149809 * Wed Jan 25 2006 - mls(a)suse.de ++++++ kid-0.9.1-setuptools.patch ++++++ --- setup.py +++ setup.py @@ -1,14 +1,10 @@ -# bootstrap setuptools if necessary -from ez_setup import use_setuptools -use_setuptools() - import os execfile(os.path.join("kid", "release.py")) doc_parts = long_description.strip().splitlines() -from setuptools import setup, find_packages +from distutils.core import setup setup( name="kid", version=version, ++++++ kid-0.8.tar.bz2 -> kid-0.9.1.tar.bz2 ++++++ ++++ 18079 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pcsc-gempc
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package pcsc-gempc checked in at Fri May 26 15:01:59 CEST 2006. -------- --- pcsc-gempc/pcsc-gempc.changes 2006-01-25 21:39:20.000000000 +0100 +++ pcsc-gempc/pcsc-gempc.changes 2006-05-26 13:24:25.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 26 13:24:19 CEST 2006 - schwab(a)suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-gempc.spec ++++++ --- /var/tmp/diff_new_pack.7sdHWa/_old 2006-05-26 15:01:47.000000000 +0200 +++ /var/tmp/diff_new_pack.7sdHWa/_new 2006-05-26 15:01:47.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,7 +13,7 @@ Name: pcsc-gempc BuildRequires: pcsc-lite-devel pkgconfig Version: 1.0.0 -Release: 1 +Release: 13 Group: System/Libraries License: GPL, BSD URL: http://ludovic.rousseau.free.fr/softwares @@ -64,6 +64,8 @@ %{ifddir}/ %changelog -n pcsc-gempc +* Fri May 26 2006 - schwab(a)suse.de +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 03 2006 - mjancar(a)suse.cz ++++++ ifd-gempc-1.0.0-makefile.diff ++++++ --- /var/tmp/diff_new_pack.7sdHWa/_old 2006-05-26 15:01:47.000000000 +0200 +++ /var/tmp/diff_new_pack.7sdHWa/_new 2006-05-26 15:01:47.000000000 +0200 @@ -16,6 +16,14 @@ endif # by default install in /usr/local +@@ -47,7 +47,6 @@ + rm -f $@ + $(CC) -shared $(targets) $(common_targets) -o $@ + chmod -x $@ +- strip --strip-unneeded $@ + mv $@ $@.$(version) + + clean: --- GemPC430/Makefile +++ GemPC430/Makefile @@ -12,7 +12,7 @@ @@ -27,3 +35,11 @@ endif LDFLAGS = $(LIBS) -lusb +@@ -45,7 +45,6 @@ + + libGemPC430.so: common $(targets) + $(CC) -shared $(LDFLAGS) -o $@ $(targets) $(common_targets) +- strip $@ + + main.o: ../GemPC410/main.c + $(CC) $(CFLAGS) -c -o $@ $^ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pbm2l7k
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package pbm2l7k checked in at Fri May 26 15:01:41 CEST 2006. -------- --- pbm2l7k/pbm2l7k.changes 2006-01-25 21:39:18.000000000 +0100 +++ pbm2l7k/pbm2l7k.changes 2006-05-26 13:20:19.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 13:20:09 CEST 2006 - schwab(a)suse.de + +- Use RPM_OPT_FLAGS. +- Don't strip binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pbm2l7k.spec ++++++ --- /var/tmp/diff_new_pack.mdLtpg/_old 2006-05-26 14:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.mdLtpg/_new 2006-05-26 14:59:31.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package pbm2l7k (Version 990321) # -# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,7 +16,7 @@ Provides: lexmark7000linux Autoreqprov: on Version: 990321 -Release: 793 +Release: 807 Summary: Driver for Lexmark Printers 7000, 7200, and 5700 Source: lexmark7000linux-990321.tar.gz Patch: lexmark7k.dif @@ -41,7 +41,6 @@ make %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install %clean @@ -55,6 +54,9 @@ /usr/share/pbm2l7k/ %changelog -n pbm2l7k +* Fri May 26 2006 - schwab(a)suse.de +- Use RPM_OPT_FLAGS. +- Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Jun 25 2004 - hmacht(a)suse.de ++++++ lexmark7k.dif ++++++ --- /var/tmp/diff_new_pack.mdLtpg/_old 2006-05-26 14:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.mdLtpg/_new 2006-05-26 14:59:31.000000000 +0200 @@ -1,5 +1,5 @@ --- Makefile -+++ Makefile 2000/06/07 13:59:44 ++++ Makefile @@ -1,6 +1,17 @@ # # $Id: Makefile,v 1.3 1999/02/12 16:03:00 henryk Exp $ @@ -8,7 +8,7 @@ -pbm2l7k : pbm2l7k.c +PBMLPATH = /usr/share/pbm2l7k +CC = gcc -+CFLAGS = -g -O2 -DPBMLPATH=\"$(PBMLPATH)/\" ++CFLAGS = -g -O2 $(RPM_OPT_FLAGS) -DPBMLPATH=\"$(PBMLPATH)/\" +all:: pbm2l7k + @@ -19,9 +19,9 @@ + install -c -m 0444 pr7000.prn $(DESTDIR)$(PBMLPATH)/ + install -c -m 0444 pr5700.prn $(DESTDIR)$(PBMLPATH)/ + install -d -m 0755 $(DESTDIR)/usr/bin -+ install -s -m 0755 pbm2l7k $(DESTDIR)/usr/bin/ ++ install -m 0755 pbm2l7k $(DESTDIR)/usr/bin/ --- pbm2l7k.c -+++ pbm2l7k.c 2000/06/07 13:59:23 ++++ pbm2l7k.c @@ -25,8 +25,12 @@ char prologoue_name[64]; }; @@ -46,4 +46,3 @@ { fprintf(stderr,"Invalid mode '%d' specified," " must be between <0,%d>\n", pmode, LXM_LAST-1); - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit nano
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package nano checked in at Fri May 26 14:59:25 CEST 2006. -------- --- nano/nano.changes 2006-01-25 21:38:33.000000000 +0100 +++ nano/nano.changes 2006-05-25 14:10:44.000000000 +0200 @@ -1,0 +2,15 @@ +Thu May 25 14:07:25 CEST 2006 - cthiel(a)suse.de + +- update to version 1.3.11 + * This release focuses mostly on bugfixes, which include better handling + of the cursor at the statusbar prompt, support for certain combinations + of Shift and keyboard keys in both normal and + --rebind-keypad mode, a fix for a minor display problem after some + searches, a real fix for a long-standing segfault when displaying overly + long lines, and a real fix for nano's not hanging up properly in xterm + under certain circumstances. There are also several new features, such + as the ability to set the characters used as brackets when searching for + matching brackets, and tab completion of directories at the "Go To + Directory" prompt. + +------------------------------------------------------------------- Old: ---- nano-1.3.10.tar.bz2 New: ---- nano-1.3.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nano.spec ++++++ --- /var/tmp/diff_new_pack.NlvvPk/_old 2006-05-26 14:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.NlvvPk/_new 2006-05-26 14:58:03.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package nano (Version 1.3.10) +# spec file for package nano (Version 1.3.11) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,8 +15,8 @@ License: GPL Group: Productivity/Editors/Other Autoreqprov: on -Summary: Pico editor clone with enhancements -Version: 1.3.10 +Summary: Pico Editor Clone with Enhancements +Version: 1.3.11 Release: 1 Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,11 +41,7 @@ %setup -q %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=%{_prefix} \ - --infodir=%{_infodir} \ - --mandir=%{_mandir} \ - --enable-all +%configure --enable-all make %install @@ -66,6 +62,18 @@ %{_infodir}/*.gz %changelog -n nano +* Thu May 25 2006 - cthiel(a)suse.de +- update to version 1.3.11 + * This release focuses mostly on bugfixes, which include better handling + of the cursor at the statusbar prompt, support for certain combinations + of Shift and keyboard keys in both normal and +--rebind-keypad mode, a fix for a minor display problem after some + searches, a real fix for a long-standing segfault when displaying overly + long lines, and a real fix for nano's not hanging up properly in xterm + under certain circumstances. There are also several new features, such + as the ability to set the characters used as brackets when searching for + matching brackets, and tab completion of directories at the "Go To + Directory" prompt. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sat Dec 24 2005 - cthiel(a)suse.de ++++++ nano-1.3.10.tar.bz2 -> nano-1.3.11.tar.bz2 ++++++ ++++ 63599 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libksba
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package libksba checked in at Fri May 26 14:57:57 CEST 2006. -------- --- libksba/libksba.changes 2006-01-25 21:37:31.000000000 +0100 +++ libksba/libksba.changes 2006-05-26 13:04:27.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 25 11:41:24 CEST 2006 - pnemec(a)suse.cz + +- updated to version 0.9.14 + * Fixed broken OCSP requests. + * Ignore invalid bytes appended to a certificate. + * New functions to associate user data with a certificate object. + +------------------------------------------------------------------- Old: ---- libksba-0.9.12.tar.bz2 New: ---- libksba-0.9.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksba.spec ++++++ --- /var/tmp/diff_new_pack.9XVZZu/_old 2006-05-26 14:52:36.000000000 +0200 +++ /var/tmp/diff_new_pack.9XVZZu/_new 2006-05-26 14:52:36.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package libksba (Version 0.9.12) +# spec file for package libksba (Version 0.9.14) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,11 +17,11 @@ Group: Development/Libraries/C and C++ Autoreqprov: on Summary: A X.509 Library -Version: 0.9.12 -Release: 3 +Version: 0.9.14 +Release: 1 # change also name and nfb %define nld_build 0 -Source: libksba-%version.tar.bz2 +Source: libksba-%{version}.tar.bz2 Patch2: nld-build.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,6 +101,11 @@ /usr/share/aclocal/* %changelog -n libksba +* Thu May 25 2006 - pnemec(a)suse.cz +- updated to version 0.9.14 + * Fixed broken OCSP requests. + * Ignore invalid bytes appended to a certificate. + * New functions to associate user data with a certificate object. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Sep 26 2005 - mls(a)suse.de ++++++ libksba-0.9.12.tar.bz2 -> libksba-0.9.14.tar.bz2 ++++++ ++++ 19901 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit krb5
by root＠suse.de 26 May '06

26 May '06

Hello community, here is the log from the commit of package krb5 checked in at Fri May 26 14:52:29 CEST 2006. -------- --- krb5/krb5.changes 2006-03-27 14:15:07.000000000 +0200 +++ krb5/krb5.changes 2006-05-26 14:50:04.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 26 14:50:00 CEST 2006 - ro(a)suse.de + +- libcom is not in e2fsck-devel but in its own package now, change + Requires accordingly. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-doc.spec ++++++ --- /var/tmp/diff_new_pack.OgA2dg/_old 2006-05-26 14:52:09.000000000 +0200 +++ /var/tmp/diff_new_pack.OgA2dg/_new 2006-05-26 14:52:09.000000000 +0200 @@ -13,7 +13,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html te_ams Version: 1.4.3 -Release: 13 +Release: 19 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT URL: http://web.mit.edu/kerberos/www/ ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.OgA2dg/_old 2006-05-26 14:52:09.000000000 +0200 +++ /var/tmp/diff_new_pack.OgA2dg/_new 2006-05-26 14:52:09.000000000 +0200 @@ -11,11 +11,11 @@ # norootforbuild Name: krb5 -BuildRequires: e2fsprogs-devel +BuildRequires: libcom_err %define vendorFiles %{_builddir}/%{name}-%{version}/vendor-files/ %define krb5docdir %{_defaultdocdir}/%{name} Version: 1.4.3 -Release: 13 +Release: 19 Provides: heimdal-lib Obsoletes: heimdal-lib Summary: MIT Kerberos5 Implementation--Libraries @@ -489,6 +489,9 @@ %{_mandir}/man1/krb5-config.1* %changelog -n krb5 +* Fri May 26 2006 - ro(a)suse.de +- libcom is not in e2fsck-devel but in its own package now, change + Requires accordingly. * Mon Mar 27 2006 - mc(a)suse.de - add all daemons to %%stop_on_removal and %%restart_on_update - add reload to kpropd init script ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0