- openSUSE Commits

commit mkinitrd
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package mkinitrd checked in at Thu Apr 13 17:34:44 CEST 2006. -------- --- mkinitrd/mkinitrd.changes 2006-04-12 13:51:51.000000000 +0200 +++ STABLE/mkinitrd/mkinitrd.changes 2006-04-13 17:31:06.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 13 17:28:35 CEST 2006 - trenn(a)suse.de + +- added sysvinit and reiserfs to "Requires" packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.nz9nT2/_old 2006-04-13 17:34:08.000000000 +0200 +++ /var/tmp/diff_new_pack.nz9nT2/_new 2006-04-13 17:34:09.000000000 +0200 @@ -14,11 +14,11 @@ License: GPL Group: System/Base Provides: aaa_base:/sbin/mk_initrd -Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils +Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils sysvinit reiserfs # bootsplash required only if creating splash initrd's. Autoreqprov: on Version: 1.2 -Release: 86 +Release: 87 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -85,6 +85,8 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Thu Apr 13 2006 - trenn(a)suse.de +- added sysvinit and reiserfs to "Requires" packages * Wed Apr 12 2006 - hare(a)suse.de - consistent usage of iscsi_root (#165456) * Tue Apr 11 2006 - hare(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Thu Apr 13 17:33:58 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-12 17:28:10.000000000 +0200 +++ STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-13 16:17:59.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 13 16:06:36 CEST 2006 - kkaempf(a)suse.de + +- add KeyRing callbacks to transact and parse-metadata +- handle dry_run and nosignature on commit +- dont fail on dry_run (#164583) +- rev 3092 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.QlPrDt/_old 2006-04-13 17:33:50.000000000 +0200 +++ /var/tmp/diff_new_pack.QlPrDt/_new 2006-04-13 17:33:50.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 10 +Release: 11 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,11 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Thu Apr 13 2006 - kkaempf(a)suse.de +- add KeyRing callbacks to transact and parse-metadata +- handle dry_run and nosignature on commit +- dont fail on dry_run (#164583) +- rev 3092 * Wed Apr 12 2006 - kkaempf(a)suse.de - write all atoms to support multi-arch patch deps (#165556) - rev 3077 ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h --- old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-04-13 12:45:28.000000000 +0200 @@ -0,0 +1,67 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zmd/backend/KeyRingCallbacks.cc + * +*/ + +#ifndef ZMD_BACKEND_KEYRINGCALLBACKS_H +#define ZMD_BACKEND_KEYRINGCALLBACKS_H + +#include <iostream> + +#include <zypp/base/Logger.h> +#include <zypp/ZYppCallbacks.h> +#include <zypp/Pathname.h> +#include <zypp/KeyRing.h> + +/////////////////////////////////////////////////////////////////// +namespace zypp { +/////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // KeyRingReceive + /////////////////////////////////////////////////////////////////// + struct KeyRingReceive : public zypp::callback::ReceiveReport<zypp::KeyRingReport> + { + virtual bool askUserToAcceptUnsignedFile( const Pathname &file ) + { return true; } + virtual bool askUserToAcceptUnknownKey( const Pathname &file, const std::string &keyid, const std::string &keyname ) + { return true; } + virtual bool askUserToTrustKey( const std::string &keyid, const std::string &keyname, const std::string &keydetails ) + { return true; } + virtual bool askUserToAcceptVerificationFailed( const Pathname &file, const std::string &keyid, const std::string &keyname ) + { return true; } + virtual bool askUserToAcceptFileWithoutChecksum( const zypp::Pathname &file ) + { return true; } + }; + + +/////////////////////////////////////////////////////////////////// +}; // namespace zypp +/////////////////////////////////////////////////////////////////// + +class KeyRingCallbacks { + + private: + zypp::KeyRingReceive _keyRingReport; + + public: + KeyRingCallbacks() + { + _keyRingReport.connect(); + } + + ~KeyRingCallbacks() + { + _keyRingReport.disconnect(); + } + +}; + +#endif // ZMD_BACKEND_KEYRINGCALLBACKS_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/Makefile.am new/zmd-backend-7.1.1.0/src/Makefile.am --- old/zmd-backend-7.1.1.0/src/Makefile.am 2006-04-10 16:54:54.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/Makefile.am 2006-04-13 12:46:25.000000000 +0200 @@ -30,8 +30,8 @@ query_system_SOURCES = query-system.cc zmd-backend.cc query_files_SOURCES = query-files.cc zmd-backend.cc resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc -transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h zmd-backend.cc -parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc +transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h KeyRingCallbacks.h zmd-backend.cc +parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc KeyRingCallbacks.h package_files_SOURCES = package-files.cc zmd-backend.cc find_file_SOURCES = find-file.cc zmd-backend.cc update_status_SOURCES = update-status.cc zmd-backend.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/Makefile.in new/zmd-backend-7.1.1.0/src/Makefile.in --- old/zmd-backend-7.1.1.0/src/Makefile.in 2006-04-10 16:55:02.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/Makefile.in 2006-04-13 12:46:34.000000000 +0200 @@ -312,8 +312,8 @@ query_system_SOURCES = query-system.cc zmd-backend.cc query_files_SOURCES = query-files.cc zmd-backend.cc resolve_dependencies_SOURCES = resolve-dependencies.cc transactions.cc transactions.h zmd-backend.cc -transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h zmd-backend.cc -parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc +transact_SOURCES = transact.cc transactions.cc transactions.h RpmCallbacks.h MediaChangeCallback.h MessageResolvableReportCallback.h KeyRingCallbacks.h zmd-backend.cc +parse_metadata_SOURCES = parse-metadata.cc zmd-backend.cc KeyRingCallbacks.h package_files_SOURCES = package-files.cc zmd-backend.cc find_file_SOURCES = find-file.cc zmd-backend.cc update_status_SOURCES = update-status.cc zmd-backend.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/parse-metadata.cc new/zmd-backend-7.1.1.0/src/parse-metadata.cc --- old/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-04-12 16:18:22.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-04-13 12:45:58.000000000 +0200 @@ -46,6 +46,7 @@ #include <sys/stat.h> #include "dbsource/DbAccess.h" +#include "KeyRingCallbacks.h" //---------------------------------------------------------------------------- static SourceManager_Ptr manager; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/transact.cc new/zmd-backend-7.1.1.0/src/transact.cc --- old/zmd-backend-7.1.1.0/src/transact.cc 2006-04-10 16:54:27.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/transact.cc 2006-04-13 16:04:44.000000000 +0200 @@ -28,6 +28,7 @@ #include "RpmCallbacks.h" #include "MediaChangeCallback.h" #include "MessageResolvableReportCallback.h" +#include "KeyRingCallbacks.h" using solver::detail::ResolverInfo_Ptr; @@ -142,13 +143,21 @@ PoolItemList x,y,z; ::setenv( "YAST_IS_RUNNING", "1", 1 ); -#warning Must honor nosignature -#if 0 -#warning dry_run disabled - God->target()->commit( God->pool(), 0, x, y, z ); -#else - God->target()->commit( God->pool(), 0, x, y, z, dry_run ); -#endif + + ZYppCommitPolicy policy; + if (dry_run) policy.dryRun( true ); + if (nosignature) policy.rpmNoSignature( true ); + + ZYppCommitResult zres = God->commit( policy ); + if (zres._result != 0) { + result = 1; + if (zres._errors.size() > 0) { + cout << "3|Incomplete transactions:" << endl; + for (PoolItemList::const_iterator it = zres._errors.begin(); it != zres._errors.end(); ++it) { + cout << "3|" << it->resolvable() << endl; + } + } + } ExternalProgram suseconfig( "/sbin/SuSEconfig", ExternalProgram::Discard_Stderr ); // should redirect stderr to logfile suseconfig.close(); // discard exit code } @@ -178,5 +187,10 @@ MIL << "END transact, result " << result << endl; + if (count > 1 + && dry_run) + { + return 0; // bug #164583 + } return result; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package libzypp checked in at Thu Apr 13 17:33:44 CEST 2006. -------- --- libzypp/libzypp.changes 2006-04-13 12:47:53.000000000 +0200 +++ STABLE/libzypp/libzypp.changes 2006-04-13 15:24:52.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Apr 13 15:19:20 CEST 2006 - visnov(a)suse.cz + +- Ask user if signature file does not exist (#163765) +- handle repomd.xml.asc as optional file (#163765) +- rev 3089 + +------------------------------------------------------------------- +Thu Apr 13 13:52:08 CEST 2006 - schubi(a)suse.de + +- Bug 164365 - build 906: Deselecting a selection, all packages are still selected + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.TLpMCo/_old 2006-04-13 17:33:27.000000000 +0200 +++ /var/tmp/diff_new_pack.TLpMCo/_new 2006-04-13 17:33:27.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 95 +Release: 96 Source: zypp-0.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -104,6 +104,12 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Thu Apr 13 2006 - visnov(a)suse.cz +- Ask user if signature file does not exist (#163765) +- handle repomd.xml.asc as optional file (#163765) +- rev 3089 +* Thu Apr 13 2006 - schubi(a)suse.de +- Bug 164365 - build 906: Deselecting a selection, all packages are still selected * Thu Apr 13 2006 - kkaempf(a)suse.de - Dont do transitive uninstalls on uninstalled or upgraded items. (#165798) ++++++ zypp-0.0.0.tar.bz2 ++++++ libzypp/zypp-0.0.0.tar.bz2 STABLE/libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdelibs3
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package kdelibs3 checked in at Thu Apr 13 17:31:52 CEST 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-04-13 14:37:52.000000000 +0200 +++ STABLE/kdelibs3/kdelibs3.changes 2006-04-13 16:09:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 13 16:09:03 CEST 2006 - dmueller(a)suse.de + +- add dbus-1-qt3-devel to kdelibs3-devel dependencies + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.QyfaZf/_old 2006-04-13 17:31:10.000000000 +0200 +++ /var/tmp/diff_new_pack.QyfaZf/_new 2006-04-13 17:31:10.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.1 -Release: 41 +Release: 42 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.QyfaZf/_old 2006-04-13 17:31:10.000000000 +0200 +++ /var/tmp/diff_new_pack.QyfaZf/_new 2006-04-13 17:31:10.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.1 -Release: 41 +Release: 42 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -160,7 +160,7 @@ # next line from kde3-devel-packages macro Requires: kdelibs3-doc libtiff-devel openssl-devel unsermake update-desktop-files %if %suse_version > 1000 -Requires: libdrm-devel +Requires: libdrm-devel dbus-1-qt3-devel %endif Requires: libattr-devel libacl-devel %if %suse_version > 920 @@ -748,6 +748,8 @@ %changelog -n kdelibs3 * Thu Apr 13 2006 - dmueller(a)suse.de +- add dbus-1-qt3-devel to kdelibs3-devel dependencies +* Thu Apr 13 2006 - dmueller(a)suse.de - implement mediamanager/hal-unmount support in KIO (#160654) * Wed Apr 12 2006 - dobey(a)suse.de - Add patch to improve default svg sizes in hicolor index.theme ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.QyfaZf/_old 2006-04-13 17:31:10.000000000 +0200 +++ /var/tmp/diff_new_pack.QyfaZf/_new 2006-04-13 17:31:10.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.1 -Release: 41 +Release: 42 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-ntp-client
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package yast2-ntp-client checked in at Thu Apr 13 17:31:02 CEST 2006. -------- --- yast2-ntp-client/yast2-ntp-client.changes 2006-04-11 11:54:34.000000000 +0200 +++ NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2006-04-13 16:04:42.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 13 16:02:25 CEST 2006 - locilka(a)suse.cz + +- Leaving the 'initial_sync' and 'options' for pool.ntp.org feature + without change when user has previously changed them (#165852). +- 2.13.7 + +------------------------------------------------------------------- Old: ---- yast2-ntp-client-2.13.6.tar.bz2 New: ---- yast2-ntp-client-2.13.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.36TNak/_old 2006-04-13 17:30:42.000000000 +0200 +++ /var/tmp/diff_new_pack.36TNak/_new 2006-04-13 17:30:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ntp-client (Version 2.13.6) +# spec file for package yast2-ntp-client (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-ntp-client -Version: 2.13.6 +Version: 2.13.7 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ntp-client-2.13.6.tar.bz2 +Source0: yast2-ntp-client-2.13.7.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite Requires: yast2 yast2-slp yast2-country @@ -33,7 +33,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-ntp-client-2.13.6 +%setup -n yast2-ntp-client-2.13.7 %build %{prefix}/bin/y2tool y2autoconf @@ -70,6 +70,10 @@ %doc %{prefix}/share/doc/packages/yast2-ntp-client %changelog -n yast2-ntp-client +* Thu Apr 13 2006 - locilka(a)suse.cz +- Leaving the 'initial_sync' and 'options' for pool.ntp.org feature + without change when user has previously changed them (#165852). +- 2.13.7 * Tue Apr 11 2006 - locilka(a)suse.cz - Switching from simple to complex configuration was eating server entries (#165149). ++++++ yast2-ntp-client-2.13.6.tar.bz2 -> yast2-ntp-client-2.13.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/Makefile.am new/yast2-ntp-client-2.13.7/Makefile.am --- old/yast2-ntp-client-2.13.6/Makefile.am 2006-04-11 11:55:50.000000000 +0200 +++ new/yast2-ntp-client-2.13.7/Makefile.am 2006-04-13 16:05:18.000000000 +0200 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/Makefile.in new/yast2-ntp-client-2.13.7/Makefile.in --- old/yast2-ntp-client-2.13.6/Makefile.in 2006-04-11 11:55:57.000000000 +0200 +++ new/yast2-ntp-client-2.13.7/Makefile.in 2006-04-13 16:05:24.000000000 +0200 @@ -783,7 +783,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -826,9 +826,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/VERSION new/yast2-ntp-client-2.13.7/VERSION --- old/yast2-ntp-client-2.13.6/VERSION 2006-04-11 11:52:37.000000000 +0200 +++ new/yast2-ntp-client-2.13.7/VERSION 2006-04-13 16:02:22.000000000 +0200 @@ -1 +1 @@ -2.13.6 +2.13.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/configure new/yast2-ntp-client-2.13.7/configure --- old/yast2-ntp-client-2.13.6/configure 2006-04-11 11:55:54.000000000 +0200 +++ new/yast2-ntp-client-2.13.7/configure 2006-04-13 16:05:22.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-ntp-client 2.13.6. +# Generated by GNU Autoconf 2.59 for yast2-ntp-client 2.13.7. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ntp-client' PACKAGE_TARNAME='yast2-ntp-client' -PACKAGE_VERSION='2.13.6' -PACKAGE_STRING='yast2-ntp-client 2.13.6' +PACKAGE_VERSION='2.13.7' +PACKAGE_STRING='yast2-ntp-client 2.13.7' 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-ntp-client 2.13.6 to adapt to many kinds of systems. +\`configure' configures yast2-ntp-client 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-ntp-client 2.13.6:";; + short | recursive ) echo "Configuration of yast2-ntp-client 2.13.7:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-ntp-client configure 2.13.6 +yast2-ntp-client 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-ntp-client $as_me 2.13.6, which was +It was created by yast2-ntp-client $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-ntp-client' - 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-ntp-client" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-ntp-client $as_me 2.13.6, which was +This file was extended by yast2-ntp-client $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-ntp-client config.status 2.13.6 +yast2-ntp-client 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-ntp-client-2.13.6/configure.in new/yast2-ntp-client-2.13.7/configure.in --- old/yast2-ntp-client-2.13.6/configure.in 2006-04-11 11:55:50.000000000 +0200 +++ new/yast2-ntp-client-2.13.7/configure.in 2006-04-13 16:05:18.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-ntp-client, 2.13.6, http://www.suse.de/feedback, yast2-ntp-client) +AC_INIT(yast2-ntp-client, 2.13.7, http://www.suse.de/feedback, yast2-ntp-client) 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-ntp-client" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.13.6/src/NtpClient.ycp new/yast2-ntp-client-2.13.7/src/NtpClient.ycp --- old/yast2-ntp-client-2.13.6/src/NtpClient.ycp 2006-04-11 11:55:01.000000000 +0200 +++ new/yast2-ntp-client-2.13.7/src/NtpClient.ycp 2006-04-13 16:05:03.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of ntp-client, input and output functions. * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: NtpClient.ycp 29971 2006-04-11 09:54:58Z locilka $ + * $Id: NtpClient.ycp 30111 2006-04-13 14:04:55Z locilka $ * * Representation of the configuration of ntp-client. * Input and output routines. @@ -458,6 +458,17 @@ * into the current configuration. */ global define void ActivateRandomPoolServersFunction () { + // leave the current configuration if any + map <string, map <string, any> > store_current_options = $[]; + foreach (map <string, any> one_record, ntp_records, { + if (one_record["type"]:"" == "server" && one_record["address"]:"" != "") { + string one_address = one_record["address"]:""; + store_current_options[one_address] = $[]; + store_current_options[one_address, "options"] = one_record["options"]:""; + store_current_options[one_address, "initial_sync"] = one_record["initial_sync"]:true; + } + }); + // remove all old ones DeActivateRandomPoolServersFunction(); @@ -469,11 +480,21 @@ }); foreach (string one_server, random_pool_servers, { + boolean one_initial_sync = true; + string one_options = ""; + + if (haskey(store_current_options, one_server)) { + one_initial_sync = store_current_options[one_server, "initial_sync"]:true; + one_options = store_current_options[one_server, "options"]:""; + y2milestone("Leaving current configuration for server '%1', initial_sync: '%2', options '%3'", + one_server, one_initial_sync, one_options); + } + ntp_records = add (ntp_records, $[ "address":one_server, "comment":"\n# Random pool server, see http://www.pool.ntp.org/ for more information\n", - "initial_sync":true, - "options":"", + "initial_sync":one_initial_sync, + "options":one_options, "type":"server" ]); }); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gnome-filesystem
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package gnome-filesystem checked in at Thu Apr 13 17:30:51 CEST 2006. -------- --- GNOME/gnome-filesystem/gnome-filesystem.changes 2006-03-29 15:34:57.000000000 +0200 +++ STABLE/gnome-filesystem/gnome-filesystem.changes 2006-04-13 16:06:47.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 11 16:56:43 CEST 2006 - sbrabec(a)suse.cz + +- Run slow cleanup only if it is really required (#157001). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.b41Pl7/_old 2006-04-13 17:30:24.000000000 +0200 +++ /var/tmp/diff_new_pack.b41Pl7/_new 2006-04-13 17:30:24.000000000 +0200 @@ -18,7 +18,7 @@ PreReq: coreutils Summary: GNOME Directory Layout Version: 0.1 -Release: 252 +Release: 256 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -477,6 +477,13 @@ # This file should not be a part of RPM file list, because it deletes # itself after run. # +# Is it an update from SuSE Linux version, which did not care about RPM +# directory ownership (SuSE Linux < 9.0)? +if [ "$1" = "1" -a -f /var/lib/YaST2/update_mode ] ; then + EXPENSIVE_CLEANUP=true +else + EXPENSIVE_CLEANUP=false +fi cat >sbin/conf.d/SuSEconfig.zzzgnome-filesystem <<GEOF #! /bin/sh # @@ -531,6 +538,8 @@ # (created in 8.2 by gtk YOU). find 2>/dev/null \$r/opt/gnome2/share/themes -type l -exec sh -c "if ls -l \"{}\" | sed 's/.*-> //' | fgrep usr/share/themes ; then rm -v \"{}\" ; fi" \; # +if $EXPENSIVE_CLEANUP ; then +# TRASH=\$r/var/adm/backup/GNOME TEMP=\$(mktemp -d /tmp/tmp.gnome-postinstall.XXXXXX) || { echo "could not create temp dir" >&2; exit 1; } echo -n "" >\$TEMP/list @@ -634,6 +643,8 @@ # rm -r \$TEMP # +fi +# # Everything is done and this script will be never more needed. rm \$r/sbin/conf.d/SuSEconfig.zzzgnome-filesystem GEOF @@ -655,6 +666,8 @@ %ghost /opt/gnome/share/mime/subclasses %changelog -n gnome-filesystem +* Tue Apr 11 2006 - sbrabec(a)suse.cz +- Run slow cleanup only if it is really required (#157001). * Wed Mar 29 2006 - sbrabec(a)suse.cz - Added km locale directory. * Sat Mar 04 2006 - aj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit control-center2
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package control-center2 checked in at Thu Apr 13 17:30:18 CEST 2006. -------- --- GNOME/control-center2/control-center2.changes 2006-04-03 22:23:05.000000000 +0200 +++ STABLE/control-center2/control-center2.changes 2006-04-13 16:55:04.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 13 16:54:44 CEST 2006 - sbrabec(a)suse.cz + +- Call %suse_update_desktop_file for all desktop files. +- Added gnome-ui-properties to control-center (118960#c11). +- Use new control-center Categories instead of illegal old ones. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ control-center2.spec ++++++ --- /var/tmp/diff_new_pack.BZ5lZY/_old 2006-04-13 17:29:49.000000000 +0200 +++ /var/tmp/diff_new_pack.BZ5lZY/_new 2006-04-13 17:29:49.000000000 +0200 @@ -21,7 +21,7 @@ Obsoletes: fontilus themus acme Provides: fontilus themus acme Version: 2.12.2 -Release: 41 +Release: 44 Summary: The GNOME Control Center for the GNOME 2.x Desktop Source: %{_name}-%{version}.tar.bz2 Source1: control-center-art.tar.bz2 @@ -126,9 +126,23 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/mime/packages cp %{S:2} $RPM_BUILD_ROOT/usr/share/mime/packages %find_lang %{_name}-2.0 -%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustdoc-2" default-applications -%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustuserinter-2" gnome-ui-properties %suse_update_desktop_file -N "Control Center" -G "Personal Settings" -C "Configure the desktop" gnomecc +# capplets +%suse_update_desktop_file at-properties X-SuSE-ControlCenter-Personal +%suse_update_desktop_file accessibility-keyboard X-SuSE-ControlCenter-Personal +%suse_update_desktop_file background X-SuSE-ControlCenter-LookAndFeel +%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustdoc-2" default-applications X-SuSE-ControlCenter-System +%suse_update_desktop_file display-properties X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file font-properties X-SuSE-ControlCenter-LookAndFeel +%suse_update_desktop_file gnome-passwd X-SuSE-ControlCenter-Personal +%suse_update_desktop_file gnome-settings-mouse X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file gnome-settings-sound X-SuSE-ControlCenter-System +%suse_update_desktop_file gnome-network-preferences X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file -D "user-guide/user-guide.xml?goscustuserinter-2" gnome-ui-properties X-SuSE-ControlCenter-LookAndFeel +%suse_update_desktop_file gtk-theme-selector X-SuSE-ControlCenter-LookAndFeel +%suse_update_desktop_file keybinding X-SuSE-ControlCenter-Personal +%suse_update_desktop_file keyboard X-SuSE-ControlCenter-Hardware +%suse_update_desktop_file window-properties X-SuSE-ControlCenter-LookAndFeel mkdir -p $RPM_BUILD_ROOT/usr/share/applications sed '/^OnlyShowIn/d;s/GNOME;Application;Settings;/GNOME;Application;DesktopSettings;/'\ <$RPM_BUILD_ROOT/opt/gnome/share/applications/gnomecc.desktop\ @@ -220,6 +234,10 @@ %{prefix}/share/idl/*.idl %changelog -n control-center2 +* Thu Apr 13 2006 - sbrabec(a)suse.cz +- Call %%suse_update_desktop_file for all desktop files. +- Added gnome-ui-properties to control-center (118960#c11). +- Use new control-center Categories instead of illegal old ones. * Mon Apr 03 2006 - jpr(a)suse.de - Add gst 0.10 support for gnome-settings-daemon * Thu Mar 23 2006 - rodrigo(a)suse.de ++++++ control-center2-passwd-dialog.patch ++++++ --- /var/tmp/diff_new_pack.BZ5lZY/_old 2006-04-13 17:29:50.000000000 +0200 +++ /var/tmp/diff_new_pack.BZ5lZY/_new 2006-04-13 17:29:50.000000000 +0200 @@ -248,7 +248,7 @@ +Terminal=false +Type=Application +StartupNotify=true -+Categories=GNOME;Settings;Personal;X-Ximian-Settings; ++Categories=GNOME;Settings; +OnlyShowIn=GNOME; +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=control-center ++++++ desktop.patch ++++++ --- /var/tmp/diff_new_pack.BZ5lZY/_old 2006-04-13 17:29:50.000000000 +0200 +++ /var/tmp/diff_new_pack.BZ5lZY/_new 2006-04-13 17:29:50.000000000 +0200 @@ -1,7 +1,6 @@ -diff -pruN control-center-2.12.0-old/capplets/accessibility/at-properties/at-properties.desktop.in.in control-center-2.12.0/capplets/accessibility/at-properties/at-properties.desktop.in.in ---- control-center-2.12.0-old/capplets/accessibility/at-properties/at-properties.desktop.in.in 2004-11-24 10:54:02.000000000 -0800 -+++ control-center-2.12.0/capplets/accessibility/at-properties/at-properties.desktop.in.in 2005-09-15 06:31:01.959784250 -0700 -@@ -1,13 +1,13 @@ +--- control-center-2.12.2/capplets/accessibility/at-properties/at-properties.desktop.in.in ++++ control-center-2.12.2/capplets/accessibility/at-properties/at-properties.desktop.in.in +@@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Assistive Technology Support @@ -9,18 +8,9 @@ _Comment=Enable support for GNOME assistive technologies at login Exec=gnome-at-properties Icon=gnome-settings-accessibility-technologies - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Settings;Accessibility; -+Categories=GNOME;Settings;Personal;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.12.0/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in ---- control-center-2.12.0-old/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2004-11-24 10:54:02.000000000 -0800 -+++ control-center-2.12.0/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2005-09-15 06:29:48.553223413 -0700 -@@ -1,13 +1,13 @@ +--- control-center-2.12.2/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in ++++ control-center-2.12.2/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in +@@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Keyboard @@ -28,53 +18,41 @@ _Comment=Set your keyboard accessibility preferences Exec=gnome-accessibility-keyboard-properties Icon=gnome-settings-accessibility-keyboard - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Application;Settings;Accessibility; -+Categories=Application;Settings;Accessibility;Personal;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/background/background.desktop.in.in control-center-2.12.0/capplets/background/background.desktop.in.in ---- control-center-2.12.0-old/capplets/background/background.desktop.in.in 2005-01-08 19:53:35.000000000 -0800 -+++ control-center-2.12.0/capplets/background/background.desktop.in.in 2005-09-15 06:29:48.559222397 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-settings-background +--- control-center-2.12.2/capplets/background/background.desktop.in.in ++++ control-center-2.12.2/capplets/background/background.desktop.in.in +@@ -7,7 +7,7 @@ Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Settings;Appearance; -+Categories=GNOME;Application;Settings;Appearance;X-Ximian-Settings; ++Categories=GNOME;Application;Settings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/default-applications/default-applications.desktop.in.in control-center-2.12.0/capplets/default-applications/default-applications.desktop.in.in ---- control-center-2.12.0-old/capplets/default-applications/default-applications.desktop.in.in 2004-11-24 10:54:02.000000000 -0800 -+++ control-center-2.12.0/capplets/default-applications/default-applications.desktop.in.in 2005-09-15 06:29:52.666526551 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-settings-default-applications +--- control-center-2.12.2/capplets/default-applications/default-applications.desktop.in.in ++++ control-center-2.12.2/capplets/default-applications/default-applications.desktop.in.in +@@ -7,7 +7,7 @@ Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Application;Settings;AdvancedSettings; -+Categories=GNOME;Application;Settings;DesktopSettings;AdvancedSettings;X-Ximian-Settings; ++Categories=GNOME;Application;Settings;DesktopSettings;AdvancedSettings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/display/display-properties.desktop.in.in control-center-2.12.0/capplets/display/display-properties.desktop.in.in ---- control-center-2.12.0-old/capplets/display/display-properties.desktop.in.in 2004-11-24 10:54:02.000000000 -0800 -+++ control-center-2.12.0/capplets/display/display-properties.desktop.in.in 2005-09-15 06:29:48.570220534 -0700 -@@ -7,7 +7,7 @@ Icon=display-capplet.png +--- control-center-2.12.2/capplets/display/display-properties.desktop.in.in ++++ control-center-2.12.2/capplets/display/display-properties.desktop.in.in +@@ -7,7 +7,7 @@ Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Settings;Appearance; -+Categories=Application;Settings;Hardware;X-Ximian-Settings; ++Categories=GNOME;Application;Settings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/font/font-properties.desktop.in.in control-center-2.12.0/capplets/font/font-properties.desktop.in.in ---- control-center-2.12.0-old/capplets/font/font-properties.desktop.in.in 2004-11-24 10:54:02.000000000 -0800 -+++ control-center-2.12.0/capplets/font/font-properties.desktop.in.in 2005-09-15 06:29:48.575219687 -0700 +--- control-center-2.12.2/capplets/font/font-properties.desktop.in.in ++++ control-center-2.12.2/capplets/font/font-properties.desktop.in.in @@ -1,13 +1,13 @@ [Desktop Entry] Encoding=UTF-8 @@ -87,14 +65,13 @@ Type=Application StartupNotify=true -Categories=GNOME;Settings;Appearance; -+Categories=GNOME;Application;Settings;Appearance;X-Ximian-Settings; ++Categories=GNOME;Application;Settings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/keybindings/keybinding.desktop.in.in control-center-2.12.0/capplets/keybindings/keybinding.desktop.in.in ---- control-center-2.12.0-old/capplets/keybindings/keybinding.desktop.in.in 2004-11-24 10:54:02.000000000 -0800 -+++ control-center-2.12.0/capplets/keybindings/keybinding.desktop.in.in 2005-09-15 06:29:48.580218840 -0700 -@@ -1,13 +1,13 @@ +--- control-center-2.12.2/capplets/keybindings/keybinding.desktop.in.in ++++ control-center-2.12.2/capplets/keybindings/keybinding.desktop.in.in +@@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -_Name=Keyboard Shortcuts @@ -102,41 +79,8 @@ _Comment=Assign shortcut keys to commands Exec=gnome-keybinding-properties Icon=gnome-settings-keybindings - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Application;Settings; -+Categories=Application;Settings;Personal;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/keyboard/keyboard.desktop.in.in control-center-2.12.0/capplets/keyboard/keyboard.desktop.in.in ---- control-center-2.12.0-old/capplets/keyboard/keyboard.desktop.in.in 2004-11-24 10:54:03.000000000 -0800 -+++ control-center-2.12.0/capplets/keyboard/keyboard.desktop.in.in 2005-09-15 06:29:48.586217824 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-dev-keyboard - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Application;Settings; -+Categories=Application;Settings;Hardware;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/mouse/gnome-settings-mouse.desktop.in.in control-center-2.12.0/capplets/mouse/gnome-settings-mouse.desktop.in.in ---- control-center-2.12.0-old/capplets/mouse/gnome-settings-mouse.desktop.in.in 2004-11-24 10:54:03.000000000 -0800 -+++ control-center-2.12.0/capplets/mouse/gnome-settings-mouse.desktop.in.in 2005-09-15 06:29:48.591216977 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-dev-mouse-optical - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Application;Settings; -+Categories=Application;Settings;Hardware;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/network/gnome-network-preferences.desktop.in.in control-center-2.12.0/capplets/network/gnome-network-preferences.desktop.in.in ---- control-center-2.12.0-old/capplets/network/gnome-network-preferences.desktop.in.in 2004-12-15 05:58:56.000000000 -0800 -+++ control-center-2.12.0/capplets/network/gnome-network-preferences.desktop.in.in 2005-09-15 06:29:48.597215960 -0700 +--- control-center-2.12.2/capplets/network/gnome-network-preferences.desktop.in.in ++++ control-center-2.12.2/capplets/network/gnome-network-preferences.desktop.in.in @@ -1,13 +1,13 @@ [Desktop Entry] Encoding=UTF-8 @@ -150,38 +94,24 @@ Type=Application StartupNotify=true -Categories=GNOME;Application;Settings; -+Categories=Application;Settings;AdvancedSettings;X-Ximian-Settings; ++Categories=GNOME;Application;Settings;AdvancedSettings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/sound/gnome-settings-sound.desktop.in.in control-center-2.12.0/capplets/sound/gnome-settings-sound.desktop.in.in ---- control-center-2.12.0-old/capplets/sound/gnome-settings-sound.desktop.in.in 2004-11-24 10:54:03.000000000 -0800 -+++ control-center-2.12.0/capplets/sound/gnome-settings-sound.desktop.in.in 2005-09-15 06:29:48.602215113 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-settings-sound +--- control-center-2.12.2/capplets/sound/gnome-settings-sound.desktop.in.in ++++ control-center-2.12.2/capplets/sound/gnome-settings-sound.desktop.in.in +@@ -7,7 +7,7 @@ Terminal=false Type=Application StartupNotify=true -Categories=GNOME;Application;Settings; -+Categories=Application;Settings;AdvancedSettings;X-Ximian-Settings; ++Categories=GNOME;Application;Settings;AdvancedSettings; OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/theme-switcher/gtk-theme-selector.desktop.in.in control-center-2.12.0/capplets/theme-switcher/gtk-theme-selector.desktop.in.in ---- control-center-2.12.0-old/capplets/theme-switcher/gtk-theme-selector.desktop.in.in 2004-11-24 10:54:03.000000000 -0800 -+++ control-center-2.12.0/capplets/theme-switcher/gtk-theme-selector.desktop.in.in 2005-09-15 06:29:48.608214097 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-settings-theme - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Application;Settings; -+Categories=Application;Settings;Appearance;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/ui-properties/gnome-ui-properties.desktop.in.in control-center-2.12.0/capplets/ui-properties/gnome-ui-properties.desktop.in.in ---- control-center-2.12.0-old/capplets/ui-properties/gnome-ui-properties.desktop.in.in 2004-11-24 10:54:03.000000000 -0800 -+++ control-center-2.12.0/capplets/ui-properties/gnome-ui-properties.desktop.in.in 2005-09-15 06:29:52.672525534 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-settings-ui-behavior +--- control-center-2.12.2/capplets/ui-properties/gnome-ui-properties.desktop.in.in ++++ control-center-2.12.2/capplets/ui-properties/gnome-ui-properties.desktop.in.in +@@ -7,7 +7,7 @@ Terminal=false Type=Application StartupNotify=true @@ -190,15 +120,3 @@ OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=control-center -diff -pruN control-center-2.12.0-old/capplets/windows/window-properties.desktop.in.in control-center-2.12.0/capplets/windows/window-properties.desktop.in.in ---- control-center-2.12.0-old/capplets/windows/window-properties.desktop.in.in 2004-12-15 05:58:56.000000000 -0800 -+++ control-center-2.12.0/capplets/windows/window-properties.desktop.in.in 2005-09-15 06:29:48.613213250 -0700 -@@ -7,7 +7,7 @@ Icon=gnome-window-manager - Terminal=false - Type=Application - StartupNotify=true --Categories=GNOME;Application;Settings; -+Categories=GNOME;Application;Settings;Appearance;X-Ximian-Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=control-center ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit phpMyAdmin
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package phpMyAdmin checked in at Thu Apr 13 17:30:10 CEST 2006. -------- --- phpMyAdmin/phpMyAdmin.changes 2006-01-25 21:47:24.000000000 +0100 +++ NOARCH/phpMyAdmin/phpMyAdmin.changes 2006-04-13 16:05:41.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 13 14:08:32 CEST 2006 - mmarek(a)suse.cz + +- updated to 2.8.0.3 + * fixes some XSS vulnerabilities + * improves php-5.1.2 compatibility + [#165772] +- moved $cfg['blowfish_secret'] to separate file, so that config.inc.php + isn't edited during install + (blowfish_secret.patch) + +------------------------------------------------------------------- Old: ---- phpMyAdmin-2.7.0-pl2.tar.bz2 New: ---- phpMyAdmin-2.8.0.3.tar.bz2 phpMyAdmin-blowfish_secret.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.NyAqVS/_old 2006-04-13 17:29:46.000000000 +0200 +++ /var/tmp/diff_new_pack.NyAqVS/_new 2006-04-13 17:29:46.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package phpMyAdmin (Version 2.7.0pl2) +# spec file for package phpMyAdmin (Version 2.8.0.3) # # 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,10 +16,11 @@ Group: Productivity/Networking/Web/Frontends Requires: mod_php_any php-mysql php-bz2 php-gd php-zlib php-iconv php-mcrypt php-session Autoreqprov: on -Version: 2.7.0pl2 -Release: 3 -%define tarversion 2.7.0-pl2 +Version: 2.8.0.3 +Release: 1 +%define tarversion %{version} Source0: %{name}-%{tarversion}.tar.bz2 +Patch1: %{name}-blowfish_secret.patch URL: http://www.phpMyAdmin.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Administration of MySQL over the web @@ -62,6 +63,7 @@ %prep %setup -q -n %{name}-%{tarversion} +%patch1 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; find . -type f -name '*.orig' -exec rm {} \; @@ -71,8 +73,8 @@ %install install -m 755 -d $RPM_BUILD_ROOT%{serverroot}%{name} -cp config.default.php config.inc.php -cp -dR docs.css *.php *.html themes lang libraries css \ +cp libraries/config.default.php libraries/config.inc.php +cp -dR docs.css *.php *.html themes lang libraries css js \ $RPM_BUILD_ROOT%{serverroot}%{name} # generate file list @@ -83,9 +85,35 @@ rm -rf $RPM_BUILD_ROOT %post -if grep -q "\\\$cfg\['blowfish_secret'\] = ''" %{serverroot}%{name}/config.inc.php ; then +old_config="%{serverroot}%{name}/config.inc.php" +new_config="%{serverroot}%{name}/libraries/config.inc.php" +blowfish_secret="%{serverroot}%{name}/libraries/blowfish_secret.inc.php" +# handle upgrade from a version that had /config.inc.php (<=10.0) +# now it's /libraries/config.inc.php (>=10.1) +if test -f "$old_config"; then + echo "phpMyAdmin's config file location has changed from " >&2 + echo "$old_config to" >&2 + echo "$new_config" >&2 + echo "it will be automatically moved" >&2 + # emulate rpm behaviour when upgrading a %%config(noreplace) file + mv -f "$new_config" "$new_config.rpmnew" + mv -f "$old_config" "$new_config" +fi +# generate blowfish secret +# in <=10.0, this used to be directly in config.inc.php, +# which made it hard to detect whether the file was changed by the user or not +if grep -q "\\\$cfg\['blowfish_secret'\]" "$new_config" ; then + # if this is an upgrade from <=10.0, move the secret + # to blowfish_secret.inc.php + # this is hopefully the last time we change this config file in %%post + (echo "<?php" + grep "\\\$cfg\['blowfish_secret'\]" "$new_config" + echo "?>") >"$blowfish_secret" + sed -i "s/.*\\\$cfg\['blowfish_secret'\].*/include_once 'blowfish_secret.inc.php';/" "$new_config" +fi +if grep -q "\\\$cfg\['blowfish_secret'\] = ''" "$blowfish_secret" ; then echo "Generating blowfish secret for phpMyAdmin..." - sed -i "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" %{serverroot}%{name}/config.inc.php + sed -i "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" "$blowfish_secret" fi %files -f FILELIST @@ -94,9 +122,18 @@ %doc LICENSE README RELEASE-DATE* TODO translators.html %doc scripts/*.sql %dir %{serverroot}%{name} -%config(noreplace) %{serverroot}%{name}/config.inc.php +%config(noreplace) %{serverroot}%{name}/libraries/config.inc.php +%verify(not md5 size mtime) %config(noreplace) %{serverroot}%{name}/libraries/blowfish_secret.inc.php %changelog -n phpMyAdmin +* Thu Apr 13 2006 - mmarek(a)suse.cz +- updated to 2.8.0.3 + * fixes some XSS vulnerabilities + * improves php-5.1.2 compatibility + [#165772] +- moved $cfg['blowfish_secret'] to separate file, so that config.inc.php + isn't edited during install + (blowfish_secret.patch) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Jan 17 2006 - postadal(a)suse.cz ++++++ phpMyAdmin-2.7.0-pl2.tar.bz2 -> phpMyAdmin-2.8.0.3.tar.bz2 ++++++ ++++ 89244 lines of diff (skipped) ++++++ phpMyAdmin-blowfish_secret.patch ++++++ --- libraries/config.default.php +++ libraries/config.default.php @@ -42,7 +42,7 @@ * passphrase that will be used by blowfish. The maximum length seems to be 46 * characters. */ -$cfg['blowfish_secret'] = ''; +include_once 'blowfish_secret.inc.php'; /** * Server(s) configuration --- /dev/null +++ libraries/blowfish_secret.inc.php @@ -0,0 +1,3 @@ +<?php +$cfg['blowfish_secret'] = ''; +?> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package yast2-installation checked in at Thu Apr 13 17:28:08 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-04-12 17:54:50.000000000 +0200 +++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-13 10:39:38.000000000 +0200 @@ -2 +2,8 @@ -Tue Apr 11 16:24:48 CEST 2006 - jdsn(a)suse.de +Thu Apr 13 10:35:42 CEST 2006 - mvidner(a)suse.cz + +- Do not display errors if language specific release notes are missing + on the installation source (#165767). +- 2.13.70 + +------------------------------------------------------------------- +Wed Apr 12 16:24:48 CEST 2006 - jdsn(a)suse.de Old: ---- yast2-installation-2.13.69.tar.bz2 New: ---- yast2-installation-2.13.70.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.rqIm7a/_old 2006-04-13 17:27:14.000000000 +0200 +++ /var/tmp/diff_new_pack.rqIm7a/_new 2006-04-13 17:27:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.69) +# spec file for package yast2-installation (Version 2.13.70) # # 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-installation -Version: 2.13.69 +Version: 2.13.70 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.69.tar.bz2 +Source0: yast2-installation-2.13.70.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.69 +%setup -n yast2-installation-2.13.70 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,13 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Thu Apr 13 2006 - mvidner(a)suse.cz +- Do not display errors if language specific release notes are missing + on the installation source (#165767). +- 2.13.70 +* Wed Apr 12 2006 - jdsn(a)suse.de +- added missing autoyast entries in suse_register.desktop +- 2.13.69 * Wed Apr 12 2006 - jsuchome(a)suse.cz - control files updated for manual online update run (#165503) - 2.13.68 @@ -122,9 +129,6 @@ - fixed boot if root is on LVM (initialize udev symlinks) (#163073) - 2.13.65 * Tue Apr 11 2006 - jdsn(a)suse.de -- added missing autoyast entries in suse_register.desktop -- 2.13.69 -* Tue Apr 11 2006 - jdsn(a)suse.de - in inst_suse_register: - resized popups (hmuelle) - new info pupop showing new update server (aj) ++++++ yast2-installation-2.13.69.tar.bz2 -> yast2-installation-2.13.70.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.69/VERSION new/yast2-installation-2.13.70/VERSION --- old/yast2-installation-2.13.69/VERSION 2006-04-11 16:24:46.000000000 +0200 +++ new/yast2-installation-2.13.70/VERSION 2006-04-13 10:34:46.000000000 +0200 @@ -1 +1 @@ -2.13.69 +2.13.70 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.69/configure new/yast2-installation-2.13.70/configure --- old/yast2-installation-2.13.69/configure 2006-04-11 16:25:45.000000000 +0200 +++ new/yast2-installation-2.13.70/configure 2006-04-13 10:40:57.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-installation 2.13.69. +# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.70. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.13.69' -PACKAGE_STRING='yast2-installation 2.13.69' +PACKAGE_VERSION='2.13.70' +PACKAGE_STRING='yast2-installation 2.13.70' 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-installation 2.13.69 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.13.70 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-installation 2.13.69:";; + short | recursive ) echo "Configuration of yast2-installation 2.13.70:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.13.69 +yast2-installation configure 2.13.70 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-installation $as_me 2.13.69, which was +It was created by yast2-installation $as_me 2.13.70, 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-installation' - VERSION='2.13.69' + VERSION='2.13.70' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.69" +VERSION="2.13.70" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2906,7 +2906,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-installation $as_me 2.13.69, which was +This file was extended by yast2-installation $as_me 2.13.70, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +2961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.13.69 +yast2-installation config.status 2.13.70 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-installation-2.13.69/configure.in new/yast2-installation-2.13.70/configure.in --- old/yast2-installation-2.13.69/configure.in 2006-04-11 16:25:36.000000000 +0200 +++ new/yast2-installation-2.13.70/configure.in 2006-04-13 10:40:47.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.69, http://www.suse.de/feedback, yast2-installation) +AC_INIT(yast2-installation, 2.13.70, http://www.suse.de/feedback, yast2-installation) 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.69" +VERSION="2.13.70" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.69/control/docs/control-doc.xml new/yast2-installation-2.13.70/control/docs/control-doc.xml --- old/yast2-installation-2.13.69/control/docs/control-doc.xml 2006-03-15 16:33:54.000000000 +0100 +++ new/yast2-installation-2.13.70/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200 @@ -28,7 +28,7 @@ 0.1 </revnumber> <date> - $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $ + $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $ </date> <revremark>Initial Release as PDF</revremark> </revision> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.69/control.pot new/yast2-installation-2.13.70/control.pot --- old/yast2-installation-2.13.69/control.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.13.70/control.pot 2006-02-17 14:03:00.000000000 +0100 @@ -0,0 +1,319 @@ +# 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-02-17 14:03+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: control/control.PROF.glade:58 control/control.PROF.glade:114 +#: control/control.PROF.glade:391 control/control.PROF.glade:431 +#: control/control.SLD.glade:59 control/control.SLD.glade:115 +#: control/control.SLD.glade:392 control/control.SLD.glade:432 +#: control/control.SLES.glade:59 control/control.SLES.glade:102 +#: control/control.SLES.glade:156 control/control.SLES.glade:174 +#: control/control.SLES.glade:497 control/control.SLES.glade:537 +#: control/control.glade:58 control/control.glade:114 +#: control/control.glade:391 control/control.glade:431 +msgid "Installation Settings" +msgstr "" + +#: control/control.PROF.glade:76 control/control.SLD.glade:77 +#: control/control.SLES.glade:77 control/control.SLES.glade:119 +#: control/control.glade:76 +msgid "Overview" +msgstr "" + +#: control/control.PROF.glade:84 control/control.SLD.glade:85 +#: control/control.SLES.glade:85 control/control.SLES.glade:127 +#: control/control.glade:84 +msgid "Expert" +msgstr "" + +#: control/control.PROF.glade:100 control/control.SLD.glade:101 +#: control/control.SLES.glade:142 control/control.glade:100 +msgid "Update Settings" +msgstr "" + +#: control/control.PROF.glade:131 control/control.SLD.glade:132 +#: control/control.SLES.glade:189 control/control.SLES.glade:230 +#: control/control.glade:131 +msgid "Network Configuration" +msgstr "" + +#: control/control.PROF.glade:171 control/control.PROF.glade:595 +#: control/control.PROF.glade:600 control/control.PROF.glade:604 +#: control/control.SLD.glade:172 control/control.SLD.glade:596 +#: control/control.SLD.glade:601 control/control.SLD.glade:605 +#: control/control.SLES.glade:263 control/control.SLES.glade:274 +#: control/control.SLES.glade:283 control/control.SLES.glade:706 +#: control/control.SLES.glade:711 control/control.SLES.glade:715 +#: control/control.glade:171 control/control.glade:595 +#: control/control.glade:600 control/control.glade:604 +msgid "Hardware Configuration" +msgstr "" + +#: control/control.PROF.glade:190 control/control.PROF.glade:280 +#: control/control.PROF.glade:362 control/control.SLD.glade:191 +#: control/control.SLD.glade:281 control/control.SLD.glade:363 +#: control/control.SLES.glade:302 control/control.SLES.glade:386 +#: control/control.SLES.glade:468 control/control.glade:190 +#: control/control.glade:280 control/control.glade:362 +msgid "Preparation" +msgstr "" + +#: control/control.PROF.glade:196 control/control.PROF.glade:205 +#: control/control.PROF.glade:286 control/control.PROF.glade:295 +#: control/control.PROF.glade:386 control/control.PROF.glade:426 +#: control/control.SLD.glade:197 control/control.SLD.glade:206 +#: control/control.SLD.glade:287 control/control.SLD.glade:296 +#: control/control.SLD.glade:387 control/control.SLD.glade:427 +#: control/control.SLES.glade:308 control/control.SLES.glade:317 +#: control/control.SLES.glade:392 control/control.SLES.glade:401 +#: control/control.SLES.glade:492 control/control.SLES.glade:532 +#: control/control.glade:196 control/control.glade:205 +#: control/control.glade:286 control/control.glade:295 +#: control/control.glade:386 control/control.glade:426 +msgid "Language" +msgstr "" + +#: control/control.PROF.glade:211 control/control.PROF.glade:301 +#: control/control.SLD.glade:212 control/control.SLD.glade:302 +#: control/control.SLES.glade:323 control/control.SLES.glade:407 +#: control/control.glade:211 control/control.glade:301 +msgid "License Agreement" +msgstr "" + +#: control/control.PROF.glade:217 control/control.PROF.glade:307 +#: control/control.SLD.glade:218 control/control.SLD.glade:308 +#: control/control.SLES.glade:329 control/control.SLES.glade:413 +#: control/control.glade:217 control/control.glade:307 +msgid "Disk Activation" +msgstr "" + +#: control/control.PROF.glade:223 control/control.PROF.glade:313 +#: control/control.SLD.glade:224 control/control.SLD.glade:314 +#: control/control.SLES.glade:335 control/control.SLES.glade:419 +#: control/control.glade:223 control/control.glade:313 +msgid "System Analysis" +msgstr "" + +#: control/control.PROF.glade:229 control/control.SLD.glade:230 +#: control/control.SLES.glade:341 control/control.glade:229 +msgid "Time Zone" +msgstr "" + +#: control/control.PROF.glade:238 control/control.SLD.glade:239 +#: control/control.glade:238 +msgid "Desktop Selection" +msgstr "" + +#: control/control.PROF.glade:245 control/control.SLD.glade:246 +#: control/control.SLES.glade:351 control/control.glade:245 +msgid "Installation" +msgstr "" + +#: control/control.PROF.glade:248 control/control.SLD.glade:249 +#: control/control.SLES.glade:354 control/control.glade:248 +msgid "Installation Summary" +msgstr "" + +#: control/control.PROF.glade:253 control/control.PROF.glade:259 +#: control/control.PROF.glade:263 control/control.PROF.glade:267 +#: control/control.PROF.glade:271 control/control.PROF.glade:396 +#: control/control.PROF.glade:402 control/control.PROF.glade:406 +#: control/control.PROF.glade:410 control/control.PROF.glade:436 +#: control/control.PROF.glade:442 control/control.PROF.glade:446 +#: control/control.PROF.glade:450 control/control.PROF.glade:525 +#: control/control.PROF.glade:529 control/control.PROF.glade:533 +#: control/control.PROF.glade:637 control/control.PROF.glade:641 +#: control/control.PROF.glade:645 control/control.PROF.glade:649 +#: control/control.PROF.glade:653 control/control.PROF.glade:668 +#: control/control.PROF.glade:672 control/control.PROF.glade:676 +#: control/control.PROF.glade:680 control/control.SLD.glade:254 +#: control/control.SLD.glade:260 control/control.SLD.glade:264 +#: control/control.SLD.glade:268 control/control.SLD.glade:272 +#: control/control.SLD.glade:397 control/control.SLD.glade:403 +#: control/control.SLD.glade:407 control/control.SLD.glade:411 +#: control/control.SLD.glade:437 control/control.SLD.glade:443 +#: control/control.SLD.glade:447 control/control.SLD.glade:451 +#: control/control.SLD.glade:526 control/control.SLD.glade:530 +#: control/control.SLD.glade:534 control/control.SLD.glade:638 +#: control/control.SLD.glade:642 control/control.SLD.glade:646 +#: control/control.SLD.glade:650 control/control.SLD.glade:654 +#: control/control.SLD.glade:669 control/control.SLD.glade:673 +#: control/control.SLD.glade:677 control/control.SLD.glade:681 +#: control/control.SLES.glade:359 control/control.SLES.glade:365 +#: control/control.SLES.glade:369 control/control.SLES.glade:373 +#: control/control.SLES.glade:377 control/control.SLES.glade:502 +#: control/control.SLES.glade:508 control/control.SLES.glade:512 +#: control/control.SLES.glade:516 control/control.SLES.glade:542 +#: control/control.SLES.glade:548 control/control.SLES.glade:552 +#: control/control.SLES.glade:556 control/control.SLES.glade:631 +#: control/control.SLES.glade:635 control/control.SLES.glade:639 +#: control/control.SLES.glade:748 control/control.SLES.glade:752 +#: control/control.SLES.glade:756 control/control.SLES.glade:760 +#: control/control.SLES.glade:764 control/control.SLES.glade:779 +#: control/control.SLES.glade:783 control/control.SLES.glade:787 +#: control/control.SLES.glade:791 control/control.glade:253 +#: control/control.glade:259 control/control.glade:263 +#: control/control.glade:267 control/control.glade:271 +#: control/control.glade:396 control/control.glade:402 +#: control/control.glade:406 control/control.glade:410 +#: control/control.glade:436 control/control.glade:442 +#: control/control.glade:446 control/control.glade:450 +#: control/control.glade:525 control/control.glade:529 +#: control/control.glade:533 control/control.glade:637 +#: control/control.glade:641 control/control.glade:645 +#: control/control.glade:649 control/control.glade:653 +#: control/control.glade:668 control/control.glade:672 +#: control/control.glade:676 control/control.glade:680 +msgid "Perform Installation" +msgstr "" + +#: control/control.PROF.glade:319 control/control.SLD.glade:320 +#: control/control.SLES.glade:425 control/control.glade:319 +msgid "System for Update" +msgstr "" + +#: control/control.PROF.glade:326 control/control.SLD.glade:327 +#: control/control.SLES.glade:432 control/control.glade:326 +msgid "Update" +msgstr "" + +#: control/control.PROF.glade:329 control/control.SLD.glade:330 +#: control/control.SLES.glade:435 control/control.glade:329 +msgid "Update Summary" +msgstr "" + +#: control/control.PROF.glade:334 control/control.PROF.glade:340 +#: control/control.PROF.glade:344 control/control.PROF.glade:348 +#: control/control.PROF.glade:352 control/control.PROF.glade:465 +#: control/control.PROF.glade:469 control/control.SLD.glade:335 +#: control/control.SLD.glade:341 control/control.SLD.glade:345 +#: control/control.SLD.glade:349 control/control.SLD.glade:353 +#: control/control.SLD.glade:466 control/control.SLD.glade:470 +#: control/control.SLES.glade:440 control/control.SLES.glade:446 +#: control/control.SLES.glade:450 control/control.SLES.glade:454 +#: control/control.SLES.glade:458 control/control.SLES.glade:571 +#: control/control.SLES.glade:575 control/control.glade:334 +#: control/control.glade:340 control/control.glade:344 +#: control/control.glade:348 control/control.glade:352 +#: control/control.glade:465 control/control.glade:469 +msgid "Perform Update" +msgstr "" + +#: control/control.PROF.glade:366 control/control.SLD.glade:367 +#: control/control.SLES.glade:472 control/control.glade:366 +msgid "System Information" +msgstr "" + +#: control/control.PROF.glade:370 control/control.SLD.glade:371 +#: control/control.SLES.glade:476 control/control.glade:370 +msgid "Perform Repair" +msgstr "" + +#: control/control.PROF.glade:380 control/control.PROF.glade:420 +#: control/control.PROF.glade:611 control/control.SLD.glade:381 +#: control/control.SLD.glade:421 control/control.SLD.glade:612 +#: control/control.SLES.glade:486 control/control.SLES.glade:526 +#: control/control.SLES.glade:722 control/control.glade:380 +#: control/control.glade:420 control/control.glade:611 +msgid "Base Installation" +msgstr "" + +#: control/control.PROF.glade:474 control/control.PROF.glade:540 +#: control/control.PROF.glade:685 control/control.SLD.glade:475 +#: control/control.SLD.glade:541 control/control.SLD.glade:686 +#: control/control.SLES.glade:580 control/control.SLES.glade:646 +#: control/control.SLES.glade:796 control/control.glade:474 +#: control/control.glade:540 control/control.glade:685 +msgid "Configuration" +msgstr "" + +#: control/control.PROF.glade:477 control/control.PROF.glade:483 +#: control/control.PROF.glade:552 control/control.PROF.glade:557 +#: control/control.PROF.glade:561 control/control.PROF.glade:565 +#: control/control.SLD.glade:478 control/control.SLD.glade:484 +#: control/control.SLD.glade:553 control/control.SLD.glade:558 +#: control/control.SLD.glade:562 control/control.SLD.glade:566 +#: control/control.SLES.glade:583 control/control.SLES.glade:589 +#: control/control.SLES.glade:658 control/control.SLES.glade:663 +#: control/control.SLES.glade:667 control/control.SLES.glade:671 +#: control/control.glade:477 control/control.glade:483 +#: control/control.glade:552 control/control.glade:557 +#: control/control.glade:561 control/control.glade:565 +msgid "Network" +msgstr "" + +#: control/control.PROF.glade:489 control/control.PROF.glade:495 +#: control/control.PROF.glade:569 control/control.PROF.glade:573 +#: control/control.SLD.glade:490 control/control.SLD.glade:496 +#: control/control.SLD.glade:570 control/control.SLD.glade:574 +#: control/control.SLES.glade:595 control/control.SLES.glade:601 +#: control/control.SLES.glade:675 control/control.SLES.glade:679 +#: control/control.glade:489 control/control.glade:495 +#: control/control.glade:569 control/control.glade:573 +msgid "Online Update" +msgstr "" + +#: control/control.PROF.glade:499 control/control.PROF.glade:585 +#: control/control.PROF.glade:692 control/control.SLD.glade:500 +#: control/control.SLD.glade:586 control/control.SLD.glade:693 +#: control/control.SLES.glade:605 control/control.SLES.glade:696 +#: control/control.SLES.glade:803 control/control.glade:499 +#: control/control.glade:585 control/control.glade:692 +msgid "Clean Up" +msgstr "" + +#: control/control.PROF.glade:503 control/control.PROF.glade:591 +#: control/control.SLD.glade:504 control/control.SLD.glade:592 +#: control/control.SLES.glade:609 control/control.SLES.glade:702 +#: control/control.glade:503 control/control.glade:591 +msgid "Release Notes" +msgstr "" + +#: control/control.PROF.glade:543 control/control.SLD.glade:544 +#: control/control.SLES.glade:649 control/control.glade:543 +msgid "Hostname" +msgstr "" + +#: control/control.PROF.glade:548 control/control.SLD.glade:549 +#: control/control.SLES.glade:654 control/control.glade:548 +msgid "Root Password" +msgstr "" + +#: control/control.PROF.glade:577 control/control.PROF.glade:581 +#: control/control.SLD.glade:578 control/control.SLD.glade:582 +#: control/control.SLES.glade:688 control/control.SLES.glade:692 +#: control/control.glade:577 control/control.glade:581 +msgid "Users" +msgstr "" + +#: control/control.PROF.glade:620 control/control.PROF.glade:626 +#: control/control.PROF.glade:630 control/control.SLD.glade:621 +#: control/control.SLD.glade:627 control/control.SLD.glade:631 +#: control/control.SLES.glade:731 control/control.SLES.glade:737 +#: control/control.SLES.glade:741 control/control.glade:620 +#: control/control.glade:626 control/control.glade:630 +msgid "AutoYaST Settings" +msgstr "" + +#: control/control.PROF.glade:688 control/control.SLD.glade:689 +#: control/control.SLES.glade:799 control/control.glade:688 +msgid "System Configuration" +msgstr "" + +#: control/control.SLES.glade:683 +msgid "Service" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.69/installation.pot new/yast2-installation-2.13.70/installation.pot --- old/yast2-installation-2.13.69/installation.pot 2006-03-28 23:07:57.000000000 +0200 +++ new/yast2-installation-2.13.70/installation.pot 2006-04-10 13:47:54.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 23:07+0200\n" +"POT-Creation-Date: 2006-04-10 13:47+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" @@ -81,59 +81,59 @@ #. Check box: start the clone process and store the autoyast #. profile in /root/autoinst.xml -#: src/clients/inst_congratulate.ycp:53 +#: src/clients/inst_congratulate.ycp:55 msgid "&Clone This System for Autoyast" msgstr "" #. caption for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.ycp:57 +#: src/clients/inst_congratulate.ycp:59 msgid "Installation Completed" msgstr "" #. congratulation text 1/4 -#: src/clients/inst_congratulate.ycp:60 +#: src/clients/inst_congratulate.ycp:62 msgid "Congratulations!" msgstr "" #. congratulation text 2/4 -#: src/clients/inst_congratulate.ycp:63 +#: src/clients/inst_congratulate.ycp:65 msgid "" "The installation of &product; on your machine is complete.\n" "After clicking Finish, you can log in to the system.\n" msgstr "" #. congratulation text 3/4 -#: src/clients/inst_congratulate.ycp:68 +#: src/clients/inst_congratulate.ycp:70 #, ycp-format msgid "Visit us at %1." msgstr "" #. congratulation text 4/4 -#: src/clients/inst_congratulate.ycp:71 +#: src/clients/inst_congratulate.ycp:73 msgid "Have a lot of fun! Your SUSE Development Team" msgstr "" #. help 1/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.ycp:90 +#: src/clients/inst_congratulate.ycp:92 msgid "Your system is ready for use." msgstr "" #. help 2/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.ycp:93 +#: src/clients/inst_congratulate.ycp:95 msgid "" "Finish will close the YaST installation and continue\n" "to the login screen.\n" msgstr "" #. help 3/4 for dialog "Congratulation Dialog" -#: src/clients/inst_congratulate.ycp:98 +#: src/clients/inst_congratulate.ycp:100 msgid "" "If you choose the default graphical desktop KDE, you can\n" "adjust some KDE settings to your hardware. Also notice\n" "our SUSE Welcome Dialog.\n" msgstr "" -#: src/clients/inst_congratulate.ycp:104 +#: src/clients/inst_congratulate.ycp:106 msgid "" "Use Clone if you want to create an AutoYaST profile.\n" "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" @@ -322,7 +322,7 @@ msgstr "" #. yes-no popup -#: src/clients/inst_license.ycp:148 src/modules/AddOnProduct.ycp:823 +#: src/clients/inst_license.ycp:148 src/modules/AddOnProduct.ycp:825 msgid "Reread or reconsider the license agreement?" msgstr "" @@ -332,7 +332,7 @@ msgstr "" #. message popup -#: src/clients/inst_license.ycp:179 src/modules/AddOnProduct.ycp:837 +#: src/clients/inst_license.ycp:179 src/modules/AddOnProduct.ycp:839 msgid "Accept or decline the license agreement." msgstr "" @@ -722,94 +722,95 @@ #. strings for main (wizard) layout #. Transltors: This is title/brand - only translate the Configuration -#: src/clients/inst_suse_register.ycp:54 +#: src/clients/inst_suse_register.ycp:63 msgid "Novell Customer Center Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:55 +#. following text is translated en->en in po file to "Configure Online Update" +#: src/clients/inst_suse_register.ycp:65 msgid "Update Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:61 +#: src/clients/inst_suse_register.ycp:71 msgid "" "Get technical support and product updates and\n" "manage subscriptions with Novell Customer Center." msgstr "" -#: src/clients/inst_suse_register.ycp:67 +#: src/clients/inst_suse_register.ycp:77 msgid "Configure Now (Recommended)" msgstr "" -#: src/clients/inst_suse_register.ycp:68 +#: src/clients/inst_suse_register.ycp:78 msgid "Configure Later" msgstr "" -#: src/clients/inst_suse_register.ycp:70 +#: src/clients/inst_suse_register.ycp:80 msgid "Include for Convenience" msgstr "" #. Translators: Text for UI Label - capitalized -#: src/clients/inst_suse_register.ycp:71 +#: src/clients/inst_suse_register.ycp:81 #: src/clients/suse_register_auto.ycp:198 msgid "Hardware Profile" msgstr "" #. Translators: Text for UI Label - capitalized -#: src/clients/inst_suse_register.ycp:72 +#: src/clients/inst_suse_register.ycp:82 #: src/clients/suse_register_auto.ycp:200 msgid "Optional Information" msgstr "" -#: src/clients/inst_suse_register.ycp:73 +#: src/clients/inst_suse_register.ycp:83 msgid "Registration Code" msgstr "" -#: src/clients/inst_suse_register.ycp:74 -#: src/clients/inst_suse_register.ycp:164 +#: src/clients/inst_suse_register.ycp:84 +#: src/clients/inst_suse_register.ycp:174 msgid "Details..." msgstr "" #. strings for success popup -#: src/clients/inst_suse_register.ycp:78 +#: src/clients/inst_suse_register.ycp:88 msgid "Your configuration was successful." msgstr "" #. strings for manual interaction popup -#: src/clients/inst_suse_register.ycp:82 +#: src/clients/inst_suse_register.ycp:92 msgid "Manual Interaction Required" msgstr "" -#: src/clients/inst_suse_register.ycp:83 +#: src/clients/inst_suse_register.ycp:93 msgid "Needed Information" msgstr "" -#: src/clients/inst_suse_register.ycp:84 +#: src/clients/inst_suse_register.ycp:94 msgid "Continue" msgstr "" -#: src/clients/inst_suse_register.ycp:86 +#: src/clients/inst_suse_register.ycp:96 msgid "" "A Web browser will start in which to complete\n" "the configuration on the opened Web site." msgstr "" #. string for show information popup -#: src/clients/inst_suse_register.ycp:92 +#: src/clients/inst_suse_register.ycp:102 msgid "Registration and Privacy Information" msgstr "" -#: src/clients/inst_suse_register.ycp:96 +#: src/clients/inst_suse_register.ycp:106 msgid "" "The server requires additional system information. Activating \n" "submission of the hardware profile automatically." msgstr "" #. nonroot-message strings -#: src/clients/inst_suse_register.ycp:101 +#: src/clients/inst_suse_register.ycp:111 msgid "Update Source Issues" msgstr "" -#: src/clients/inst_suse_register.ycp:103 +#: src/clients/inst_suse_register.ycp:113 msgid "" "Registering as a regular user does not include the update source\n" "in the Online Update YaST module. If you continue and later want \n" @@ -820,15 +821,15 @@ msgstr "" #. error messages -#: src/clients/inst_suse_register.ycp:114 +#: src/clients/inst_suse_register.ycp:124 msgid "Error: Recieved data is invalid." msgstr "" -#: src/clients/inst_suse_register.ycp:115 +#: src/clients/inst_suse_register.ycp:125 msgid "Error: Could not retrieve data." msgstr "" -#: src/clients/inst_suse_register.ycp:121 +#: src/clients/inst_suse_register.ycp:131 msgid "" "\n" "Configure your system to enable online updates by registering it with Novell.\n" @@ -837,7 +838,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:129 +#: src/clients/inst_suse_register.ycp:139 msgid "" "\n" "To simplify the registration process, include information from your system\n" @@ -849,7 +850,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:140 +#: src/clients/inst_suse_register.ycp:150 msgid "" "\n" "If you purchased your copy of this product, enable Registration Code\n" @@ -858,7 +859,7 @@ "" msgstr "" -#: src/clients/inst_suse_register.ycp:148 +#: src/clients/inst_suse_register.ycp:158 msgid "" "\n" "No information is passed to anyone outside Novell. The data is used for\n" @@ -869,23 +870,23 @@ msgstr "" #. further strings -#: src/clients/inst_suse_register.ycp:161 +#: src/clients/inst_suse_register.ycp:171 msgid "Checking..." msgstr "" -#: src/clients/inst_suse_register.ycp:162 +#: src/clients/inst_suse_register.ycp:172 msgid "Error" msgstr "" -#: src/clients/inst_suse_register.ycp:163 +#: src/clients/inst_suse_register.ycp:173 msgid "An error occurred while connecting to the server." msgstr "" -#: src/clients/inst_suse_register.ycp:165 +#: src/clients/inst_suse_register.ycp:175 msgid "Error Message" msgstr "" -#: src/clients/inst_suse_register.ycp:166 +#: src/clients/inst_suse_register.ycp:176 msgid "Starting Browser..." msgstr "" @@ -1056,7 +1057,7 @@ #. } #. dialog caption -#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:915 +#: src/clients/installation.ycp:140 src/modules/AddOnProduct.ycp:917 msgid "Initializing..." msgstr "" @@ -1367,63 +1368,89 @@ msgid "Writing YaST Configuration..." msgstr "" +#. Scanning network for SLP servers +#. translators: popup busy message +#: src/include/add-on-workflow.ycp:65 +msgid "Scanning network..." +msgstr "" + +#. error popup +#: src/include/add-on-workflow.ycp:74 +msgid "No SLP catalogs found." +msgstr "" + +#. translators: popup heading +#: src/include/add-on-workflow.ycp:91 +msgid "Choose SLP Catalog" +msgstr "" + +#. table header +#: src/include/add-on-workflow.ycp:96 +msgid "Type" +msgstr "" + +#. table header +#: src/include/add-on-workflow.ycp:98 +msgid "URL" +msgstr "" + #. radio button -#: src/include/add-on-workflow.ycp:61 +#: src/include/add-on-workflow.ycp:144 msgid "&Scan Using SLP..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:63 +#: src/include/add-on-workflow.ycp:146 msgid "&FTP..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:65 +#: src/include/add-on-workflow.ycp:148 msgid "&HTTP..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:67 +#: src/include/add-on-workflow.ycp:150 msgid "HTT&PS..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:69 +#: src/include/add-on-workflow.ycp:152 msgid "&SMB/CIFS" msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:71 +#: src/include/add-on-workflow.ycp:154 msgid "&NFS..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:73 src/include/add-on-workflow.ycp:95 +#: src/include/add-on-workflow.ycp:156 src/include/add-on-workflow.ycp:178 msgid "&CD..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:75 src/include/add-on-workflow.ycp:97 +#: src/include/add-on-workflow.ycp:158 src/include/add-on-workflow.ycp:180 msgid "&DVD..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:77 src/include/add-on-workflow.ycp:99 +#: src/include/add-on-workflow.ycp:160 src/include/add-on-workflow.ycp:182 msgid "&Local Directory..." msgstr "" #. radio button -#: src/include/add-on-workflow.ycp:79 +#: src/include/add-on-workflow.ycp:162 msgid "Specify &URL..." msgstr "" #. dialog caption -#: src/include/add-on-workflow.ycp:106 +#: src/include/add-on-workflow.ycp:189 msgid "Add-On Product Media" msgstr "" #. help -#: src/include/add-on-workflow.ycp:108 +#: src/include/add-on-workflow.ycp:191 msgid "" "<big>Catalog Media</big> \n" "Add-on products can be installed from CD, over a\n" @@ -1431,7 +1458,7 @@ msgstr "" #. help, continued -#: src/include/add-on-workflow.ycp:114 +#: src/include/add-on-workflow.ycp:197 msgid "" "\n" "To install add-on product from CD,\n" @@ -1439,7 +1466,7 @@ msgstr "" #. help, continued -#: src/include/add-on-workflow.ycp:119 +#: src/include/add-on-workflow.ycp:202 msgid "" "\n" "The product CDs can be copied to the hard disk.\n" @@ -1450,7 +1477,7 @@ msgstr "" #. help, continued -#: src/include/add-on-workflow.ycp:128 +#: src/include/add-on-workflow.ycp:211 msgid "" "\n" "Network installation requires a working network connection.\n" @@ -1460,51 +1487,26 @@ #. yes-no popup #. popup question -#: src/include/add-on-workflow.ycp:154 src/include/add-on-workflow.ycp:375 -#: src/include/add-on-workflow.ycp:512 src/modules/AddOnProduct.ycp:813 +#: src/include/add-on-workflow.ycp:245 src/include/add-on-workflow.ycp:423 +#: src/include/add-on-workflow.ycp:626 src/modules/AddOnProduct.ycp:815 msgid "Really abort add-on product installation?" msgstr "" -#. translators: popup busy message -#: src/include/add-on-workflow.ycp:165 -msgid "Scanning network..." -msgstr "" - -#. error popup -#: src/include/add-on-workflow.ycp:171 -msgid "No SLP catalogs found." -msgstr "" - -#. translators: popup heading -#: src/include/add-on-workflow.ycp:185 -msgid "Choose SLP Catalog" -msgstr "" - -#. table header -#: src/include/add-on-workflow.ycp:190 -msgid "Type" -msgstr "" - -#. table header -#: src/include/add-on-workflow.ycp:192 -msgid "URL" -msgstr "" - -#: src/include/add-on-workflow.ycp:245 +#: src/include/add-on-workflow.ycp:287 msgid "Insert the add-on product CD" msgstr "" -#: src/include/add-on-workflow.ycp:253 +#: src/include/add-on-workflow.ycp:295 msgid "Insert the add-on product DVD" msgstr "" #. error report -#: src/include/add-on-workflow.ycp:294 +#: src/include/add-on-workflow.ycp:338 msgid "No catalog found on medium." msgstr "" #. error report -#: src/include/add-on-workflow.ycp:315 src/include/add-on-workflow.ycp:416 +#: src/include/add-on-workflow.ycp:362 src/include/add-on-workflow.ycp:470 msgid "Failed to initialize the catalog." msgstr "" @@ -1512,24 +1514,24 @@ #. place holder for unknown URL #. placeholder for unknown path #. placeholder for unknown URL -#: src/include/add-on-workflow.ycp:337 src/include/add-on-workflow.ycp:342 -#: src/include/add-on-workflow.ycp:596 src/include/add-on-workflow.ycp:602 +#: src/include/add-on-workflow.ycp:385 src/include/add-on-workflow.ycp:390 +#: src/include/add-on-workflow.ycp:740 src/include/add-on-workflow.ycp:746 msgid "Unknown" msgstr "" #. table cell, %1 is URL, %2 is directory name -#: src/include/add-on-workflow.ycp:340 src/include/add-on-workflow.ycp:600 +#: src/include/add-on-workflow.ycp:388 src/include/add-on-workflow.ycp:744 #, ycp-format msgid "URL: %1, Directory: %2" msgstr "" #. dialog caption -#: src/include/add-on-workflow.ycp:346 +#: src/include/add-on-workflow.ycp:394 msgid "Catalog Selection" msgstr "" #. help text -#: src/include/add-on-workflow.ycp:348 +#: src/include/add-on-workflow.ycp:396 msgid "" "<big>Catalog Selection</big> \n" "There were multiple catalogs found on the selected medium.\n" @@ -1537,32 +1539,39 @@ msgstr "" #. popup message -#: src/include/add-on-workflow.ycp:391 +#: src/include/add-on-workflow.ycp:439 msgid "Select a catalog." msgstr "" #. table cell -#: src/include/add-on-workflow.ycp:450 +#: src/include/add-on-workflow.ycp:510 msgid "No product found in the catalog" msgstr "" #. message popup -#: src/include/add-on-workflow.ycp:465 +#: src/include/add-on-workflow.ycp:537 +msgid "" +"The product on the media is already installed\n" +"or selected for installation." +msgstr "" + +#. message popup +#: src/include/add-on-workflow.ycp:560 msgid "Dependencies of the add-on product cannot be fullfilled." msgstr "" #. dialog caption -#: src/include/add-on-workflow.ycp:485 +#: src/include/add-on-workflow.ycp:599 msgid "Product Selection" msgstr "" #. multi selection list -#: src/include/add-on-workflow.ycp:489 +#: src/include/add-on-workflow.ycp:603 msgid "Available Products" msgstr "" #. help text -#: src/include/add-on-workflow.ycp:493 +#: src/include/add-on-workflow.ycp:607 msgid "" "<big>Product Selection</big> \n" "There were multiple products found in the catalog. Select the products\n" @@ -1570,44 +1579,44 @@ msgstr "" #. message popup -#: src/include/add-on-workflow.ycp:529 +#: src/include/add-on-workflow.ycp:668 msgid "Dependencies of the selected add-on products cannot be fullfilled." msgstr "" #. main screen heading -#: src/include/add-on-workflow.ycp:589 +#: src/include/add-on-workflow.ycp:733 msgid "Add-On Product Installation" msgstr "" -#: src/include/add-on-workflow.ycp:605 +#: src/include/add-on-workflow.ycp:749 #, ycp-format msgid "Product %1" msgstr "" #. table header -#: src/include/add-on-workflow.ycp:610 +#: src/include/add-on-workflow.ycp:754 msgid "Media" msgstr "" #. table header -#: src/include/add-on-workflow.ycp:612 +#: src/include/add-on-workflow.ycp:756 msgid "Product" msgstr "" #. message report -#: src/include/add-on-workflow.ycp:641 +#: src/include/add-on-workflow.ycp:785 msgid "Select a product to delete." msgstr "" #. popup error #. error report -#: src/modules/AddOnProduct.ycp:767 src/modules/AddOnProduct.ycp:788 -#: src/modules/AddOnProduct.ycp:892 +#: src/modules/AddOnProduct.ycp:769 src/modules/AddOnProduct.ycp:790 +#: src/modules/AddOnProduct.ycp:894 msgid "An error occurred while preparing the installation system." msgstr "" #. error report -#: src/modules/AddOnProduct.ycp:907 +#: src/modules/AddOnProduct.ycp:909 #, ycp-format msgid "Control file %1 not found on media." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.69/src/clients/release_notes_popup.ycp new/yast2-installation-2.13.70/src/clients/release_notes_popup.ycp --- old/yast2-installation-2.13.69/src/clients/release_notes_popup.ycp 2006-03-15 16:33:55.000000000 +0100 +++ new/yast2-installation-2.13.70/src/clients/release_notes_popup.ycp 2006-04-13 10:39:49.000000000 +0200 @@ -6,7 +6,7 @@ * * Display release notes. * - * $Id: release_notes_popup.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: release_notes_popup.ycp 30094 2006-04-13 08:39:41Z mvidner $ */ { @@ -33,12 +33,12 @@ y2debug ("Path template: %1", path_templ); string tmp = sformat (path_templ, Language::language); y2debug ("Trying to get %1", tmp); - tmp = Pkg::SourceProvideFile (source_id, 1, tmp); + tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); if (tmp == nil) { tmp = sformat (path_templ, substring (Language::language, 0, 2)); y2debug ("Trying to get %1", tmp); - tmp = Pkg::SourceProvideFile (source_id, 1, tmp); + tmp = Pkg::SourceProvideOptionalFile (source_id, 1, tmp); } if (tmp == nil) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kernel-docs
by root＠suse.de 13 Apr '06

13 Apr '06

Hello community, here is the log from the commit of package kernel-docs checked in at Thu Apr 13 17:27:02 CEST 2006. -------- --- kernel-docs/kernel-docs.changes 2006-04-11 00:34:34.000000000 +0200 +++ NOARCH/kernel-docs/kernel-docs.changes 2006-04-13 17:21:45.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 13 17:21:11 CEST 2006 - ro(a)suse.de + +- no need for zcat foo > directory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.tMQAm6/_old 2006-04-13 17:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.tMQAm6/_new 2006-04-13 17:26:46.000000000 +0200 @@ -17,7 +17,7 @@ Group: Documentation/Man Autoreqprov: on Version: 2.6.3 -Release: 36 +Release: 37 Summary: Kernel Documentation Source1: texmf.cnf BuildArchitectures: noarch @@ -48,7 +48,7 @@ find Documentation/DocBook/ -name '*.9.gz' | egrep -v '^(sis[69]|rio|RIO|mpc85|set_rx_mode|mdio_(read|write)|mii_ioctl|mca_|z8530|nand|sppp|piix|(read|write)_zs)' | while read i ; do - zcat $i > $RPM_BUILD_ROOT/%{_mandir}/man9 + cp $i $RPM_BUILD_ROOT/%{_mandir}/man9 done install -d $RPM_BUILD_ROOT/usr/share/doc/kernel cp -a Documentation/DocBook/*.pdf $RPM_BUILD_ROOT/usr/share/doc/kernel || true @@ -72,6 +72,8 @@ /usr/share/doc/kernel %changelog -n kernel-docs +* Thu Apr 13 2006 - ro(a)suse.de +- no need for zcat foo > directory * Tue Apr 11 2006 - agruen(a)suse.de - `make mandocs' now generates *.9.gz instead of *.9 (163070). - Don't ignore errors, or we won't notice when something breaks. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0