openSUSE Commits
Threads by month
- ----- 2024 -----
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2006
- 2 participants
- 169 discussions
Hello community,
here is the log from the commit of package OpenOffice_org
checked in at Fri Mar 31 15:54:54 CEST 2006.
--------
--- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-03-27 18:04:28.000000000 +0200
+++ OpenOffice_org/OpenOffice_org.changes 2006-03-31 14:28:08.000000000 +0200
@@ -1,0 +2,15 @@
+Fri Mar 31 14:22:43 CEST 2006 - pmladek(a)suse.cz
+
+- updated ooo-build to version 2.0.2.4:
+ * import of VBA stream hangup
+ * lots new constants for VBA excel
+ * lots fixes in Atk bridge
+ * i18n support within pasting to Calc
+ * bin the obsolete LD_PRELOAD of libgcj [#153386]
+- added some NLD9 specific fixes (affects only build on NLD9):
+ * marked the compat desktop files GNOME only
+ * substituted the bin suffix in the compat desktop files
+ * enabled openclipart
+ * packaged missing directories
+
+-------------------------------------------------------------------
Old:
----
minmem
ooo-build-2.0.2.3.tar.gz
New:
----
ooo-build-2.0.2.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenOffice_org.spec ++++++
--- /var/tmp/diff_new_pack.wsRk85/_old 2006-03-31 15:53:53.000000000 +0200
+++ /var/tmp/diff_new_pack.wsRk85/_new 2006-03-31 15:53:53.000000000 +0200
@@ -54,12 +54,12 @@
%define ooo_prefix /usr/lib
%define ooo_home ooo-2.0
%define ooo_build_dir build
-%define ooo_build_version 2.0.2.3
+%define ooo_build_version 2.0.2.4
%define ooo_build_tag OOO_2_0_2
License: LGPL, BSD
Group: Productivity/Office/Suite
Version: 2.0.2
-Release: 11
+Release: 12
Autoreqprov: on
PreReq: coreutils /usr/bin/update-mime-database
Prereq: %suseconfig_fonts_prereq
@@ -1081,7 +1081,7 @@
%if %suse_version > 1000
--with-openclipart=/usr/share/clipart/openclipart \
%endif
-%if %suse_version == 1000 || %sles_version == 8
+%if %suse_version == 1000 || %sles_version == 9
--with-openclipart=/usr/share/openclipart \
%endif
%endif
@@ -1157,6 +1157,12 @@
install -m 755 -d $RPM_BUILD_ROOT/opt/gnome/share/applications
tar -xjf %{S:30} -C $RPM_BUILD_ROOT/opt/gnome/share/applications
chmod 644 $RPM_BUILD_ROOT/opt/gnome/share/applications/*
+#
+bin_suffix=%ooo_bin_suffix
+bin_suffix=${bin_suffix/no/}
+for desktop in $RPM_BUILD_ROOT/opt/gnome/share/applications/* ; do
+ perl -pi -e "s|\@BINSUFFIX\@|$bin_suffix|" $desktop
+done
# install extra GNOME mime type icons
for dir in %ooo_prefix/%ooo_home/share/gnome/icons/48x48/mimetypes \
/opt/gnome/share/icons/gnome/48x48/mimetypes ; do
@@ -1598,6 +1604,10 @@
/usr/sbin/*
/usr/share/man/man1/*
/usr/share/applications/*.desktop
+%if %suse_version < 930
+%dir /usr/share/mime
+%dir /usr/share/mime/packages
+%endif
/usr/share/mime/packages/*
/usr/share/pixmaps/*
# extra old GNOME MIME info and application registry (especially necessary on NLD9)
@@ -1846,6 +1856,18 @@
%endif
%changelog -n OpenOffice_org
+* Fri Mar 31 2006 - pmladek(a)suse.cz
+- updated ooo-build to version 2.0.2.4:
+ * import of VBA stream hangup
+ * lots new constants for VBA excel
+ * lots fixes in Atk bridge
+ * i18n support within pasting to Calc
+ * bin the obsolete LD_PRELOAD of libgcj [#153386]
+- added some NLD9 specific fixes (affects only build on NLD9):
+ * marked the compat desktop files GNOME only
+ * substituted the bin suffix in the compat desktop files
+ * enabled openclipart
+ * packaged missing directories
* Mon Mar 27 2006 - pmladek(a)suse.cz
- updated ooo-build to version 2.0.2.3:
* preload libgcj when gcj/gij JRE is selected [#153386]
++++++ nld9_gnome_desktop_files.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/database.desktop new/database.desktop
--- old/database.desktop 2006-01-11 21:26:42.000000000 +0100
+++ new/database.desktop 2006-03-28 13:32:51.000000000 +0200
@@ -65,4 +65,4 @@
Categories=GNOME;Application;Office;Finance;X-Ximian-Main;
StartupNotify=true
MimeType=application/vnd.oasis.opendocument.database
-
+OnlyShowIn=GNOME;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/drawing.desktop new/drawing.desktop
--- old/drawing.desktop 2006-01-11 21:26:42.000000000 +0100
+++ new/drawing.desktop 2006-03-28 13:33:15.000000000 +0200
@@ -115,3 +115,4 @@
Categories=GNOME;Application;Office;X-Ximian-Main;
StartupNotify=true
MimeType=application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;
+OnlyShowIn=GNOME;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/formula.desktop new/formula.desktop
--- old/formula.desktop 2006-01-11 21:26:42.000000000 +0100
+++ new/formula.desktop 2006-03-28 13:33:19.000000000 +0200
@@ -59,3 +59,4 @@
Categories=GNOME;Application;Office;X-Ximian-Main;
StartupNotify=true
MimeType=application/vnd.oasis.opendocument.formula
+OnlyShowIn=GNOME;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/presentation.desktop new/presentation.desktop
--- old/presentation.desktop 2006-01-11 21:26:42.000000000 +0100
+++ new/presentation.desktop 2006-03-28 13:33:25.000000000 +0200
@@ -117,3 +117,4 @@
Categories=GNOME;Application;Office;X-Ximian-Main;
StartupNotify=true
MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress;application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;
+OnlyShowIn=GNOME;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/spreadsheet.desktop new/spreadsheet.desktop
--- old/spreadsheet.desktop 2006-01-11 21:26:42.000000000 +0100
+++ new/spreadsheet.desktop 2006-03-28 13:33:30.000000000 +0200
@@ -117,4 +117,4 @@
Categories=GNOME;Application;Office;Finance;X-Ximian-Main;
StartupNotify=true
MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.math;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.math;application/vnd.lotus-1-2-3;text/x-comma-separated-values;application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;
-
+OnlyShowIn=GNOME;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/textdoc.desktop new/textdoc.desktop
--- old/textdoc.desktop 2006-01-11 21:26:42.000000000 +0100
+++ new/textdoc.desktop 2006-03-28 13:33:38.000000000 +0200
@@ -116,3 +116,4 @@
Categories=GNOME;Application;Office;X-Ximian-Main;
StartupNotify=true
MimeType=application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.ms-word;application/x-mswrite;application/vnd.stardivision.writer;application/vnd.wordperfect;application/wordperfect;application/rtf;text/rtf;text/plain;application/vnd.oasis.opendocument.text;vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-template;
+OnlyShowIn=GNOME;
++++++ ooo-build-2.0.2.3.tar.gz -> ooo-build-2.0.2.4.tar.gz ++++++
++++ 19312 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-update
checked in at Fri Mar 31 15:54:23 CEST 2006.
--------
--- yast2-update/yast2-update.changes 2006-03-27 17:18:08.000000000 +0200
+++ yast2-update/yast2-update.changes 2006-03-30 14:26:28.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 30 14:26:21 CEST 2006 - mvidner(a)suse.cz
+
+- Don't run the module if another process has the zypp lock (#160319).
+- 2.13.12
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.13.11.tar.bz2
New:
----
yast2-update-2.13.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.EInTZA/_old 2006-03-31 15:54:11.000000000 +0200
+++ /var/tmp/diff_new_pack.EInTZA/_new 2006-03-31 15:54:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.13.11)
+# spec file for package yast2-update (Version 2.13.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.13.11
+Version: 2.13.12
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.13.11.tar.bz2
+Source0: yast2-update-2.13.12.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
Requires: yast2 yast2-installation yast2-storage yast2-packager
@@ -39,7 +39,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-update-2.13.11
+%setup -n yast2-update-2.13.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Thu Mar 30 2006 - mvidner(a)suse.cz
+- Don't run the module if another process has the zypp lock (#160319).
+- 2.13.12
* Mon Mar 27 2006 - jsrain(a)suse.de
- set correctlty swap partition info during update (#133993)
- 2.13.11
++++++ yast2-update-2.13.11.tar.bz2 -> yast2-update-2.13.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.11/VERSION new/yast2-update-2.13.12/VERSION
--- old/yast2-update-2.13.11/VERSION 2006-03-27 17:00:57.000000000 +0200
+++ new/yast2-update-2.13.12/VERSION 2006-03-30 14:25:02.000000000 +0200
@@ -1 +1 @@
-2.13.11
+2.13.12
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.11/configure new/yast2-update-2.13.12/configure
--- old/yast2-update-2.13.11/configure 2006-03-27 17:17:55.000000000 +0200
+++ new/yast2-update-2.13.12/configure 2006-03-30 14:26:56.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-update 2.13.11.
+# Generated by GNU Autoconf 2.59 for yast2-update 2.13.12.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.13.11'
-PACKAGE_STRING='yast2-update 2.13.11'
+PACKAGE_VERSION='2.13.12'
+PACKAGE_STRING='yast2-update 2.13.12'
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-update 2.13.11 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.13.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.13.11:";;
+ short | recursive ) echo "Configuration of yast2-update 2.13.12:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.13.11
+yast2-update configure 2.13.12
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-update $as_me 2.13.11, which was
+It was created by yast2-update $as_me 2.13.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.13.11'
+ VERSION='2.13.12'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.11"
+VERSION="2.13.12"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-update $as_me 2.13.11, which was
+This file was extended by yast2-update $as_me 2.13.12, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.13.11
+yast2-update config.status 2.13.12
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.11/configure.in new/yast2-update-2.13.12/configure.in
--- old/yast2-update-2.13.11/configure.in 2006-03-27 17:17:51.000000000 +0200
+++ new/yast2-update-2.13.12/configure.in 2006-03-30 14:26:47.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-update
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-update, 2.13.11, http://www.suse.de/feedback, yast2-update)
+AC_INIT(yast2-update, 2.13.12, http://www.suse.de/feedback, yast2-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.11"
+VERSION="2.13.12"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.11/src/clients/update.ycp new/yast2-update-2.13.12/src/clients/update.ycp
--- old/yast2-update-2.13.11/src/clients/update.ycp 2006-02-02 19:55:47.000000000 +0100
+++ new/yast2-update-2.13.12/src/clients/update.ycp 2006-03-30 14:26:35.000000000 +0200
@@ -5,12 +5,18 @@
* Authors: Klaus Kaempf <kkaempf(a)suse.de>
* Arvin Schnell <arvin(a)suse.de>
*
- * $Id: update.ycp 22822 2005-03-29 08:48:11Z jsrain $
+ * $Id: update.ycp 29558 2006-03-30 12:26:29Z mvidner $
*/
{
textdomain "update";
+ // somewhere, DirInstall is imported that wants Pkg in the constructor
+ import "PackageLock";
+ // check whether having the packager for ourselves
+ if (! PackageLock::Check ())
+ return `abort;
+
import "Mode";
import "Update";
import "Wizard";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-printer
checked in at Fri Mar 31 15:54:20 CEST 2006.
--------
--- yast2-printer/yast2-printer.changes 2006-03-27 10:01:14.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2006-03-30 11:50:19.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Mar 30 11:48:45 CEST 2006 - mzugec(a)suse.cz
+
+- fixed #161050 - new queue for existing printer
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.13.5.tar.bz2
New:
----
yast2-printer-2.13.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.YDyWQw/_old 2006-03-31 15:54:03.000000000 +0200
+++ /var/tmp/diff_new_pack.YDyWQw/_new 2006-03-31 15:54:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.13.5)
+# spec file for package yast2-printer (Version 2.13.6)
#
# 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-printer
-Version: 2.13.5
+Version: 2.13.6
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.13.5.tar.bz2
+Source0: yast2-printer-2.13.6.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 netcat zlib blocxx
@@ -33,7 +33,7 @@
%prep
-%setup -n yast2-printer-2.13.5
+%setup -n yast2-printer-2.13.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +99,8 @@
%doc %{prefix}/share/doc/packages/yast2-printer
%changelog -n yast2-printer
+* Thu Mar 30 2006 - mzugec(a)suse.cz
+- fixed #161050 - new queue for existing printer
* Wed Mar 15 2006 - mzugec(a)suse.cz
- fixed #157872 - model and ppd information
* Tue Mar 14 2006 - schwab(a)suse.de
++++++ yast2-printer-2.13.5.tar.bz2 -> yast2-printer-2.13.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.5/VERSION new/yast2-printer-2.13.6/VERSION
--- old/yast2-printer-2.13.5/VERSION 2006-03-21 08:58:57.000000000 +0100
+++ new/yast2-printer-2.13.6/VERSION 2006-03-30 11:48:40.000000000 +0200
@@ -1 +1 @@
-2.13.5
+2.13.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.5/src/common/dialogs-connection.ycp new/yast2-printer-2.13.6/src/common/dialogs-connection.ycp
--- old/yast2-printer-2.13.5/src/common/dialogs-connection.ycp 2006-03-21 08:59:06.000000000 +0100
+++ new/yast2-printer-2.13.6/src/common/dialogs-connection.ycp 2006-03-30 11:49:28.000000000 +0200
@@ -9,7 +9,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: dialogs-connection.ycp 28798 2006-03-10 07:26:26Z mzugec $
+ * $Id: dialogs-connection.ycp 29553 2006-03-30 09:49:24Z mzugec $
*
*/
{
@@ -288,6 +288,15 @@
`Left(`RadioButton(`id(`add_remote), _("Network Printers")))
)
);
+if (size(Printer::printcap) ==0) items = `VBox(
+ `VBox(
+ `Left(`RadioButton(`id(`add_local),
+ _("Directly Connected Printers"), true)),
+ `Left(`RadioButton(`id(`add_remote), _("Network Printers")))
+ )
+ );
+
+
symbol ret = runGenericConnectionTypeDialog (items, _("Printer Type"),
// frame label
_("Printer Type"),
@@ -330,7 +339,7 @@
)
));
}
- Wizard::SetContentsButtons (_("New Queue for Existing Printer"), contents, _("TODO help"),
+ Wizard::SetContentsButtons (_("New Queue for Existing Printer"), contents, /*_("TODO help")*/"",
Label::BackButton (), Label::NextButton ());
Wizard::RestoreBackButton ();
Wizard::RestoreAbortButton ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Fri Mar 31 15:54:03 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-03-28 10:05:00.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-03-29 15:47:34.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Mar 29 15:47:19 CEST 2006 - mvidner(a)suse.cz
+
+- Find zypp using pkg-config (enables prefix builds).
+- 2.13.43
+
+-------------------------------------------------------------------
+Tue Mar 28 16:06:07 CEST 2006 - lslezak(a)suse.cz
+
+- new binding Pkg::ResolvableSetSoftLock() (#159466)
+- initialize zypp when it's needed, retry initialization when
+ it fails, new binding Pkg::Connect() (#160319)
+- call DoneProvide callback when resolvable download
+ fails (#160966)
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.42.tar.bz2
New:
----
yast2-pkg-bindings-2.13.43.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.z09pYy/_old 2006-03-31 15:53:49.000000000 +0200
+++ /var/tmp/diff_new_pack.z09pYy/_new 2006-03-31 15:53:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.42)
+# spec file for package yast2-pkg-bindings (Version 2.13.43)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.13.42
+Version: 2.13.43
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.42.tar.bz2
+Source0: yast2-pkg-bindings-2.13.43.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-pkg-bindings-2.13.42
+%setup -n yast2-pkg-bindings-2.13.43
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,15 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Wed Mar 29 2006 - mvidner(a)suse.cz
+- Find zypp using pkg-config (enables prefix builds).
+- 2.13.43
+* Tue Mar 28 2006 - lslezak(a)suse.cz
+- new binding Pkg::ResolvableSetSoftLock() (#159466)
+- initialize zypp when it's needed, retry initialization when
+ it fails, new binding Pkg::Connect() (#160319)
+- call DoneProvide callback when resolvable download
+ fails (#160966)
* Tue Mar 28 2006 - visnov(a)suse.cz
- fix compile
- catch media exception if source cannot be reattached
++++++ yast2-pkg-bindings-2.13.42.tar.bz2 -> yast2-pkg-bindings-2.13.43.tar.bz2 ++++++
++++ 23666 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-packager
checked in at Fri Mar 31 15:53:53 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-03-29 12:21:45.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-03-30 10:51:47.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Mar 30 10:51:45 CEST 2006 - mvidner(a)suse.cz
+
+- Don't run the modules if another process has the zypp lock (#160319).
+- 2.13.56
+
+-------------------------------------------------------------------
+Wed Mar 29 18:46:59 CEST 2006 - locilka(a)suse.cz
+
+- Enhanced texts in SignatureCheckDialogs module
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.55.tar.bz2
New:
----
yast2-packager-2.13.56.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.oKtDoy/_old 2006-03-31 15:53:43.000000000 +0200
+++ /var/tmp/diff_new_pack.oKtDoy/_new 2006-03-31 15:53:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.55)
+# spec file for package yast2-packager (Version 2.13.56)
#
# 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-packager
-Version: 2.13.55
+Version: 2.13.56
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.55.tar.bz2
+Source0: yast2-packager-2.13.56.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.13.55
+%setup -n yast2-packager-2.13.56
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,11 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Thu Mar 30 2006 - mvidner(a)suse.cz
+- Don't run the modules if another process has the zypp lock (#160319).
+- 2.13.56
+* Wed Mar 29 2006 - locilka(a)suse.cz
+- Enhanced texts in SignatureCheckDialogs module
* Wed Mar 29 2006 - locilka(a)suse.cz
- Merged proofread texts for SignatureCheckDialogs
- Adjusted dialogs for SignatureCheckDialogs to show informative
++++++ yast2-packager-2.13.55.tar.bz2 -> yast2-packager-2.13.56.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/VERSION new/yast2-packager-2.13.56/VERSION
--- old/yast2-packager-2.13.55/VERSION 2006-03-29 12:21:19.000000000 +0200
+++ new/yast2-packager-2.13.56/VERSION 2006-03-30 10:50:25.000000000 +0200
@@ -1 +1 @@
-2.13.55
+2.13.56
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/configure new/yast2-packager-2.13.56/configure
--- old/yast2-packager-2.13.55/configure 2006-03-29 14:10:19.000000000 +0200
+++ new/yast2-packager-2.13.56/configure 2006-03-30 11:09:25.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-packager 2.13.55.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.56.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.55'
-PACKAGE_STRING='yast2-packager 2.13.55'
+PACKAGE_VERSION='2.13.56'
+PACKAGE_STRING='yast2-packager 2.13.56'
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-packager 2.13.55 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.56 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-packager 2.13.55:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.56:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.55
+yast2-packager configure 2.13.56
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-packager $as_me 2.13.55, which was
+It was created by yast2-packager $as_me 2.13.56, 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-packager'
- VERSION='2.13.55'
+ VERSION='2.13.56'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.55"
+VERSION="2.13.56"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.55, which was
+This file was extended by yast2-packager $as_me 2.13.56, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.55
+yast2-packager config.status 2.13.56
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-packager-2.13.55/configure.in new/yast2-packager-2.13.56/configure.in
--- old/yast2-packager-2.13.55/configure.in 2006-03-29 14:10:14.000000000 +0200
+++ new/yast2-packager-2.13.56/configure.in 2006-03-30 11:09:17.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
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-packager, 2.13.55, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.56, http://www.suse.de/feedback, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.55"
+VERSION="2.13.56"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/packager.pot new/yast2-packager-2.13.56/packager.pot
--- old/yast2-packager-2.13.55/packager.pot 2006-03-28 17:38:45.000000000 +0200
+++ new/yast2-packager-2.13.56/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,174 +0,0 @@
-#. popup question, %1 stands for the package name
-#: src/modules/SignatureCheckDialogs.ycp:130
-#, ycp-format
-msgid ""
-"The package '%1' is not digitally signed. This means that the origin\n"
-"of the integrity of the package can not be verified. Installing the package\n"
-"may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to install it anyway?"
-msgstr ""
-
-#. popup question, %1 stands for the filename
-#: src/modules/SignatureCheckDialogs.ycp:137
-#, ycp-format
-msgid ""
-"The file '%1' is not digitally signed. This means that the origin\n"
-"of the integrity of the file can not be verified. Using the file\n"
-"may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to use it anyway?"
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:150
-msgid "Signature Check Failed"
-msgstr ""
-
-#. popup question, %1 stands for the package name
-#: src/modules/SignatureCheckDialogs.ycp:177
-#, ycp-format
-msgid ""
-"The integrity check for package '%1' failed. This means that\n"
-"the package has been changed by accident or by an attacker\n"
-"since the repository creator has signed it. Installing it\n"
-"is a big risk for the integrity and security of your system.\n"
-"\n"
-"Do you want to install it anyway?"
-msgstr ""
-
-#. popup question, %1 stands for the filename
-#: src/modules/SignatureCheckDialogs.ycp:185
-#, ycp-format
-msgid ""
-"The integrity check for file '%1' failed. This means that\n"
-"the file has been changed by accident or by an attacker\n"
-"since the repository creator has signed it. Installing it\n"
-"is a big risk for the integrity and security of your system.\n"
-"\n"
-"Do you want to use it anyway?"
-msgstr ""
-
-#: src/modules/SignatureCheckDialogs.ycp:199
-msgid "Validation Check Failed"
-msgstr ""
-
-#. popup question, %1 stands for the package name, %2 for the key ID
-#: src/modules/SignatureCheckDialogs.ycp:226
-#, ycp-format
-msgid ""
-"The package '%1' is digitally signed with an unknown GnuPG key '%2'\n"
-"and we cannot find that key. This means that a trust relationship to the creator of the package\n"
-"can not be established. Installing the package may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to install it anyway?"
-msgstr ""
-
-#. popup question, %1 stands for the filename, %2 for the key ID
-#: src/modules/SignatureCheckDialogs.ycp:233
-#, ycp-format
-msgid ""
-"The file '%1' is digitally signed with an unknown GnuPG key '%2'\n"
-"and we cannot find that key. This means that a trust relationship to the creator of the file\n"
-"can not be established. Using the file may put the integrity of your system at risk.\n"
-"\n"
-"Do you want to use it anyway?"
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:246
-msgid "Uknown GnuPG Key"
-msgstr ""
-
-#. popup question, %1 stands for the package name
-#: src/modules/SignatureCheckDialogs.ycp:278
-#, ycp-format
-msgid ""
-"The package '%1' is digitally signed\n"
-"with key '%2 (%3)'.\n"
-"There is no trust relationship to the owner of the key. You may chose to import\n"
-"the key into your set of trusted keys in the Import dialog and then proceed\n"
-"with the installation. You can also chose just to install the package anyway,\n"
-"but be aware that packages from untrusted sources can put the integrity\n"
-"of your system at risk."
-msgstr ""
-
-#. popup question, %1 stands for the filename
-#: src/modules/SignatureCheckDialogs.ycp:287
-#, ycp-format
-msgid ""
-"The file '%1' is digitally signed\n"
-"with key '%2 (%3)'.\n"
-"There is no trust relationship to the owner of the key. You may chose to import\n"
-"the key into your set of trusted keys in the Import dialog and then proceed\n"
-"with the installation. You can also chose just to use the file anyway,\n"
-"but be aware that packages from untrusted sources can put the integrity\n"
-"of your system at risk."
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:302
-msgid "Signed with Untrusted Public Key"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:308
-msgid "Key &Import Dialog"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:310
-msgid "Install &Anyway"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:312
-msgid "&Skip Package"
-msgstr ""
-
-#. FIXME: add somewhere this additional text
-#. additional warning text (kind of help)
-#: src/modules/SignatureCheckDialogs.ycp:337
-#, ycp-format
-msgid ""
-"The owner of the key may distribute updates, packages and package repositories\n"
-"that will be considered trusted by your system and which will be offered for installation\n"
-"and update without any further warning. Importing the key thus allows the key owner\n"
-"to have a certain amount of control over the software on your system and you should\n"
-"only do this if you trust her/him. YaST comes up with a warning dialog for every\n"
-"package that's not signed by a trusted (imported) key; this will happen to packages\n"
-"by the package creator with key '%1' if you chose not to import."
-msgstr ""
-
-#. popup heading
-#: src/modules/SignatureCheckDialogs.ycp:351
-msgid "Import Public GnuPG Key"
-msgstr ""
-
-#. popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
-#: src/modules/SignatureCheckDialogs.ycp:356
-#, ycp-format
-msgid ""
-"The GnuPG key '%1 (%2)' has been found\n"
-"on location '%3'.\n"
-"\n"
-"You can chose to import it into your keyring of trusted public keys - that means\n"
-"you trust the owner of the key. You should be sure that you can trust the owner\n"
-"and that the key really belongs to that owner before considering to import it."
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:366
-msgid "&Import"
-msgstr ""
-
-#. push button
-#. tab
-#: src/modules/SignatureCheckDialogs.ycp:368 src/modules/SlideShow.ycp:1493
-msgid "&Details"
-msgstr ""
-
-#. push button
-#: src/modules/SignatureCheckDialogs.ycp:370
-msgid "Do &Not Import"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/dirinstall.ycp new/yast2-packager-2.13.56/src/clients/dirinstall.ycp
--- old/yast2-packager-2.13.55/src/clients/dirinstall.ycp 2006-02-03 08:47:49.000000000 +0100
+++ new/yast2-packager-2.13.56/src/clients/dirinstall.ycp 2006-03-29 13:38:43.000000000 +0200
@@ -9,6 +9,12 @@
{
textdomain "packager";
+ import "PackageLock";
+ // check whether having the packager for ourselves
+ if (! PackageLock::Check ())
+ return `abort;
+
+ // constructor calls Pkg::
import "DirInstall";
include "dirinstall/ui.ycp";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/inst_source.ycp new/yast2-packager-2.13.56/src/clients/inst_source.ycp
--- old/yast2-packager-2.13.55/src/clients/inst_source.ycp 2006-03-21 15:32:20.000000000 +0100
+++ new/yast2-packager-2.13.56/src/clients/inst_source.ycp 2006-03-29 10:55:57.000000000 +0200
@@ -15,6 +15,7 @@
import "Mode";
import "Installation";
import "PackageCallbacksInit";
+ import "PackageLock";
import "SLP";
import "Wizard";
@@ -28,7 +29,7 @@
Wizard::SetContents(_("Initializing..."), `Empty (), "", false, true);
// check whether running as root
- if (! Confirm::MustBeRoot ())
+ if (! Confirm::MustBeRoot () || ! PackageLock::Check ())
{
UI::CloseDialog ();
return (any)`abort;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/sw_single.ycp new/yast2-packager-2.13.56/src/clients/sw_single.ycp
--- old/yast2-packager-2.13.55/src/clients/sw_single.ycp 2006-03-16 17:33:14.000000000 +0100
+++ new/yast2-packager-2.13.56/src/clients/sw_single.ycp 2006-03-30 10:51:55.000000000 +0200
@@ -7,7 +7,7 @@
* Purpose: contains dialog loop for workflows:
* "Install/Remove software"
*
- * $Id: sw_single.ycp 29058 2006-03-16 16:33:12Z locilka $
+ * $Id: sw_single.ycp 29549 2006-03-30 08:51:49Z mvidner $
*/
{
@@ -20,6 +20,7 @@
import "Mode";
import "Packages";
import "PackageCallbacks";
+ import "PackageLock";
import "SlideShow";
import "SlideShowCallbacks";
import "Kernel";
@@ -175,18 +176,19 @@
// =============================================================
- Pkg::SetLocale (UI::GetLanguage (true));
-
Wizard::CreateDialog();
Wizard::SetDesktopIcon("sw_single");
// check whether running as root
- if (! Confirm::MustBeRoot ())
+ // and having the packager for ourselves
+ if (! Confirm::MustBeRoot () || ! PackageLock::Check ())
{
UI::CloseDialog ();
return `abort;
}
+ Pkg::SetLocale (UI::GetLanguage (true));
+
// check Args
// set test_mode, test_popup
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/clients/test.ycp new/yast2-packager-2.13.56/src/clients/test.ycp
--- old/yast2-packager-2.13.55/src/clients/test.ycp 2006-03-27 15:55:00.000000000 +0200
+++ new/yast2-packager-2.13.56/src/clients/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,156 +0,0 @@
-{
- textdomain "packager";
- import "Service";
- import "Message";
-
- /**
- * Runs a bash command with timeout.
- * @struct Returns map $[
- * "exit" : int_return_code,
- * "stdout" : [ "script", "stdout", "lines" ],
- * "stderr" : [ "script", "stderr", "lines" ],
- * ]
- *
- * @param string command
- * @param integer timeout in sec.
- * @return map with out, err and ret_code
- */
- map RunCommandWithTimeout (string run_command, integer script_time_out) {
- y2milestone("Running command \"%1\" in background...", run_command);
-
- boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command);
- if (!started) {
- y2error("Cannot run '%1'", run_command);
- return nil;
- }
-
- list<string> script_out = [];
- list<string> script_err = [];
- integer time_spent = 0;
- integer return_code = nil;
- boolean cont_loop = true;
- integer sleep_step = 20;
- script_time_out = script_time_out * 1000;
-
- // while continuing is needed and while it is possible
- while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) {
- // time-out
- if (time_spent >= script_time_out) {
- y2error("Command '%1' timed-out after %2 mces", run_command, time_spent);
- cont_loop = false;
- }
-
- time_spent = time_spent + sleep_step;
- sleep(sleep_step);
- }
- y2milestone("Time spent: %1 msec", time_spent);
-
- // fetching the return code if not timed-out
- if (cont_loop) {
- script_out = (list<string>) SCR::Read(.background.newout);
- script_err = (list<string>) SCR::Read(.background.newerr);
- return_code = (integer) SCR::Read(.background.status);
- }
- SCR::Execute(.background.kill, "");
-
- map command_ret = $[
- "exit" : return_code,
- "stdout" : script_out,
- "stderr" : script_err,
- ];
- return command_ret;
- }
-
- /**
- * Returns count of services matching the pattern. Returns 'nil'
- * if something fails.
- *
- * @param string grep_pattern to match the ZYPP service
- * @return integer count of matching lines
- */
- integer CountOfZMDServicesMatching (string grep_pattern) {
- map ret = RunCommandWithTimeout(
- sformat("TERM=dumb /usr/bin/rug service-list; exit $?"),
- 60
- );
- if (ret != nil && ret["stdout"]:nil != nil) {
- list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], {
- return regexpmatch(one_line, grep_pattern);
- });
- return size(matching);
- } else {
- y2error("Counting of services failed, returned %1", ret);
- return nil;
- }
- }
-
- /* Adds a ZYPP service into ZMD */
- boolean AddZYPPServiceIntoZMD () {
- map ret = RunCommandWithTimeout(
- "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?",
- 60
- );
- if (ret != nil && ret["exit"]:nil == 0) {
- return true;
- } else {
- y2error("Adding ZYPP service failed, returned %1", ret);
- return false;
- }
- }
-
- /**
- * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed
- * in the ZMD services, adds one if it is missing.
- * Everything is done via the .background agent with timeout (number in seconds).
- */
- boolean SyncYaSTInstSourceWithZMD () {
- // Notes for maintainer:
- // - using .background agent because of ZMD/rug call that can stuck
- // - using 'exit $?' that work well with ZMD/rug and .background together
- // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug
-
- y2milestone("--- Syncing YaST inst source with ZMD ---");
- string zmd_service_name = "/etc/init.d/novell-zmd";
- string rug_command = "/usr/bin/rug";
-
- // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD'
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- // Starting the service
- map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60);
- y2milestone("ZMD start: %1", zmd_start);
- // Checking the status after start
- map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60);
- y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]);
- if (zmd_status == nil || zmd_status["exit"]:nil != 0) {
- Message::CannotStartService(zmd_service_name);
- y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status);
- y2milestone("--- Syncing finished ---");
- return false;
- }
- }
-
- // Check whether the ZYPP service is already in zmd db or not
- integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*");
- if (count_of_services == nil) {
- y2warning("Cannot get list of services...");
- } else if (count_of_services > 0) {
- y2milestone("ZYPP service already presented (%1)", count_of_services);
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- // Count of services were 'nil' or '0'
- if (AddZYPPServiceIntoZMD()) {
- y2milestone("Adding ZYPP service succeeded");
- } else {
- y2error("Adding ZYPP service failed");
- }
-
- y2milestone("--- Syncing finished ---");
- return true;
- }
-
- SyncYaSTInstSourceWithZMD();
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.56/src/modules/SignatureCheckDialogs.ycp
--- old/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp 2006-03-29 13:47:33.000000000 +0200
+++ new/yast2-packager-2.13.56/src/modules/SignatureCheckDialogs.ycp 2006-03-30 10:49:57.000000000 +0200
@@ -300,19 +300,23 @@
with key '%2 (%3)'.
There is no trust relationship to the owner of the key.
-If you trust the owner, import the key into your set
-of trusted keys then proceed with the installation.
+If you trust the owner, import the key into your set of
+trusted keys with Import Key then proceed
+with the installation.
+
Installing a package from an unknown source can put
the integrity of your system at risk. It is safest
to skip the package.")
:
// popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name
- _("The file '%1' is digitally signed
+ _("The file %1 is digitally signed
with key '%2 (%3)'.
There is no trust relationship to the owner of the key.
-If you trust the owner, import the key into your set
-of trusted keys then proceed with the installation.
+If you trust the owner, import the key into your set of
+trusted keys with Import Key then proceed with
+the installation.
+
Installing a file from an unknown source can put
the integrity of your system at risk. It is safest
to skip it.")
@@ -330,7 +334,7 @@
`MarginBox(0.5, 0.5, `Label(description_text)),
`HBox (
// push button
- `PushButton(`id(`key_import), _("&Import Key")),
+ `PushButton(`id(`key_import), _("&Import Key...")),
`HSpacing(1),
// push button
`PushButton(`id(`install), _("Install &Anyway")),
@@ -363,17 +367,21 @@
string warning_text = sformat(_("<p>The owner of the key may distribute updates,
packages, and package repositories that your system will trust and offer
for installation and update without any further warning. In this way,
-importing the key allows the key owner to have a certain amount of control
-over the software on your system.</p>
+importing the key into your keyring of trusted keys allows the key owner
+to have a certain amount of control over the software on your system.</p>
-<p>Only trust a key if you are confident that the owner can be trusted.
-A warning dialog opens for every package that is not signed by a trusted (imported) key.
-If you do not import the key, packages created by the owner of key '%1'
-show this warning.</p>"), key_id);
+<p>Only trust a key if you are confident that the key really belongs to the owner
+and that the owner can be trusted. With <b>Details</b>, get
+more information on the key, such as a fingerprint and signatures
+that can help you determine the trustworthiness of the key.</p>
+
+<p>A warning dialog opens for every package that
+is not signed by a trusted (imported) key. If you do not import the key,
+packages created by the owner of key <tt>%1</tt> show this warning.</p>"), key_id);
// popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...)
string dialog_text = sformat(_("The GnuPG key '%1 (%2)'
-has been found at '%3'.
+has been found at %3.
You can choose to import it into your keyring of trusted
public keys, meaning that you trust the owner of the key.
@@ -414,7 +422,7 @@
`PushButton(`id(`import), _("&Import")),
`HSpacing(1),
// push button
- `PushButton(`id(`details), _("&Details")),
+ `PushButton(`id(`details), _("&Details...")),
`HSpacing(1),
// push button
`PushButton(`id(`dont_import), _("Do &Not Import"))
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2
checked in at Fri Mar 31 15:53:42 CEST 2006.
--------
--- yast2/yast2.changes 2006-03-29 21:20:35.000000000 +0200
+++ yast2/yast2.changes 2006-03-29 21:22:04.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Mar 29 17:04:09 CEST 2006 - mvidner(a)suse.cz
+
+- Added PackageLock, a module to handle the big Zypp lock (#160319).
+- 2.13.41
+
+-------------------------------------------------------------------
+Mon Mar 27 10:24:51 CEST 2006 - locilka(a)suse.cz
+
+- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
+
+-------------------------------------------------------------------
Old:
----
yast2-2.13.40.tar.bz2
New:
----
yast2-2.13.41.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.houbjc/_old 2006-03-31 15:53:28.000000000 +0200
+++ /var/tmp/diff_new_pack.houbjc/_new 2006-03-31 15:53:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.13.40)
+# spec file for package yast2 (Version 2.13.41)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,22 +11,24 @@
# norootforbuild
Name: yast2
-Version: 2.13.40
-Release: 3
+Version: 2.13.41
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.13.40.tar.bz2
+Source0: yast2-2.13.41.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
Requires: yast2-core >= 2.7.1
+# Pkg::Connect
+Requires: yast2-pkg-bindings >= 2.13.43
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
# for ag_tty (/bin/stty)
Requires: coreutils
-Requires: yast2-pkg-bindings, yast2-xml, yast2-hardware-detection
+Requires: yast2-xml, yast2-hardware-detection
Requires: SuSEfirewall2
Provides: yast2-lib-sequencer
Obsoletes: yast2-lib-sequencer
@@ -91,7 +93,7 @@
Steffen Winterfeldt <snwint(a)suse.de>
%prep
-%setup -n yast2-2.13.40
+%setup -n yast2-2.13.41
%build
%{prefix}/bin/y2tool y2autoconf
@@ -190,6 +192,11 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Wed Mar 29 2006 - mvidner(a)suse.cz
+- Added PackageLock, a module to handle the big Zypp lock (#160319).
+- 2.13.41
+* Mon Mar 27 2006 - locilka(a)suse.cz
+- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut()
* Wed Mar 22 2006 - locilka(a)suse.cz
- better testing of UTF-8 support using the testutf8 binary
(#158001)
++++++ yast2-2.13.40.tar.bz2 -> yast2-2.13.41.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.am new/yast2-2.13.41/Makefile.am
--- old/yast2-2.13.40/Makefile.am 2006-03-22 13:03:49.000000000 +0100
+++ new/yast2-2.13.41/Makefile.am 2006-03-29 17:06:25.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 package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,6 +199,9 @@
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-2.13.40/Makefile.in new/yast2-2.13.41/Makefile.in
--- old/yast2-2.13.40/Makefile.in 2006-03-22 13:04:04.000000000 +0100
+++ new/yast2-2.13.41/Makefile.in 2006-03-29 17:07:07.000000000 +0200
@@ -789,7 +789,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -832,6 +832,9 @@
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-2.13.40/VERSION new/yast2-2.13.41/VERSION
--- old/yast2-2.13.40/VERSION 2006-03-22 13:01:38.000000000 +0100
+++ new/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200
@@ -1 +1 @@
-2.13.40
+2.13.41
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/base.pot new/yast2-2.13.41/base.pot
--- old/yast2-2.13.40/base.pot 2006-02-07 16:03:17.000000000 +0100
+++ new/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-07 16:03+0100\n"
+"POT-Creation-Date: 2005-12-14 16:33+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"
@@ -258,53 +258,53 @@
msgstr ""
#. translators: progress message - command line interface ready
-#: library/commandline/src/CommandLine.ycp:1258
+#: library/commandline/src/CommandLine.ycp:1263
msgid "Ready"
msgstr ""
#. non-GUI handling
-#: library/commandline/src/CommandLine.ycp:1282
+#: library/commandline/src/CommandLine.ycp:1287
msgid "Initializing"
msgstr ""
#. translators: Progress message - the command line interface is about to finish
-#: library/commandline/src/CommandLine.ycp:1321
+#: library/commandline/src/CommandLine.ycp:1326
msgid "Finishing"
msgstr ""
#. translators: The command line interface is finished
-#: library/commandline/src/CommandLine.ycp:1328
+#: library/commandline/src/CommandLine.ycp:1333
msgid "Done"
msgstr ""
#. translators: The command line interface is finished without writing the changes
-#: library/commandline/src/CommandLine.ycp:1331
+#: library/commandline/src/CommandLine.ycp:1336
msgid "Quitting (without changes)"
msgstr ""
#. prompt message displayed in the commandline mode
#. when user is asked to replay "yes" or "no" (localized)
-#: library/commandline/src/CommandLine.ycp:1346
-msgid "yes or no?"
+#: library/commandline/src/CommandLine.ycp:1351
+msgid "yes/no?: "
msgstr ""
#. yes - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1351
+#: library/commandline/src/CommandLine.ycp:1356
msgid "yes"
msgstr ""
#. no - used in the command line mode as input text for yes/no confirmation
-#: library/commandline/src/CommandLine.ycp:1354
+#: library/commandline/src/CommandLine.ycp:1359
msgid "no"
msgstr ""
#. error report
-#: library/control/src/ProductControl.ycp:813
+#: library/control/src/ProductControl.ycp:811
msgid "No workflow defined for this installation mode."
msgstr ""
#. message popup, %1 is a label of some widget
-#: library/cwm/src/CWM.ycp:626
+#: library/cwm/src/CWM.ycp:630
#, ycp-format
msgid "The value of %1 is invalid."
msgstr ""
@@ -598,37 +598,37 @@
msgstr ""
#. combobox header
-#: library/cwm/src/TablePopup.ycp:417
+#: library/cwm/src/TablePopup.ycp:413
msgid "&Selected Option"
msgstr ""
#. heading / label
-#: library/cwm/src/TablePopup.ycp:463
+#: library/cwm/src/TablePopup.ycp:459
msgid "Current Option: "
msgstr ""
#. error report
-#: library/cwm/src/TablePopup.ycp:663
+#: library/cwm/src/TablePopup.ycp:652
msgid "The selected option is already present."
msgstr ""
#. table header, shortcut for changed, keep very short
-#: library/cwm/src/TablePopup.ycp:835
+#: library/cwm/src/TablePopup.ycp:823
msgid "Ch."
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842
+#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830
msgid "Option"
msgstr ""
#. table header
-#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844
+#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832
msgid "Value"
msgstr ""
#. help 1/4
-#: library/cwm/src/TablePopup.ycp:848
+#: library/cwm/src/TablePopup.ycp:836
msgid ""
"<p><b><big>Editing the Settings</big></b><br>\n"
"To edit the settings, choose the appropriate\n"
@@ -636,21 +636,21 @@
msgstr ""
#. help 2/4, optional
-#: library/cwm/src/TablePopup.ycp:853
+#: library/cwm/src/TablePopup.ycp:841
msgid ""
"<p>To add a new option, click <b>Add</b>. To remove\n"
"an option, select it and click <b>Delete</b>.</p>"
msgstr ""
#. help 3/4, optional
-#: library/cwm/src/TablePopup.ycp:858
+#: library/cwm/src/TablePopup.ycp:846
msgid ""
"<P>The <B>Ch.</B> column of the table shows \n"
"whether the option was changed.</P>"
msgstr ""
#. help 4/4, optional
-#: library/cwm/src/TablePopup.ycp:863
+#: library/cwm/src/TablePopup.ycp:851
msgid ""
"<p>To reorder the options, select an option\n"
"and use <b>Up</b> and <b>Down</b> to move it up or down\n"
@@ -659,12 +659,12 @@
#. push button
#. Button label
-#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184
+#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184
msgid "&Up"
msgstr ""
#. push button
-#: library/cwm/src/TablePopup.ycp:873
+#: library/cwm/src/TablePopup.ycp:861
msgid "&Down"
msgstr ""
@@ -1277,176 +1277,43 @@
msgid "All changes will be lost!"
msgstr ""
-#. translators: summary header for messages generated through autoinstallation
-#: library/modules/Report.ycp:81
-msgid "Messages"
-msgstr ""
-
-#. Report configuration - will be normal messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:86
-#, ycp-format
-msgid "Display Messages: %1"
-msgstr ""
-
-#. translators: summary if the messages should be displayed
-#. translators: summary if the messages should be written to log file
-#. translators: summary if the warnings should be displayed
-#. translators: summary if the warnings should be written to log file
-#. translators: summary if the errors should be displayed
-#. translators: summary if the errors should be written to log file
-#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
-#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
-#: library/modules/Report.ycp:122 library/modules/Report.ycp:130
-msgid "Yes"
-msgstr ""
-
-#. translators: summary if the errors should be written to log file
-#: library/modules/Report.ycp:88 library/modules/Report.ycp:96
-#: library/modules/Report.ycp:105 library/modules/Report.ycp:113
-#: library/modules/Report.ycp:122 library/modules/Report.ycp:132
-msgid "No"
-msgstr ""
-
-#. Report configuration - will have normal messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:91
-#, ycp-format
-msgid "Time-out Messages: %1"
-msgstr ""
-
-#. Report configuration - will be normal messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:94
-#, ycp-format
-msgid "Log Messages: %1"
-msgstr ""
-
-#. translators: summary header for warnings generated through autoinstallation
-#: library/modules/Report.ycp:99
-msgid "Warnings"
-msgstr ""
-
-#. Report configuration - will be warning messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:103
-#, ycp-format
-msgid "Display Warnings: %1"
-msgstr ""
-
-#. Report configuration - will have warning messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:108
-#, ycp-format
-msgid "Time-out Warnings: %1"
-msgstr ""
-
-#. Report configuration - will be warning messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:111
-#, ycp-format
-msgid "Log Warnings: %1"
-msgstr ""
-
-#. translators: summary header for errors generated through autoinstallation
-#: library/modules/Report.ycp:116
-msgid "Errors"
-msgstr ""
-
-#. Report configuration - will be error messages displayed?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:120
-#, ycp-format
-msgid "Display Errors: %1"
-msgstr ""
-
-#. Report configuration - will have error messages timeout?
-#. '%1' will be replaced by number of seconds
-#: library/modules/Report.ycp:125
-#, ycp-format
-msgid "Time-out Errors: %1"
-msgstr ""
-
-#. Report configuration - will be error messages logged to file?
-#. '%1' will be replaced by translated string "Yes" or "No"
-#: library/modules/Report.ycp:128
-#, ycp-format
-msgid "Log Errors: %1"
-msgstr ""
-
-#. translators: warnings summary header
-#: library/modules/Report.ycp:635
-msgid "Warning:"
-msgid_plural "Warnings:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: errors summary header
-#: library/modules/Report.ycp:649
-msgid "Error:"
-msgid_plural "Errors:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: message summary header
-#: library/modules/Report.ycp:663 library/modules/Report.ycp:677
-msgid "Message:"
-msgid_plural "Messages:"
-msgstr[0] ""
-msgstr[1] ""
-
-#. translators: summary if the module has not been used yet in AutoYaST profile
-#: library/modules/Summary.ycp:49
-msgid "Not configured yet."
-msgstr ""
-
-#. translators: summary if no hardware was detected
-#: library/modules/Summary.ycp:65
-msgid "Not detected."
-msgstr ""
-
#. translators: Tree header
#: library/modules/ValueBrowser.ycp:141
msgid "&Variable"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:104
+#: library/network/src/CWMFirewallInterfaces.ycp:77
msgid "Firewall is disabled"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:109
+#: library/network/src/CWMFirewallInterfaces.ycp:82
msgid "Firewall port is closed"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:114
+#: library/network/src/CWMFirewallInterfaces.ycp:87
msgid "Firewall port is open on all interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:119
+#: library/network/src/CWMFirewallInterfaces.ycp:92
msgid "Firewall port is open on selected interfaces"
msgstr ""
#. label
-#: library/network/src/CWMFirewallInterfaces.ycp:124
+#: library/network/src/CWMFirewallInterfaces.ycp:97
msgid "No network interfaces are configured"
msgstr ""
-#. multi selection box item
-#: library/network/src/CWMFirewallInterfaces.ycp:186
-msgid "All NetworkManager Interfaces"
-msgstr ""
-
#. transaltors: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:365
+#: library/network/src/CWMFirewallInterfaces.ycp:278
msgid "&Network Interfaces with Open Port in Firewall"
msgstr ""
#. question popup
-#: library/network/src/CWMFirewallInterfaces.ycp:431
+#: library/network/src/CWMFirewallInterfaces.ycp:338
msgid ""
"No interface is selected. Service will not\n"
"be available for other computers.\n"
@@ -1455,7 +1322,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:475
+#: library/network/src/CWMFirewallInterfaces.ycp:358
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1466,7 +1333,7 @@
msgstr ""
#. yes-no popup
-#: library/network/src/CWMFirewallInterfaces.ycp:492
+#: library/network/src/CWMFirewallInterfaces.ycp:373
#, ycp-format
msgid ""
"Because of SuSE Firewall settings, the port\n"
@@ -1477,23 +1344,23 @@
msgstr ""
#. translators: selection box title
-#: library/network/src/CWMFirewallInterfaces.ycp:569
+#: library/network/src/CWMFirewallInterfaces.ycp:450
msgid "Network &Interfaces with Open Port in Firewall"
msgstr ""
#. push button to select all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:578
+#: library/network/src/CWMFirewallInterfaces.ycp:459
msgid "Select &All"
msgstr ""
#. push button to deselect all network intefaces for firewall
-#: library/network/src/CWMFirewallInterfaces.ycp:581
+#: library/network/src/CWMFirewallInterfaces.ycp:462
msgid "Select &None"
msgstr ""
#. help text for firewall settings widget 1/3,
#. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
-#: library/network/src/CWMFirewallInterfaces.ycp:799
+#: library/network/src/CWMFirewallInterfaces.ycp:680
#, ycp-format
msgid ""
"<p><b><big>Firewall Settings</big></b><br>\n"
@@ -1504,7 +1371,7 @@
#. help text for firewall port openning widget 2/3, optional
#. %1 is push button label, eg. "Firewall &Details" (without quotes)
#. note: %2 is correct, do not replace with %1!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:807
+#: library/network/src/CWMFirewallInterfaces.ycp:688
#, ycp-format
msgid ""
"To select interfaces on which to open the port,\n"
@@ -1512,46 +1379,37 @@
msgstr ""
#. help text for firewall settings widget 3/3,
-#: library/network/src/CWMFirewallInterfaces.ycp:811
+#: library/network/src/CWMFirewallInterfaces.ycp:692
msgid ""
"This option is available only if the firewall\n"
"is enabled.</p>"
msgstr ""
#. part of help text - check box label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:824
+#: library/network/src/CWMFirewallInterfaces.ycp:705
msgid "Open Port in Firewall"
msgstr ""
#. part of help text - push button label, NO SHORTCUT!!!
-#: library/network/src/CWMFirewallInterfaces.ycp:826
+#: library/network/src/CWMFirewallInterfaces.ycp:707
msgid "Firewall Details"
msgstr ""
#. check box
-#: library/network/src/CWMFirewallInterfaces.ycp:855
+#: library/network/src/CWMFirewallInterfaces.ycp:736
msgid "Open Port in &Firewall"
msgstr ""
#. push button
-#: library/network/src/CWMFirewallInterfaces.ycp:858
+#: library/network/src/CWMFirewallInterfaces.ycp:739
msgid "Firewall &Details"
msgstr ""
#. label text
-#: library/network/src/CWMFirewallInterfaces.ycp:887
+#: library/network/src/CWMFirewallInterfaces.ycp:768
msgid "Firewall is open"
msgstr ""
-#. TRANSLATORS: pop-up question when reading the service configuration
-#: library/network/src/NetworkService.ycp:108
-msgid ""
-"Your network interfaces are currently controlled by NetworkManager\n"
-"but the service to configure might not work well with it.\n"
-"\n"
-"Really continue?"
-msgstr ""
-
#. TRANSLATORS: popup informing message, allowed characters for port-names
#: library/network/src/PortAliases.ycp:112
msgid ""
@@ -1561,39 +1419,39 @@
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:79
+#: library/network/src/SuSEFirewall.ycp:72
msgid "External Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:81
+#: library/network/src/SuSEFirewall.ycp:74
msgid "Internal Zone"
msgstr ""
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/SuSEFirewall.ycp:83
+#: library/network/src/SuSEFirewall.ycp:76
msgid "Demilitarized Zone"
msgstr ""
#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/SuSEFirewall.ycp:1140
+#: library/network/src/SuSEFirewall.ycp:1103
msgid "Unknown Zone"
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1360
+#: library/network/src/SuSEFirewall.ycp:1323
#, ycp-format
msgid "Cannot enable service '%1'."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:1382
+#: library/network/src/SuSEFirewall.ycp:1345
#, ycp-format
msgid "Cannot disable service '%1'."
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1497
+#: library/network/src/SuSEFirewall.ycp:1458
#, ycp-format
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
@@ -1604,8 +1462,8 @@
msgstr ""
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/SuSEFirewall.ycp:1782
-#: library/network/src/SuSEFirewall.ycp:1843
+#: library/network/src/SuSEFirewall.ycp:1730
+#: library/network/src/SuSEFirewall.ycp:1787
#, ycp-format
msgid ""
"Interface '%1' is not assigned to any firewall zone.\n"
@@ -1613,78 +1471,78 @@
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2175
+#: library/network/src/SuSEFirewall.ycp:2111
msgid "Initializing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2180
+#: library/network/src/SuSEFirewall.ycp:2116
msgid "Check for network devices"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2182
+#: library/network/src/SuSEFirewall.ycp:2118
msgid "Read current configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2184
+#: library/network/src/SuSEFirewall.ycp:2120
msgid "Check possibly conflicting services"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2188
+#: library/network/src/SuSEFirewall.ycp:2124
msgid "Checking for network devices..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2190
+#: library/network/src/SuSEFirewall.ycp:2126
msgid "Reading current configuration..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2192
+#: library/network/src/SuSEFirewall.ycp:2128
msgid "Checking possibly conflicting services..."
msgstr ""
#. TRANSLATORS: Dialog caption
-#: library/network/src/SuSEFirewall.ycp:2291
+#: library/network/src/SuSEFirewall.ycp:2227
msgid "Writing Firewall Configuration"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2296
+#: library/network/src/SuSEFirewall.ycp:2232
msgid "Write firewall settings"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2298
+#: library/network/src/SuSEFirewall.ycp:2234
msgid "Adjust firewall service"
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2302
+#: library/network/src/SuSEFirewall.ycp:2238
msgid "Writing firewall settings..."
msgstr ""
#. TRANSLATORS: Progress step
-#: library/network/src/SuSEFirewall.ycp:2304
+#: library/network/src/SuSEFirewall.ycp:2240
msgid "Adjusting firewall service..."
msgstr ""
#. TRANSLATORS: a popup error message
-#: library/network/src/SuSEFirewall.ycp:2320
+#: library/network/src/SuSEFirewall.ycp:2256
msgid "Writing settings failed"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:137
+#: library/network/src/SuSEFirewallProposal.ycp:136
#, ycp-format
msgid "New network device '%1' found; added as an internal firewall interface"
msgstr ""
#. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...)
-#: library/network/src/SuSEFirewallProposal.ycp:144
+#: library/network/src/SuSEFirewallProposal.ycp:143
#, ycp-format
msgid "New network device '%1' found; added as an external firewall interface"
msgstr ""
@@ -1692,7 +1550,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:349
+#: library/network/src/SuSEFirewallProposal.ycp:330
#, ycp-format
msgid "Firewall is %1enabled%2"
msgstr ""
@@ -1700,7 +1558,7 @@
#. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:354
+#: library/network/src/SuSEFirewallProposal.ycp:335
#, ycp-format
msgid "Firewall is %1disabled%2"
msgstr ""
@@ -1708,7 +1566,7 @@
#. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:384
+#: library/network/src/SuSEFirewallProposal.ycp:353
#, ycp-format
msgid "SSH port is %1open%2"
msgstr ""
@@ -1716,20 +1574,20 @@
#. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:389
+#: library/network/src/SuSEFirewallProposal.ycp:358
#, ycp-format
msgid "SSH port is %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:395
-msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:364
+msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall."
msgstr ""
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around
#. "enabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:414
+#: library/network/src/SuSEFirewallProposal.ycp:383
#, ycp-format
msgid "Remote Administration (VNC) ports are %1open%2"
msgstr ""
@@ -1737,14 +1595,14 @@
#. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around
#. "disabled" must be surrounded with the "%1" and "%2" strings
#. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>"
-#: library/network/src/SuSEFirewallProposal.ycp:419
+#: library/network/src/SuSEFirewallProposal.ycp:388
#, ycp-format
msgid "Remote Administration (VNC) ports are %1blocked%2"
msgstr ""
#. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall
-#: library/network/src/SuSEFirewallProposal.ycp:424
-msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall."
+#: library/network/src/SuSEFirewallProposal.ycp:393
+msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall."
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
@@ -1878,43 +1736,49 @@
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:185
+#: library/network/src/SuSEFirewallServices.ycp:183
msgid "Remote Access to Display Manager"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:193
+#: library/network/src/SuSEFirewallServices.ycp:191
msgid "Remote File Alteration Monitor"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:199
+#: library/network/src/SuSEFirewallServices.ycp:197
msgid "Portable Batch System (PBS)"
msgstr ""
#. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box...
-#: library/network/src/SuSEFirewallServices.ycp:206
+#: library/network/src/SuSEFirewallServices.ycp:204
msgid "MySQL Remote Access"
msgstr ""
#. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server
-#: library/network/src/SuSEFirewallServices.ycp:236
+#: library/network/src/SuSEFirewallServices.ycp:234
#, ycp-format
msgid "Unknown service '%1'"
msgstr ""
#. Popup when initializing the package manager
+#. popup when initializing the package manager
#: library/packages/src/PackageSystem.ycp:77
+#: library/packages/src/Require.ycp:75
msgid "Reading package information..."
msgstr ""
#. Error message, no packages sources found
+#. error popup, no packages sources
+#. FIXME: translation
#: library/packages/src/PackageSystem.ycp:99
+#: library/packages/src/Require.ycp:87
msgid "No package source defined."
msgstr ""
#. popup heading, with rich text widget and Yes/No buttons
#: library/packages/src/PackageSystem.ycp:128
+#: library/packages/src/Require.ycp:343
msgid "Do you accept this license agreement?"
msgid_plural "Do you accept these license agreements?"
msgstr[0] ""
@@ -1945,14 +1809,19 @@
"packages, YaST may not work properly.\n"
msgstr ""
+#. this is a separator used at merging package list items
+#: library/packages/src/common.ycp:83
+msgid ", "
+msgstr ""
+
#. the message is followed by list of required packages
#. Popup Text
-#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108
+#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109
msgid "These packages need to be installed:"
msgstr ""
#. Popup Text
-#: library/packages/src/common.ycp:110
+#: library/packages/src/common.ycp:111
msgid "These packages need to be removed:"
msgstr ""
@@ -2064,22 +1933,22 @@
msgstr ""
#. KiloByte abbreviated
-#: library/types/src/String.ycp:96
+#: library/types/src/String.ycp:80
msgid "KB"
msgstr ""
#. MegaByte abbreviated
-#: library/types/src/String.ycp:98
+#: library/types/src/String.ycp:82
msgid "MB"
msgstr ""
#. GigaByte abbreviated
-#: library/types/src/String.ycp:100
+#: library/types/src/String.ycp:84
msgid "GB"
msgstr ""
#. TeraByte abbreviated
-#: library/types/src/String.ycp:102
+#: library/types/src/String.ycp:86
msgid "TB"
msgstr ""
@@ -2155,6 +2024,134 @@
msgid "&Exported Directories"
msgstr ""
+#. translators: summary header for messages generated through autoinstallation
+#: library/wizard/src/Report.ycp:81
+msgid "Messages"
+msgstr ""
+
+#. Report configuration - will be normal messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:86
+#, ycp-format
+msgid "Display Messages: %1"
+msgstr ""
+
+#. translators: summary if the messages should be displayed
+#. translators: summary if the messages should be written to log file
+#. translators: summary if the warnings should be displayed
+#. translators: summary if the warnings should be written to log file
+#. translators: summary if the errors should be displayed
+#. translators: summary if the errors should be written to log file
+#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
+#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
+#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130
+msgid "Yes"
+msgstr ""
+
+#. translators: summary if the errors should be written to log file
+#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96
+#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113
+#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132
+msgid "No"
+msgstr ""
+
+#. Report configuration - will have normal messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:91
+#, ycp-format
+msgid "Time-out Messages: %1"
+msgstr ""
+
+#. Report configuration - will be normal messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:94
+#, ycp-format
+msgid "Log Messages: %1"
+msgstr ""
+
+#. translators: summary header for warnings generated through autoinstallation
+#: library/wizard/src/Report.ycp:99
+msgid "Warnings"
+msgstr ""
+
+#. Report configuration - will be warning messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:103
+#, ycp-format
+msgid "Display Warnings: %1"
+msgstr ""
+
+#. Report configuration - will have warning messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:108
+#, ycp-format
+msgid "Time-out Warnings: %1"
+msgstr ""
+
+#. Report configuration - will be warning messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:111
+#, ycp-format
+msgid "Log Warnings: %1"
+msgstr ""
+
+#. translators: summary header for errors generated through autoinstallation
+#: library/wizard/src/Report.ycp:116
+msgid "Errors"
+msgstr ""
+
+#. Report configuration - will be error messages displayed?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:120
+#, ycp-format
+msgid "Display Errors: %1"
+msgstr ""
+
+#. Report configuration - will have error messages timeout?
+#. '%1' will be replaced by number of seconds
+#: library/wizard/src/Report.ycp:125
+#, ycp-format
+msgid "Time-out Errors: %1"
+msgstr ""
+
+#. Report configuration - will be error messages logged to file?
+#. '%1' will be replaced by translated string "Yes" or "No"
+#: library/wizard/src/Report.ycp:128
+#, ycp-format
+msgid "Log Errors: %1"
+msgstr ""
+
+#. translators: warnings summary header
+#: library/wizard/src/Report.ycp:635
+msgid "Warning:"
+msgid_plural "Warnings:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: errors summary header
+#: library/wizard/src/Report.ycp:649
+msgid "Error:"
+msgid_plural "Errors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: message summary header
+#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677
+msgid "Message:"
+msgid_plural "Messages:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: summary if the module has not been used yet in AutoYaST profile
+#: library/wizard/src/Summary.ycp:49
+msgid "Not configured yet."
+msgstr ""
+
+#. translators: summary if no hardware was detected
+#: library/wizard/src/Summary.ycp:65
+msgid "Not detected."
+msgstr ""
+
#. button text
#: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306
msgid "&Apply"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/configure new/yast2-2.13.41/configure
--- old/yast2-2.13.40/configure 2006-03-22 13:03:53.000000000 +0100
+++ new/yast2-2.13.41/configure 2006-03-29 17:06:37.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 2.13.40.
+# Generated by GNU Autoconf 2.59 for yast2 2.13.41.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.13.40'
-PACKAGE_STRING='yast2 2.13.40'
+PACKAGE_VERSION='2.13.41'
+PACKAGE_STRING='yast2 2.13.41'
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 2.13.40 to adapt to many kinds of systems.
+\`configure' configures yast2 2.13.41 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 2.13.40:";;
+ short | recursive ) echo "Configuration of yast2 2.13.41:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.13.40
+yast2 configure 2.13.41
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 $as_me 2.13.40, which was
+It was created by yast2 $as_me 2.13.41, 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'
- VERSION='2.13.40'
+ VERSION='2.13.41'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.40"
+VERSION="2.13.41"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>"
@@ -2797,7 +2797,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2 $as_me 2.13.40, which was
+This file was extended by yast2 $as_me 2.13.41, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2852,7 +2852,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.13.40
+yast2 config.status 2.13.41
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-2.13.40/configure.in new/yast2-2.13.41/configure.in
--- old/yast2-2.13.40/configure.in 2006-03-22 13:03:49.000000000 +0100
+++ new/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
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, 2.13.40, http://www.suse.de/feedback, yast2)
+AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2)
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.40"
+VERSION="2.13.41"
RPMNAME="yast2"
MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/modules/Version.ycp new/yast2-2.13.41/library/modules/Version.ycp
--- old/yast2-2.13.40/library/modules/Version.ycp 2006-03-22 13:04:05.000000000 +0100
+++ new/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.13.40";
+global string yast2 = "2.13.41";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.am new/yast2-2.13.41/library/packages/src/Makefile.am
--- old/yast2-2.13.40/library/packages/src/Makefile.am 2006-02-03 08:47:25.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/Makefile.am 2006-03-28 18:46:35.000000000 +0200
@@ -5,6 +5,7 @@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
+ PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.in new/yast2-2.13.41/library/packages/src/Makefile.in
--- old/yast2-2.13.40/library/packages/src/Makefile.in 2006-03-22 13:03:59.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/Makefile.in 2006-03-29 17:06:54.000000000 +0200
@@ -174,6 +174,7 @@
ystartupdir = @ystartupdir@
YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src
module_DATA = \
+ PackageLock.ycp \
Package.ycp \
PackageAI.ycp \
PackageSystem.ycp \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageLock.ycp new/yast2-2.13.41/library/packages/src/PackageLock.ycp
--- old/yast2-2.13.40/library/packages/src/PackageLock.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/PackageLock.ycp 2006-03-29 15:32:27.000000000 +0200
@@ -0,0 +1,42 @@
+/**
+ * File: modules/PackageLock.ycp
+ * Package: yast2
+ * Summary: Packages manipulation (system)
+ * Authors: Martin Vidner <mvidner(a)suse.cz>
+ *
+ * $Id: PackageLock.ycp 29512 2006-03-29 13:32:23Z mvidner $
+ *
+ * This should be used everywhere before Pkg is first used. #160319
+ */
+
+{
+
+module "PackageLock";
+textdomain "base";
+
+import "Report";
+
+boolean have_lock = nil;
+/**
+ * Tries to acquire the packager (zypp) lock.
+ * Reports an error if another process has the lock already.
+ * Will only report once even if called multiple times.
+ * @return true if we can continue
+ */
+global boolean Check () {
+ if (have_lock == nil)
+ {
+ // Invoke a cheap call that accesses the zypp lock
+ have_lock = Pkg::Connect () == true; // nil guard
+ if (!have_lock)
+ {
+ Report::Error (_("Another process is accessing the package database.
+Package management will not work!"));
+ // ContinueCancel? What about CLI?
+ }
+ }
+ return have_lock;
+}
+
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageSystem.ycp new/yast2-2.13.41/library/packages/src/PackageSystem.ycp
--- old/yast2-2.13.40/library/packages/src/PackageSystem.ycp 2006-02-20 12:08:10.000000000 +0100
+++ new/yast2-2.13.41/library/packages/src/PackageSystem.ycp 2006-03-29 17:04:49.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Vidner <mvidner(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: PackageSystem.ycp 27893 2006-02-13 12:08:32Z lslezak $
+ * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -18,6 +18,7 @@
import "Mode";
import "PackageCallbacksInit";
+import "PackageLock";
import "Report";
import "Stage";
import "CommandLine";
@@ -52,6 +53,7 @@
* This may become superfluous.
*/
global void EnsureTargetInit() {
+ PackageLock::Check ();
PackageCallbacksInit::InitPackageCallbacks ();
// target_initialized = target_initialized || Pkg::TargetInit ("/", false);
// always initizalize target, it should be cheap according to #45356
@@ -62,6 +64,7 @@
* Ensure that Pkg:: calls working with the installation sources work
*/
global void EnsureSourceInit() {
+ PackageLock::Check ();
if(source_initialized)
{
// this way, if somebody closed the cache outside of Package
@@ -110,6 +113,11 @@
global boolean DoInstallAndRemove(list<string> toinstall, list<string> toremove) {
y2debug ("toinstall: %1, toremove: %2", toinstall, toremove);
+ if (!PackageLock::Check ())
+ {
+ return false;
+ }
+
EnsureSourceInit ();
EnsureTargetInit ();
boolean ok = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/runlevel/src/Service.ycp new/yast2-2.13.41/library/runlevel/src/Service.ycp
--- old/yast2-2.13.40/library/runlevel/src/Service.ycp 2006-02-13 12:22:17.000000000 +0100
+++ new/yast2-2.13.41/library/runlevel/src/Service.ycp 2006-03-28 13:46:13.000000000 +0200
@@ -6,7 +6,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Michal Svec <msvec(a)suse.cz>
*
- * $Id: Service.ycp 27885 2006-02-13 11:22:17Z locilka $
+ * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $
*
* Functions for service (init script) handling used by other modules.
*/
@@ -293,7 +293,7 @@
*/
global define integer RunInitScriptWithTimeOut (string name, string param) {
y2milestone("Running service initscript %1 %2", name, param);
- string command = sformat ("TERM=raw %2/%1 %3", name, init_d, param);
+ string command = sformat ("TERM=dumb %2/%1 %3", name, init_d, param);
// default return code
integer return_code = nil;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package xorg-x11
checked in at Fri Mar 31 15:53:15 CEST 2006.
--------
--- xorg-x11/xorg-x11.changes 2006-03-28 17:53:17.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2006-03-31 15:10:28.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Mar 31 15:14:31 CEST 2006 - sndirsch(a)suse.de
+
+- xdm.tar.gz: converted to .gz format (has been .bz2)
+
+-------------------------------------------------------------------
+Fri Mar 31 11:56:36 CEST 2006 - werner(a)suse.de
+
+- Do not use killall within the xdm scripts to avoid to kill xvkbd
+ of other running sessions maybe local or remote (bug #149957)
+- Avoid error message of not existent device tty0 (bug #162365)
+
+-------------------------------------------------------------------
+Thu Mar 30 15:56:52 CEST 2006 - sndirsch(a)suse.de
+
+- p_x86_renderinit.diff:
+ * should fix the Xrender related segfault (Bug #152730, comment #39)
+
+-------------------------------------------------------------------
New:
----
p_x86_renderinit.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.ArNv1V/_old 2006-03-31 15:52:44.000000000 +0200
+++ /var/tmp/diff_new_pack.ArNv1V/_new 2006-03-31 15:52:44.000000000 +0200
@@ -40,7 +40,7 @@
%endif
Autoreqprov: on
Version: 6.9.0
-Release: 30
+Release: 31
Summary: The basic X Window System package
Source: xorg-6.9.0.tar.bz2
Source1: xdm.tar.gz
@@ -115,6 +115,7 @@
Patch357: p_pci-ce-x.diff
Patch358: p_setxkbmap.diff
Patch359: p_mappciBIOS_complete.diff
+Patch360: p_x86_renderinit.diff
Patch400: p_bug96328.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -1538,6 +1539,7 @@
%patch357 -p2
%patch358
%patch359
+%patch360
#
UTS_RELEASE=`uname -r`
UTS_MAJOR=${UTS_RELEASE%%%%.*}
@@ -2679,6 +2681,15 @@
%clean
%changelog -n xorg-x11
+* Fri Mar 31 2006 - sndirsch(a)suse.de
+- xdm.tar.gz: converted to .gz format (has been .bz2)
+* Fri Mar 31 2006 - werner(a)suse.de
+- Do not use killall within the xdm scripts to avoid to kill xvkbd
+ of other running sessions maybe local or remote (bug #149957)
+- Avoid error message of not existent device tty0 (bug #162365)
+* Thu Mar 30 2006 - sndirsch(a)suse.de
+- p_x86_renderinit.diff:
+ * should fix the Xrender related segfault (Bug #152730, comment #39)
* Tue Mar 28 2006 - sndirsch(a)suse.de
- p_mappciBIOS_complete.diff:
* fixes system hang (IERR on PCI bus) on Dell (Bug #151644)
++++++ FILES ++++++
--- xorg-x11/FILES 2006-03-28 15:34:29.000000000 +0200
+++ xorg-x11/FILES 2006-03-30 15:40:38.000000000 +0200
@@ -156,3 +156,5 @@
- fixed invalid free() in setxkbmap (Bug #71244)
p_mappciBIOS_complete.diff [KEEP?]
- fixes system hang (IERR on PCI bus) on Dell machines (Bug #151644)
+p_x86_renderinit.diff [KEEP?]
+- should fix the Xrender related segfault (Bug #152730, comment #39)
++++++ p_x86_renderinit.diff ++++++
Index: programs/Xserver/render/picture.c
===================================================================
RCS file: /cvs/xorg/xserver/xorg/render/picture.c,v
retrieving revision 1.20
diff -u -p -r1.20 programs/Xserver/picture.c
--- programs/Xserver/render/picture.c 9 Dec 2005 18:35:21 -0000 1.20
+++ programs/Xserver/render/picture.c 30 Mar 2006 10:51:28 -0000
@@ -975,6 +975,7 @@ static PicturePtr createSourcePicture(vo
pPicture = (PicturePtr) xalloc(sizeof(PictureRec));
pPicture->pDrawable = 0;
pPicture->pFormat = 0;
+ pPicture->format = PICT_a8r8g8b8; /* FIXME: is this right? */
pPicture->pNext = 0;
SetPictureToDefaults(pPicture);
++++++ xdm.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/GiveDevices new/GiveDevices
--- old/GiveDevices 2004-08-19 17:39:39.000000000 +0200
+++ new/GiveDevices 2006-03-31 11:38:04.000000000 +0200
@@ -12,7 +12,7 @@
#
if test -c /dev/tty0 && type -p showconsole > /dev/null 2>&1 ; then
- device="`showconsole < /dev/tty0 2>/dev/null`"
+ device="`(showconsole < /dev/tty0) 2>/dev/null`"
if test -n "$device" -a -c "$device" ; then
chown ${USER}:tty "$device"
chmod 620 "$device"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/TakeDevices new/TakeDevices
--- old/TakeDevices 2004-08-19 17:41:14.000000000 +0200
+++ new/TakeDevices 2006-03-31 11:37:33.000000000 +0200
@@ -11,7 +11,7 @@
#
if test -c /dev/tty0 && type -p showconsole > /dev/null 2>&1 ; then
- device="`showconsole < /dev/tty0 2>/dev/null`"
+ device="`(exec showconsole < /dev/tty0) 2>/dev/null`"
if test -n "$device" -a -c "$device" ; then
chown root:tty "$device"
chmod 620 "$device"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xsetup new/Xsetup
--- old/Xsetup 2006-02-13 11:32:26.000000000 +0100
+++ new/Xsetup 2006-03-31 11:54:41.000000000 +0200
@@ -17,18 +17,6 @@
set +e &> /dev/null
#
-# Check if the machine is a TabletPC and start
-# xvkbd in xdm do be able to input username and password
-#
-( export HOME=/root;
- /usr/bin/hal-find-by-property --key system.formfactor.subtype --string tabletpc
- if [ $? = 0 ]; then
- sleep 1;
- /usr/X11/bin/xvkbd -compact -geometry -0-0
- fi
-)&
-
-#
# Background picture for plain xdm:
# Store your preferred picture in XPM format (see xv(1) or ppm(5))
# You can run gzip on the file BackGround.xpm to save disk space.
@@ -69,6 +57,18 @@
xmessage=${BINDIR}/xmessage
xrdb=${BINDIR}/xrdb
backprg=${BINDIR}/BackGround
+ halporp=/usr/bin/hal-find-by-property
+ xvkbd=${BINDIR}/xvkbd
+
+#
+# Check if the machine is a TabletPC and start
+# xvkbd in xdm do be able to input username and password
+#
+$halporp --key system.formfactor.subtype --string tabletpc
+if test $? -eq 0 -a -x $xvkbd ; then
+ sleep 1
+ ( HOME=/root exec $xvkbd -compact -geometry -0-0 ) & echo $! > /var/run/xvkbd.pid
+fi
#
# Check if kdm is running
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Xstartup new/Xstartup
--- old/Xstartup 2006-03-13 17:08:14.000000000 +0100
+++ new/Xstartup 2006-03-31 11:54:52.000000000 +0200
@@ -14,21 +14,21 @@
BINDIR=/usr/X11R6/bin
xmessage=${BINDIR}/xmessage
NOLOGIN=/etc/nologin
+ halporp=/usr/bin/hal-find-by-property
+ xvkbd=${BINDIR}/xvkbd
no_exit_on_failed_exec=1
type shopt &> /dev/null && shopt -s execfail
set +e &> /dev/null
-
-# Check if the machine is a TabletPC and kill xdm
+#
+# Check if the machine is a TabletPC and kill xvkbd
# to avoid multiple start on user desktop
-( export HOME=/root;
- /usr/bin/hal-find-by-property --key system.formfactor.subtype --string tabletpc
- if [ $? = 0 ]; then
- killall -KILL xvkbd
- fi
-)&
-
+#
+$halporp --key system.formfactor.subtype --string tabletpc
+if test $? -eq 0 -a -x $xvkbd ; then
+ /sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
+fi
#
# The real user id
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xinitrc new/xinitrc
--- old/xinitrc 2006-03-13 02:58:27.000000000 +0100
+++ new/xinitrc 2006-03-31 11:34:02.000000000 +0200
@@ -26,20 +26,21 @@
#
# Run user xinit scripts.
#
-for SCRIPT in /etc/X11/xinit/xinitrc.d/*; do
- test -d $SCRIPT && continue
- case "$SCRIPT" in
- .svn) continue ;;
- *.rpm*) continue ;;
- *.swap) continue ;;
- *.bak) continue ;;
- *.orig) continue ;;
- \#*) continue ;;
- *~) continue ;;
+for script in /etc/X11/xinit/xinitrc.d/*; do
+ test -d $script && continue
+ test -x $script || continue
+ case "$script" in
+ .*) continue ;;
+ *.rpm*) continue ;;
+ *.swap) continue ;;
+ *.bak) continue ;;
+ *.orig) continue ;;
+ \#*) continue ;;
+ *~) continue ;;
esac
-
- $SCRIPT
+ $script
done
+unset script
#
# Source common code shared between the
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Fri Mar 31 15:53:11 CEST 2006.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-03-28 12:55:31.000000000 +0200
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2006-03-30 14:48:02.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Mar 30 15:03:25 CEST 2006 - sndirsch(a)suse.de
+
+- fixed radeon_dell.diff (Bug #138458, comment #52)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.IpOWsX/_old 2006-03-31 15:52:48.000000000 +0200
+++ /var/tmp/diff_new_pack.IpOWsX/_new 2006-03-31 15:52:48.000000000 +0200
@@ -20,7 +20,7 @@
Group: System/X11/Servers/XF86_4
Autoreqprov: on
Version: 6.9.0
-Release: 32
+Release: 33
Summary: Various X.Org video drivers
Requires: xorg-x11-server
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o
@@ -300,6 +300,8 @@
%endif
%changelog -n xorg-x11-driver-video
+* Thu Mar 30 2006 - sndirsch(a)suse.de
+- fixed radeon_dell.diff (Bug #138458, comment #52)
* Tue Mar 28 2006 - sndirsch(a)suse.de
- xorg-x11-ati-1_0_branch-060327.diff
* fixed loading of DRM module
++++++ radeon_dell.diff ++++++
--- /var/tmp/diff_new_pack.IpOWsX/_old 2006-03-31 15:52:49.000000000 +0200
+++ /var/tmp/diff_new_pack.IpOWsX/_new 2006-03-31 15:52:49.000000000 +0200
@@ -6,7 +6,7 @@
*/
+
for (i = 0; ppModeName[i] != NULL; i++) {
-+ if (info->IsDellServer)
++ if (info->ddc_mode)
+ break;
if (sscanf(ppModeName[i], "%dx%d", &width, &height) != 2) continue;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package xine-lib
checked in at Fri Mar 31 15:52:42 CEST 2006.
--------
--- xine-lib/xine-lib.changes 2006-03-16 16:03:57.000000000 +0100
+++ xine-lib/xine-lib.changes 2006-03-30 13:14:19.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 30 13:13:02 CEST 2006 - mhopf(a)suse.de
+
+- Fix for #157854: Check for mad and ffmpeg before advertizing mp3.
+- Improved fix for shared images, but not shared pixmaps.
+
+-------------------------------------------------------------------
New:
----
xine-lib-demuxcheckfor_mad_ffmpeg.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-lib.spec ++++++
--- /var/tmp/diff_new_pack.PZ2rla/_old 2006-03-31 15:52:13.000000000 +0200
+++ /var/tmp/diff_new_pack.PZ2rla/_new 2006-03-31 15:52:13.000000000 +0200
@@ -15,7 +15,7 @@
%define DISTRIBUTABLE 1
Summary: Video Player with Plug-Ins
Version: 1.1.1
-Release: 12
+Release: 14
%define libversion 1.1.1
%define uiversion 0.99.4
Obsoletes: xine
@@ -42,6 +42,7 @@
Patch14: xine-lib-accel-ppc-cache32.diff
Patch15: xine-lib-alsa-resume-fix.diff
Patch16: xine-lib-faad-x86_64.diff
+Patch17: xine-lib-demuxcheckfor_mad_ffmpeg.diff
Patch100: xine-ui.diff
Patch102: vdr-xine-ui-0.7.6.diff
Patch103: xine-ui-fix-gcc-warnings.diff
@@ -109,7 +110,7 @@
Group: Productivity/Multimedia/Video/Players
Provides: xine:/usr/bin/xine
Version: 0.99.4
-Release: 20
+Release: 22
Autoreqprov: on
%description -n xine-ui
@@ -129,15 +130,15 @@
Guenter Bartsch <guenter(a)sourceforge.net>
%package -n xine-extra
-Summary: Xine Plug-In for Unencrypted DVDs
+Summary: optional Xine plugins
Group: Productivity/Multimedia/Video/Players
Requires: xine-lib = %libversion
Autoreqprov: on
%description -n xine-extra
-With this Xine plug-in, you can watch unencrypted DVDs using Xine. More
-information about Xine plug-ins can be found at
-http://xine.sourceforge.net/
+The package contains less often needed xine plugins with extra
+dependencies. For example to use aRts or esd autio output or visual
+output via SDL or aalib.
@@ -179,12 +180,13 @@
%patch14
%patch15
%patch16
+%patch17
(cd ../xine-ui-%{uiversion}
%patch100
%patch102 -p1
%patch103 -p1
%patch104
-%patch105
+%patch105 -p1
)
libtoolize --force
%if %suse_version > 820
@@ -519,6 +521,9 @@
/usr/include/xine.h
%changelog -n xine-lib
+* Thu Mar 30 2006 - mhopf(a)suse.de
+- Fix for #157854: Check for mad and ffmpeg before advertizing mp3.
+- Improved fix for shared images, but not shared pixmaps.
* Thu Mar 16 2006 - mhopf(a)suse.de
- Really fixed #132749: crippled xine URL was no longer valid.
Missed text in one of the patches.
++++++ xine-lib-demuxcheckfor_mad_ffmpeg.diff ++++++
diff -ur ../xine-lib-1.1.1-orig/src/xine-engine/load_plugins.c ./src/xine-engine/load_plugins.c
--- ../xine-lib-1.1.1-orig/src/xine-engine/load_plugins.c 2005-09-19 18:14:02.000000000 +0200
+++ ./src/xine-engine/load_plugins.c 2006-03-28 12:52:37.000000000 +0200
@@ -2258,11 +2258,21 @@
int len, pos;
plugin_node_t *node;
char *str;
+ int havempgdecoder = 0;
+ const char * const * p;
+
pthread_mutex_lock (&catalog->lock);
- /* calc length of output */
+ _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]);
+ for (p = catalog->ids; p && *p; p++) {
+ if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) {
+ havempgdecoder = 1;
+ break;
+ }
+ }
+ /* calc length of output */
len = 0;
node = xine_list_first_content (catalog->plugin_lists[PLUGIN_DEMUX - 1]);
while (node) {
@@ -2273,7 +2283,8 @@
cls = (demux_class_t *)node->plugin_class;
- if((exts = cls->get_extensions(cls)) && strlen(exts))
+ if((exts = cls->get_extensions(cls)) && strlen(exts) &&
+ (havempgdecoder || !strstr (exts, "mp3")))
len += strlen(exts) + 1;
}
node = xine_list_next_content (catalog->plugin_lists[PLUGIN_DEMUX - 1]);
@@ -2293,7 +2304,8 @@
cls = (demux_class_t *)node->plugin_class;
- if((e = cls->get_extensions (cls)) && strlen(e)) {
+ if((e = cls->get_extensions (cls)) && strlen(e) &&
+ (havempgdecoder || !strstr (e, "mp3"))) {
l = strlen(e);
memcpy (&str[pos], e, l);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package vlna
checked in at Fri Mar 31 15:51:02 CEST 2006.
--------
--- vlna/vlna.changes 2006-01-25 21:42:41.000000000 +0100
+++ vlna/vlna.changes 2006-03-30 15:36:09.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Mar 30 14:24:36 CEST 2006 - sbrabec(a)suse.cz
+
+- Provide locale(tetex:cs;sk) (#161867).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vlna.spec ++++++
--- /var/tmp/diff_new_pack.pA4CH8/_old 2006-03-31 15:50:35.000000000 +0200
+++ /var/tmp/diff_new_pack.pA4CH8/_new 2006-03-31 15:50:35.000000000 +0200
@@ -5,7 +5,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
@@ -13,13 +13,16 @@
Name: vlna
Summary: Add non-breakable spaces to Czech text files
Version: 1.2
-Release: 176
+Release: 182
Source: %{name}-%{version}.tar.bz2
Patch: %{name}-%{version}.diff
URL: ftp://math.feld.cvut.cz/pub/olsak/vlna
License: Contact author, Other License(s), see package
Group: Productivity/Publishing/TeX/Utilities
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# better would be (161867#c15):
+#Enhances: locale(tetex:cs;sk)
+Provides: locale(tetex:cs;sk)
%description
Vlna adds non-breakable spaces instead of normal ones after
@@ -53,6 +56,8 @@
%attr(0644,root,root) /usr/share/man/man1/vlna.1.gz
%changelog -n vlna
+* Thu Mar 30 2006 - sbrabec(a)suse.cz
+- Provide locale(tetex:cs;sk) (#161867).
* Wed Jan 25 2006 - mls(a)suse.de
- converted neededforbuild to BuildRequires
* Sun Jan 15 2006 - schwab(a)suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0