Hello community,
here is the log from the commit of package yast2
checked in at Mon Jan 28 16:49:20 CET 2008.
--------
--- yast2/yast2.changes 2008-01-27 21:28:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-01-28 16:44:38.475530000 +0100
@@ -1,0 +2,18 @@
+Mon Jan 28 16:28:34 CET 2008 - locilka@suse.cz
+
+- Adjusted SCR agent for SuSEfirewall2 sysconfig file. Values can
+ use also single quotes, not only double-quotes (bnc#327565).
+
+-------------------------------------------------------------------
+Mon Jan 28 13:14:13 CET 2008 - locilka@suse.cz
+
+- Removing useless Wizard() calls in ProductControl to minimize the
+ Wizard redrawing.
+
+-------------------------------------------------------------------
+Mon Jan 28 13:00:19 CET 2008 - aschnell@suse.de
+
+- support Qt and Gtk frontend in startup scripts
+- 2.16.24
+
+-------------------------------------------------------------------
@@ -43 +61 @@
-- Re-enabled threading in ncurses UI (bug #164999, FaTE #301899)
+- Re-enabled threading in ncurses UI (bug #164999, FaTE #301899)
@@ -56 +74 @@
-- remove ocurrences of deprecated NetworkInterfaces::device_name
+- remove ocurrences of deprecated NetworkInterfaces::device_name
@@ -62 +80 @@
-- 2.16.20
+- 2.16.20
@@ -91 +109 @@
-- NetworkDevices::CleanCacheRead() to reset and re-read
+- NetworkDevices::CleanCacheRead() to reset and re-read
@@ -93 +111 @@
-- NetworkDevices::GetDeviceTypes() - list of netcard devices for
+- NetworkDevices::GetDeviceTypes() - list of netcard devices for
@@ -97 +115 @@
-- 2.16.18
+- 2.16.18
@@ -134 +152 @@
-- Dropped obsolete --noborder option for /sbin/yast2
+- Dropped obsolete --noborder option for /sbin/yast2
@@ -163 +181 @@
-- 2.16.15
+- 2.16.15
@@ -168 +186 @@
-- Require yast2-core >= 2.16.10 in .spec
+- Require yast2-core >= 2.16.10 in .spec
@@ -186 +204 @@
-- 2.16.12
+- 2.16.12
@@ -233 +251 @@
-- 2.16.9
+- 2.16.9
@@ -315 +333 @@
- to the user (#309452)
+ to the user (#309452)
@@ -327 +345 @@
-- Fixed Provides list (#309420)
+- Fixed Provides list (#309420)
@@ -402 +420 @@
-- add filter and log for output of NetworkDevices::List() (#303858)
+- add filter and log for output of NetworkDevices::List() (#303858)
@@ -419 +437 @@
-- 2.15.48
+- 2.15.48
@@ -473 +491 @@
-- 2.15.41
+- 2.15.41
@@ -521 +539 @@
- (#285178)
+ (#285178)
@@ -541 +559 @@
- (FaTE #301893))
+ (FaTE #301893))
@@ -546 +564 @@
-- fixed CheckDomain function - allow "." character at the end
+- fixed CheckDomain function - allow "." character at the end
@@ -548 +566 @@
-- 2.15.36
+- 2.15.36
@@ -569 +587 @@
-- 2.15.35
+- 2.15.35
@@ -575 +593 @@
-
+
@@ -592 +610 @@
- after yast module has exited (mvidner's patch for #265263)
+ after yast module has exited (mvidner's patch for #265263)
@@ -611 +629 @@
- sysfs instead) so that yast2 does not require ethtool (#256382)
+ sysfs instead) so that yast2 does not require ethtool (#256382)
@@ -650 +668 @@
-- 2.15.31
+- 2.15.31
@@ -662 +680 @@
-- 2.15.30
+- 2.15.30
@@ -726 +744 @@
-- 2.15.23
+- 2.15.23
@@ -800 +818 @@
-- 2.15.19
+- 2.15.19
@@ -822 +840 @@
-- 2.15.17
+- 2.15.17
@@ -879 +897 @@
- root, show notify popup and list only the modules that do not need
+ root, show notify popup and list only the modules that do not need
@@ -1000 +1018 @@
- cases run appropriate module in Qt(Gtk)
+ cases run appropriate module in Qt(Gtk)
@@ -1014 +1032 @@
-- 2.15.4
+- 2.15.4
@@ -1025 +1043 @@
-- #237353 - use cache to avoid multiple confirmations for the same purpose
+- #237353 - use cache to avoid multiple confirmations for the same purpose
@@ -1044 +1062 @@
-- Avoid displaying empty strings in NetworkPopup (#220813, #223498)
+- Avoid displaying empty strings in NetworkPopup (#220813, #223498)
@@ -1049 +1067 @@
-- add bond device
+- add bond device
@@ -1097 +1115 @@
-- Adapt ncurses menu.ycp for running yast modules as separate
+- Adapt ncurses menu.ycp for running yast modules as separate
@@ -1121 +1139 @@
-- 2.14.13
+- 2.14.13
@@ -1150 +1168 @@
-- 2.14.9
+- 2.14.9
@@ -1272 +1290 @@
- upon request at all-hands meeting 2006-08-29
+ upon request at all-hands meeting 2006-08-29
@@ -1321 +1339 @@
-- Added new Address::CheckMAC() and Address::ValidMAC() functions.
+- Added new Address::CheckMAC() and Address::ValidMAC() functions.
@@ -1472 +1490 @@
-- 2.13.59
+- 2.13.59
@@ -1525 +1543 @@
-- 2.13.53
+- 2.13.53
@@ -1555 +1573 @@
-- restart online update if there are some selected patches left to
+- restart online update if there are some selected patches left to
@@ -1587 +1605 @@
-- Fixed bug #116356: save_y2logs saves into a different directory
+- Fixed bug #116356: save_y2logs saves into a different directory
@@ -1741 +1759 @@
-- 2.13.28
+- 2.13.28
@@ -1778 +1796 @@
-- 2.13.26
+- 2.13.26
@@ -1870 +1888 @@
-- Dropped Require.ycp, long time obsolete library
+- Dropped Require.ycp, long time obsolete library
@@ -1901 +1919 @@
-- 2.13.16
+- 2.13.16
@@ -1914 +1932 @@
-- 2.13.14
+- 2.13.14
@@ -1998 +2016 @@
-
+
@@ -2130 +2148 @@
- GetDefaultValue() function for undefined and newly also for
+ GetDefaultValue() function for undefined and newly also for
@@ -2144 +2162 @@
-- 2.12.24
+- 2.12.24
@@ -2184 +2202 @@
-- added comments for translators
+- added comments for translators
@@ -2260 +2278 @@
-- V 2.12.14
+- V 2.12.14
@@ -2297 +2315 @@
-- V 2.12.10
+- V 2.12.10
@@ -2304 +2322 @@
-- V 2.12.9
+- V 2.12.9
@@ -2310 +2328 @@
-- 2.12.8
+- 2.12.8
@@ -2329 +2347 @@
- a client in XML format)
+ a client in XML format)
@@ -2413 +2431 @@
-- 2.12.1
+- 2.12.1
@@ -2430 +2448 @@
- (#73612)
++++ 52 more lines (skipped)
++++ between yast2/yast2.changes
++++ and /mounts/work_src_done/STABLE/yast2/yast2.changes
Old:
----
yast2-2.16.23.tar.bz2
New:
----
yast2-2.16.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.m17994/_old 2008-01-28 16:48:43.000000000 +0100
+++ /var/tmp/diff_new_pack.m17994/_new 2008-01-28 16:48:43.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.23)
+# spec file for package yast2 (Version 2.16.24)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.16.23
-Release: 5
+Version: 2.16.24
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.23.tar.bz2
+Source0: yast2-2.16.24.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -129,7 +129,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.23
+%setup -n yast2-2.16.24
%build
%{prefix}/bin/y2tool y2autoconf
@@ -234,6 +234,15 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Mon Jan 28 2008 locilka@suse.cz
+- Adjusted SCR agent for SuSEfirewall2 sysconfig file. Values can
+ use also single quotes, not only double-quotes (bnc#327565).
+* Mon Jan 28 2008 locilka@suse.cz
+- Removing useless Wizard() calls in ProductControl to minimize the
+ Wizard redrawing.
+* Mon Jan 28 2008 aschnell@suse.de
+- support Qt and Gtk frontend in startup scripts
+- 2.16.24
* Sun Jan 27 2008 coolo@suse.de
- fixing changelog
* Thu Jan 24 2008 mzugec@suse.cz
@@ -1160,7 +1169,7 @@
* Mon Mar 13 2006 jsuchome@suse.cz
- fixed long buttons (#157420)
- 2.13.36
-* Fri Mar 10 2006 jsrain@suse.de
+* Sat Mar 11 2006 jsrain@suse.de
- store all installation options in /etc/YaST2/Productfeatures
(#156388)
- 2.13.35
@@ -1930,12 +1939,12 @@
* Tue Aug 17 2004 jsrain@suse.cz
- fixed function type casting in Table/Popup routines
- prevent 'usbhid' module from being added to initrd (#36766)
-* Mon Aug 16 2004 nashif@suse.de
+* Tue Aug 17 2004 nashif@suse.de
- fixed testsuites (added Testsuite.ycp to testedfiles or modified output
according to the change of logging function references) (jsrain)
- type cast fixes
- CWM: fixed structure validation
-* Thu Aug 12 2004 nashif@suse.de
+* Fri Aug 13 2004 nashif@suse.de
- Disable Commandline interface during firstboot phase
- 2.10.7
* Tue Aug 03 2004 jsrain@suse.cz
@@ -2562,7 +2571,7 @@
- 2.6.34
* Tue Sep 10 2002 arvin@suse.de
- added provide/obsolete y2t_menu (bug #19325)
-* Sat Sep 07 2002 arvin@suse.de
+* Sun Sep 08 2002 arvin@suse.de
- added help text in y2menu
* Thu Sep 05 2002 arvin@suse.de
- wizard loads it's images from the theme dir
@@ -2936,14 +2945,14 @@
* Wed Mar 13 2002 tom@suse.de
- (#14885) Now writing "/dev/mouse" into XF86Config so xmset works in the
running system.
+* Wed Mar 13 2002 nashif@suse.de
+- Don't probe hardware in Mode::config
* Wed Mar 13 2002 fehr@suse.de
- prevent upward rounding in combination of
ByteToHumanString/kmgt_str_to_byte (#14673)
* Wed Mar 13 2002 tom@suse.de
- (#14446) Now also restoring hwclock-param from sysconfig
and setting timezone again in continue mode.
-* Wed Mar 13 2002 nashif@suse.de
-- Don't probe hardware in Mode::config
* Wed Mar 13 2002 kkaempf@suse.de
- Fix locale for greek (ISO8859-7 -> ISO-8859-7, #14898).
- Set "acpismp=force" for UP and SMP systems if "ht" flag detected (#13531).
@@ -3442,11 +3451,11 @@
- include/packages added in specfile
* Tue Jan 22 2002 schubi@suse.de
- Saving user package selections
-* Mon Jan 21 2002 schubi@suse.de
-- bufixes in installing packages after reboot
* Mon Jan 21 2002 nashif@suse.de
- Skip confirmation(inst_doit) in autoinst mode
if requested in control file
+* Mon Jan 21 2002 schubi@suse.de
+- bufixes in installing packages after reboot
* Fri Jan 18 2002 kkaempf@suse.de
- more agents moved here.
- Fixed initrd creation, corrected module order.
@@ -4156,7 +4165,7 @@
* Thu May 17 2001 kkaempf@suse.de
- dont pretend that no other os has been found if we can't
write LILO to floppy disk.
-* Wed May 16 2001 sh@suse.de
+* Thu May 17 2001 sh@suse.de
- V 2.3.90
added patch_lilo_conf to file list
* Wed May 16 2001 sh@suse.de
++++++ yast2-2.16.23.tar.bz2 -> yast2-2.16.24.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/configure new/yast2-2.16.24/configure
--- old/yast2-2.16.23/configure 2008-01-22 15:52:15.000000000 +0100
+++ new/yast2-2.16.24/configure 2008-01-28 13:18:59.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2 2.16.23.
+# Generated by GNU Autoconf 2.61 for yast2 2.16.24.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.16.23'
-PACKAGE_STRING='yast2 2.16.23'
+PACKAGE_VERSION='2.16.24'
+PACKAGE_STRING='yast2 2.16.24'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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.16.23 to adapt to many kinds of systems.
+\`configure' configures yast2 2.16.24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.16.23:";;
+ short | recursive ) echo "Configuration of yast2 2.16.24:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.16.23
+yast2 configure 2.16.24
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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.16.23, which was
+It was created by yast2 $as_me 2.16.24, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.16.23'
+ VERSION='2.16.24'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.16.23"
+VERSION="2.16.24"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3412,7 +3412,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.16.23, which was
+This file was extended by yast2 $as_me 2.16.24, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3455,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.16.23
+yast2 config.status 2.16.24
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/configure.in new/yast2-2.16.24/configure.in
--- old/yast2-2.16.23/configure.in 2008-01-22 15:52:08.000000000 +0100
+++ new/yast2-2.16.24/configure.in 2008-01-28 13:18:55.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.23, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.24, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.23"
+VERSION="2.16.24"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/library/control/src/ProductControl.ycp new/yast2-2.16.24/library/control/src/ProductControl.ycp
--- old/yast2-2.16.23/library/control/src/ProductControl.ycp 2008-01-22 15:51:57.000000000 +0100
+++ new/yast2-2.16.24/library/control/src/ProductControl.ycp 2008-01-28 15:27:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Product Control routines
* Authors: Anas Nashif
*
- * $Id: ProductControl.ycp 41385 2007-10-11 13:37:27Z locilka $
+ * $Id: ProductControl.ycp 43942 2008-01-28 12:16:51Z locilka $
*/
{
textdomain "base";
@@ -536,7 +536,6 @@
});
UI::WizardCommand(`SetCurrentStep( first_id ) );
- return;
}
@@ -551,8 +550,9 @@
UI::WizardCommand(`DeleteSteps());
AddWizardSteps( stagemode );
- UI::WizardCommand(`UpdateSteps());
- UI::WizardCommand(`SetCurrentStep( CurrentWizardStep ) );
+ // AddWizardSteps sets the current step itself (which also updates the Wizard)
+ // UI::WizardCommand(`SetCurrentStep( CurrentWizardStep ) );
+ // UI::WizardCommand(`UpdateSteps());
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/library/modules/Version.ycp new/yast2-2.16.24/library/modules/Version.ycp
--- old/yast2-2.16.23/library/modules/Version.ycp 2008-01-22 15:52:28.000000000 +0100
+++ new/yast2-2.16.24/library/modules/Version.ycp 2008-01-28 13:19:10.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.23";
+global string yast2 = "2.16.24";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/library/network/agents/cfg_firewall2.scr new/yast2-2.16.24/library/network/agents/cfg_firewall2.scr
--- old/yast2-2.16.23/library/network/agents/cfg_firewall2.scr 2008-01-22 15:51:58.000000000 +0100
+++ new/yast2-2.16.24/library/network/agents/cfg_firewall2.scr 2008-01-28 12:55:29.000000000 +0100
@@ -17,7 +17,7 @@
* // Don't forget to write nil to sync the settings!
* Write(.sysconfig.SuSEfirewall2, nil)
*
- * $Id: cfg_firewall2.scr 33164 2006-09-27 08:42:24Z jsrain $
+ * $Id: cfg_firewall2.scr 43934 2008-01-28 09:29:23Z locilka $
*
* Read/Sets the values defined in /etc/sysconfig/SuSEfirewall2
* in an easy manner.
@@ -36,6 +36,11 @@
"match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ],
"multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ],
],
+ // also single quotes, bnc#327565
+ $[
+ "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)'", "%s=\"%s\"" ],
+ "multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)", "([^\']*)'", ],
+ ],
$[
"match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$", "%s=\"%s\"",],
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/library/wizard/src/Wizard.ycp new/yast2-2.16.24/library/wizard/src/Wizard.ycp
--- old/yast2-2.16.23/library/wizard/src/Wizard.ycp 2008-01-22 15:51:59.000000000 +0100
+++ new/yast2-2.16.24/library/wizard/src/Wizard.ycp 2008-01-28 15:27:37.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Wizard dialog
* Authors: Stefan Hundhammer
*
- * $Id: Wizard.ycp 42451 2007-11-27 14:56:43Z sh-sh-sh $
+ * $Id: Wizard.ycp 43947 2008-01-28 14:12:19Z locilka $
*
* Provides the wizard dialog (common screen for all YaST2 installation
* modules) and functions to set the contents, to replace and restore
@@ -1081,7 +1081,11 @@
{
if ( UI::WizardCommand(`ShowReleaseNotesButton( label, id ) ) == false )
{
- UI::ReplaceWidget (`id (`back_rep), `PushButton (`id (id), label));
+ if (UI::WidgetExists (`id (`back_rep))) {
+ UI::ReplaceWidget (`id (`back_rep), `PushButton (`id (id), label));
+ } else {
+ y2error ("Widget `back_rep does not exist");
+ }
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/Makefile.in new/yast2-2.16.24/Makefile.in
--- old/yast2-2.16.23/Makefile.in 2008-01-22 15:52:25.000000000 +0100
+++ new/yast2-2.16.24/Makefile.in 2008-01-28 13:19:08.000000000 +0100
@@ -511,10 +511,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -541,8 +537,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -699,10 +693,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/scripts/yast2 new/yast2-2.16.24/scripts/yast2
--- old/yast2-2.16.23/scripts/yast2 2008-01-22 15:52:00.000000000 +0100
+++ new/yast2-2.16.24/scripts/yast2 2008-01-28 10:50:48.000000000 +0100
@@ -6,6 +6,7 @@
# Authors: Mathias Kettner
# Klaus Kaempf
# Ludwig Nussel
+# Arvin Schnell
#
# This script is called when the user just types 'yast2'. It starts
# the qt user interface in case the DISPLAY variable is set and other-
@@ -16,7 +17,7 @@
# allow for a different prefix
mydir=${0%/[YyZz]a[Ss][Tt]*}
-if [ -z "$mydir" -o "$mydir" = "/sbin" ]; then
+if [ -z "$mydir" -o "$mydir" = "/sbin" ]; then
YAST_PREFIX=/usr
else
YAST_PREFIX=${mydir%/sbin}
@@ -57,7 +58,7 @@
# --fullscreen
# --noborder
# well also for gtk and ncurses
-Y2QT_ARGS=""
+Y2UI_ARGS=""
GNOME_SHELL="$ybindir/y2controlcenter-gnome"
KDE_SHELL="$ybindir/y2controlcenter"
@@ -151,7 +152,7 @@
probe_desktop_gui
WANTED_GUI=$DESKTOP_GUI
fi
-
+
if [ "$WANTED_GUI" = "gtk" ]; then
if check_gtk; then
SELECTED_GUI=gtk
@@ -188,9 +189,9 @@
-i|--install) Y2_INSTALL_PACKAGES=true; shift ;;
--update) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--update; shift ;;
--remove) Y2_INSTALL_PACKAGES=true; Y2_INSTALL_ACTION=--remove; shift ;;
- --fullscreen) Y2QT_ARGS="$Y2QT_ARGS --fullscreen"; shift ;;
- --noborder) Y2QT_ARGS="$Y2QT_ARGS --noborder" ; shift ;;
- --kcontrol) Y2QT_ARGS="$Y2QT_ARGS --kcontrol_id YaST" ; shift ;;
+ --fullscreen) Y2UI_ARGS="$Y2UI_ARGS --fullscreen"; shift ;;
+ --noborder) Y2UI_ARGS="$Y2UI_ARGS --noborder" ; shift ;;
+ --kcontrol) Y2UI_ARGS="$Y2UI_ARGS --kcontrol_id YaST" ; shift ;;
--qt) CMDLINE_UI="qt" ; shift ;;
--gtk) CMDLINE_UI="gtk" ; shift ;;
--ncurses) unset DISPLAY ; shift ;;
@@ -363,13 +364,13 @@
fi
# this fixes launching of interactive subprocesses, #150799
- #Y2QT_ARGS="$Y2QT_ARGS --nothreads"
- #uncomment the above line if anything in TUI breaks ;-)
+ #Y2UI_ARGS="$Y2UI_ARGS --nothreads"
+ #uncomment the above line if anything in TUI breaks ;-)
#threads are welcomed back in ncurses frontend (F#301899)
# set color theme, if defined
if [ ! -z "$Y2NCURSES_COLOR_THEME" ]; then
- export Y2NCURSES_COLOR_THEME="$Y2NCURSES_COLOR_THEME"
+ export Y2NCURSES_COLOR_THEME="$Y2NCURSES_COLOR_THEME"
fi
else
@@ -379,7 +380,10 @@
fi
# quick hack: treat gtk like qt
elif [ "$SELECTED_GUI" = "qt" -o "$SELECTED_GUI" = "gtk" ]; then
- set_qt_home_dir
+
+ if [ "$SELECTED_GUI" = "qt" ]; then
+ set_qt_home_dir
+ fi
# find which control center shell we want, if there is none we
# fall back to the built-in ycp menu
@@ -401,9 +405,9 @@
# matching "*/", leaving only the last path name component.
if [ $module == "sw_single" ] ; then
- case "$Y2QT_ARGS" in
+ case "$Y2UI_ARGS" in
*fullscreen*) ;;
- *) Y2QT_ARGS="$Y2QT_ARGS --fullscreen" ;;
+ *) Y2UI_ARGS="$Y2UI_ARGS --fullscreen" ;;
esac
fi
fi
@@ -415,7 +419,7 @@
# do it!
# $@ are args for ycp
if [ $module == "menu" -a -f "$y2ccbin" ] ; then
- $y2ccbin $Y2QT_ARGS "$@"
+ $y2ccbin $Y2UI_ARGS "$@"
exit_code=$?
else
# loop while necessary
@@ -426,7 +430,7 @@
esac
# break out on errors, #343258
while [ $exit_code = 0 ]; do
- $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2QT_ARGS
+ $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2UI_ARGS
exit_code=$?
if [ -z "$REDO_FILE" -o ! -f "$REDO_FILE" ]; then
break
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/scripts/yast2-funcs new/yast2-2.16.24/scripts/yast2-funcs
--- old/yast2-2.16.23/scripts/yast2-funcs 2008-01-22 15:52:00.000000000 +0100
+++ new/yast2-2.16.24/scripts/yast2-funcs 2008-01-28 13:05:30.000000000 +0100
@@ -3,7 +3,7 @@
# Summary: Common functions for YaST2 start scripts
# Authors: Arvin Schnell
#
-# $Id: yast2-funcs 42417 2007-11-27 08:48:05Z mvidner $
+# $Id: yast2-funcs 43940 2008-01-28 12:05:29Z aschnell $
# allow for a different prefix
: ${YAST_PREFIX=/usr}
@@ -12,11 +12,6 @@
logdir=/var/log/YaST2
-# font for qt
-# obsolete, we should not need it anymore, adrian
-# Y2_XFONT="-gnu-unifont-medium-r-normal--16-160-75-75-p-80-iso10646-1"
-
-
#
# check if plugins are in lib or lib64 subdir and sets the variable
# plugindir accordingly
@@ -54,7 +49,7 @@
}
#
-# check if the qt plugin and all necessary libaries are present
+# check if the qt plugin and all necessary libraries are present
#
function check_qt()
{
@@ -62,7 +57,7 @@
}
#
-# check if the ncurses plugin and all necessary libaries are present
+# check if the gtk plugin and all necessary libraries are present
#
function check_gtk()
{
@@ -70,7 +65,7 @@
}
#
-# check if the ncurses plugin and all necessary libaries are present
+# check if the ncurses plugin and all necessary libraries are present
#
function check_ncurses()
{
@@ -94,7 +89,7 @@
if [ -z "$LANG" -a -r /etc/sysconfig/language ] ; then
. /etc/sysconfig/language
if [ -n "$RC_LANG" ] ; then
- export LANG=$RC_LANG
+ export LANG=$RC_LANG
fi
fi
}
@@ -104,7 +99,7 @@
{
local user="$USER"
if [ "$KDESU_USER" ]; then
- user="$KDESU_USER"
+ user="$KDESU_USER"
fi
temp_QT_HOME_DIR="$( getent passwd $user | cut -d : -f 6)/.qt/"
if test -r "$temp_QT_HOME_DIR/qtrc"; then
@@ -116,7 +111,7 @@
function set_inst_qt_env()
{
export XCURSOR_THEME="DMZ"
- export QT_HOME_DIR="`eval echo /tmp/.qt/`"
+ export QT_HOME_DIR="/tmp/.qt/"
mkdir -p /tmp/.qt
[ -e /usr/share/desktop-data/qtrc ] && cp /usr/share/desktop-data/qtrc /tmp/.qt/
}
@@ -128,6 +123,18 @@
}
+function set_inst_gtk_env()
+{
+ export XCURSOR_THEME="DMZ"
+}
+
+
+function clr_inst_gtk_env()
+{
+ :
+}
+
+
### Local Variables: ***
### mode: shell-script ***
### End: ***
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.23/VERSION new/yast2-2.16.24/VERSION
--- old/yast2-2.16.23/VERSION 2008-01-22 15:51:57.000000000 +0100
+++ new/yast2-2.16.24/VERSION 2008-01-28 13:04:45.000000000 +0100
@@ -1 +1 @@
-2.16.23
+2.16.24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org