Hello community,
here is the log from the commit of package yast2-network
checked in at Mon Apr 14 20:43:30 CEST 2008.
--------
--- yast2-network/yast2-network.changes 2008-04-06 10:33:05.000000000 +0200
+++ yast2-network/yast2-network.changes 2008-04-14 17:57:44.709577000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 14 17:09:59 CEST 2008 - mzugec@suse.cz
+
+- install firmware for bcm4xx wireless (FaTE#302130)
+- 2.16.37
+
+-------------------------------------------------------------------
+Mon Apr 14 14:56:03 CEST 2008 - kmachalkova@suse.cz
+
+- Unified button labels (FaTE #120373), esp. in installation clients
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.16.36.tar.bz2
New:
----
yast2-network-2.16.37.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.ig4886/_old 2008-04-14 20:42:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ig4886/_new 2008-04-14 20:42:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.16.36)
+# spec file for package yast2-network (Version 2.16.37)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-network
-Version: 2.16.36
+Version: 2.16.37
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.16.36.tar.bz2
+Source0: yast2-network-2.16.37.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -26,11 +26,8 @@
BuildRequires: yast2-country
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2 >= 2.16.6
-# String::Random
-# Linuxrc::display_ip
-# SuSEFirewall::IsInstalled
-# NetworkDevices::GetDevTypeDescription
-Requires: yast2 >= 2.16.43
+# GetInstArgs::automatic_configuration
+Requires: yast2 >= 2.16.46
Requires: sysconfig yast2-packager
#GetLanguageCountry
#(in newly created yast2-country-data)
@@ -72,7 +69,7 @@
Michal Svec
%prep
-%setup -n yast2-network-2.16.36
+%setup -n yast2-network-2.16.37
%build
%{prefix}/bin/y2tool y2autoconf
@@ -135,8 +132,12 @@
%doc %{prefix}/share/doc/packages/yast2-network
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
-
%changelog
+* Mon Apr 14 2008 mzugec@suse.cz
+- install firmware for bcm4xx wireless (FaTE#302130)
+- 2.16.37
+* Mon Apr 14 2008 kmachalkova@suse.cz
+- Unified button labels (FaTE #120373), esp. in installation clients
* Fri Apr 04 2008 mzugec@suse.de
- fixed testsuite
* Fri Apr 04 2008 mzugec@suse.de
++++++ yast2-network-2.16.36.tar.bz2 -> yast2-network-2.16.37.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/aclocal.m4 new/yast2-network-2.16.37/aclocal.m4
--- old/yast2-network-2.16.36/aclocal.m4 2008-04-03 21:59:21.000000000 +0200
+++ new/yast2-network-2.16.37/aclocal.m4 2008-02-04 15:58:16.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,15 +11,12 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -34,7 +31,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -50,10 +47,8 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -146,13 +141,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -257,17 +252,16 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -504,7 +498,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/agents/Makefile.in new/yast2-network-2.16.37/agents/Makefile.in
--- old/yast2-network-2.16.36/agents/Makefile.in 2008-04-03 21:59:42.000000000 +0200
+++ new/yast2-network-2.16.37/agents/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/config.guess new/yast2-network-2.16.37/config.guess
--- old/yast2-network-2.16.36/config.guess 2008-04-03 21:59:41.000000000 +0200
+++ new/yast2-network-2.16.37/config.guess 2008-02-04 15:58:18.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-08'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -171,7 +171,6 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
- sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -340,7 +339,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -542,7 +541,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -791,7 +790,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- *:MINGW*:*)
+ i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -801,18 +800,12 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
- case ${UNAME_MACHINE} in
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
- esac ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -846,17 +839,10 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
- else
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
- fi
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -974,9 +960,6 @@
x86_64:Linux:*:*)
echo x86_64-${VENDOR}-linux-gnu
exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
- exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1235,15 +1218,6 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
- SX-7:SUPER-UX:*:*)
- echo sx7-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8:SUPER-UX:*:*)
- echo sx8-nec-superux${UNAME_RELEASE}
- exit ;;
- SX-8R:SUPER-UX:*:*)
- echo sx8r-nec-superux${UNAME_RELEASE}
- exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/config.sub new/yast2-network-2.16.37/config.sub
--- old/yast2-network-2.16.36/config.sub 2008-04-03 21:59:41.000000000 +0200
+++ new/yast2-network-2.16.37/config.sub 2008-02-04 15:58:18.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-16'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fido | fr30 | frv \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,14 +369,10 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
- basic_machine=$basic_machine-unknown
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -447,14 +443,6 @@
basic_machine=ns32k-sequent
os=-dynix
;;
- blackfin)
- basic_machine=bfin-unknown
- os=-linux
- ;;
- blackfin-*)
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -487,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16)
- basic_machine=cr16-unknown
+ cr16c)
+ basic_machine=cr16c-unknown
os=-elf
;;
crds | unos)
@@ -680,14 +668,6 @@
basic_machine=m68k-isi
os=-sysv
;;
- m68knommu)
- basic_machine=m68k-unknown
- os=-linux
- ;;
- m68knommu-*)
- basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -703,10 +683,6 @@
basic_machine=i386-pc
os=-mingw32
;;
- mingw32ce)
- basic_machine=arm-unknown
- os=-mingw32ce
- ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -833,14 +809,6 @@
basic_machine=i860-intel
os=-osf
;;
- parisc)
- basic_machine=hppa-unknown
- os=-linux
- ;;
- parisc-*)
- basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
pbd)
basic_machine=sparc-tti
;;
@@ -957,9 +925,6 @@
basic_machine=sh-hitachi
os=-hms
;;
- sh5el)
- basic_machine=sh5le-unknown
- ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1049,10 +1014,6 @@
basic_machine=tic6x-unknown
os=-coff
;;
- tile*)
- basic_machine=tile-unknown
- os=-linux-gnu
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1258,7 +1219,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1453,9 +1414,6 @@
m68*-cisco)
os=-aout
;;
- mep-*)
- os=-elf
- ;;
mips*-cisco)
os=-elf
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/configure new/yast2-network-2.16.37/configure
--- old/yast2-network-2.16.36/configure 2008-04-03 21:59:30.000000000 +0200
+++ new/yast2-network-2.16.37/configure 2008-02-04 15:58:17.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-network 2.16.35.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.16.21.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.16.35'
-PACKAGE_STRING='yast2-network 2.16.35'
+PACKAGE_VERSION='2.16.21'
+PACKAGE_STRING='yast2-network 2.16.21'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,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-network 2.16.35 to adapt to many kinds of systems.
+\`configure' configures yast2-network 2.16.21 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.16.35:";;
+ short | recursive ) echo "Configuration of yast2-network 2.16.21:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.16.35
+yast2-network configure 2.16.21
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,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-network $as_me 2.16.35, which was
+It was created by yast2-network $as_me 2.16.21, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.16.35'
+ VERSION='2.16.21'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.35"
+VERSION="2.16.21"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -2651,8 +2651,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.16.35, which was
+This file was extended by yast2-network $as_me 2.16.21, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.16.35
+yast2-network config.status 2.16.21
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-network-2.16.36/configure.in new/yast2-network-2.16.37/configure.in
--- old/yast2-network-2.16.36/configure.in 2008-04-03 21:59:08.000000000 +0200
+++ new/yast2-network-2.16.37/configure.in 2008-02-04 15:58:13.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-network, 2.16.35, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.16.21, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.35"
+VERSION="2.16.21"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/data/Makefile.in new/yast2-network-2.16.37/data/Makefile.in
--- old/yast2-network-2.16.36/data/Makefile.in 2008-04-03 21:59:42.000000000 +0200
+++ new/yast2-network-2.16.37/data/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/doc/autodocs/Makefile.in new/yast2-network-2.16.37/doc/autodocs/Makefile.in
--- old/yast2-network-2.16.36/doc/autodocs/Makefile.in 2008-04-03 21:59:42.000000000 +0200
+++ new/yast2-network-2.16.37/doc/autodocs/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/doc/Makefile.in new/yast2-network-2.16.37/doc/Makefile.in
--- old/yast2-network-2.16.36/doc/Makefile.in 2008-04-03 21:59:42.000000000 +0200
+++ new/yast2-network-2.16.37/doc/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -332,8 +332,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -358,8 +358,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -369,12 +369,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/install-sh new/yast2-network-2.16.37/install-sh
--- old/yast2-network-2.16.36/install-sh 2008-04-03 21:59:41.000000000 +0200
+++ new/yast2-network-2.16.37/install-sh 2008-02-04 15:58:18.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-12-25.00
+scriptversion=2006-10-14.15
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
+doit="${DOITPROG-}"
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,49 +58,34 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
- test "$posix_glob" != "?" || {
- if (set -f) 2>/dev/null; then
- posix_glob=
- else
- posix_glob=:
- fi
- }
-'
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
-chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
+chgrpcmd=
stripcmd=
-
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
src=
dst=
dir_arg=
-dst_arg=
-
-copy_on_change=false
+dstarg=
no_target_directory=
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -110,55 +95,65 @@
In the 4th, create DIRECTORIES.
Options:
- --help display this help and exit.
- --version display version info and exit.
-
- -c (ignored)
- -C install only if different (preserve the last data modification time)
- -d create directories instead of installing files.
- -g GROUP $chgrpprog installed files to GROUP.
- -m MODE $chmodprog installed files to MODE.
- -o USER $chownprog installed files to USER.
- -s $stripprog installed files.
- -t DIRECTORY install into DIRECTORY.
- -T report an error if DSTFILE is a directory.
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
- RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) ;;
-
- -C) copy_on_change=true;;
+ -c) shift
+ continue;;
- -d) dir_arg=true;;
+ -d) dir_arg=true
+ shift
+ continue;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift
+ shift
+ continue;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
+ shift
+ shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- shift;;
+ continue;;
-o) chowncmd="$chownprog $2"
- shift;;
-
- -s) stripcmd=$stripprog;;
-
- -t) dst_arg=$2
- shift;;
-
- -T) no_target_directory=true;;
+ shift
+ shift
+ continue;;
+
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
+
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
+
+ -T) no_target_directory=true
+ shift
+ continue;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -170,22 +165,21 @@
*) break;;
esac
- shift
done
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dst_arg"; then
+ if test -n "$dstarg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dst_arg"
+ set fnord "$@" "$dstarg"
shift # fnord
fi
shift # arg
- dst_arg=$arg
+ dstarg=$arg
done
fi
@@ -230,7 +224,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src;;
+ -*) src=./$src ;;
esac
if test -n "$dir_arg"; then
@@ -248,22 +242,22 @@
exit 1
fi
- if test -z "$dst_arg"; then
+ if test -z "$dstarg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dst_arg
+ dst=$dstarg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst;;
+ -*) dst=./$dst ;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dst_arg: Is a directory" >&2
+ echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -384,19 +378,26 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- -*) prefix='./';;
- *) prefix='';;
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
esac
- eval "$initialize_posix_glob"
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
oIFS=$IFS
IFS=/
- $posix_glob set -f
+ $posix_glob && set -f
set fnord $dstdir
shift
- $posix_glob set +f
+ $posix_glob && set +f
IFS=$oIFS
prefixes=
@@ -458,54 +459,41 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
- { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
- { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # If -C, don't bother to copy if it wouldn't change the file.
- if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
- eval "$initialize_posix_glob" &&
- $posix_glob set -f &&
- set X $old && old=:$2:$4:$5:$6 &&
- set X $new && new=:$2:$4:$5:$6 &&
- $posix_glob set +f &&
-
- test "$old" = "$new" &&
- $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
- then
- rm -f "$dsttmp"
- else
- # Rename the file to the real destination.
- $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
- {
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd -f "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- fi || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ } || exit 1
trap '' 0
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/Makefile.in new/yast2-network-2.16.37/Makefile.in
--- old/yast2-network-2.16.36/Makefile.in 2008-04-03 21:59:48.000000000 +0200
+++ new/yast2-network-2.16.37/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -389,8 +389,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -415,8 +415,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -426,12 +426,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/clients/dsl_proposal.ycp new/yast2-network-2.16.37/src/clients/dsl_proposal.ycp
--- old/yast2-network-2.16.36/src/clients/dsl_proposal.ycp 2008-03-10 11:56:40.000000000 +0100
+++ new/yast2-network-2.16.37/src/clients/dsl_proposal.ycp 2008-04-14 11:04:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: DSL configuration proposal
* Authors: Michal Svec
*
- * $Id: dsl_proposal.ycp 20958 2005-01-25 16:34:37Z mvidner $
+ * $Id: dsl_proposal.ycp 46138 2008-04-04 16:31:10Z locilka $
*/
{
@@ -19,6 +19,7 @@
import "DSL";
import "Popup";
import "Progress";
+import "GetInstArgs";
include "network/routines.ycp";
@@ -35,13 +36,15 @@
if(force_reset || !DSL::proposal_valid) {
DSL::proposal_valid = true;
- /* Popup text */
- BusyPopup(_("Detecting DSL devices..."));
+ if (! GetInstArgs::automatic_configuration())
+ /* Popup text */
+ BusyPopup(_("Detecting DSL devices..."));
boolean progress_orig = Progress::set (false);
DSL::Read();
DSL::Propose();
Progress::set (progress_orig);
- BusyPopupClose();
+ if (! GetInstArgs::automatic_configuration())
+ BusyPopupClose();
}
list sum = DSL::Summary(false);
proposal = sum[0]:"";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/clients/isdn_proposal.ycp new/yast2-network-2.16.37/src/clients/isdn_proposal.ycp
--- old/yast2-network-2.16.36/src/clients/isdn_proposal.ycp 2008-03-10 11:56:40.000000000 +0100
+++ new/yast2-network-2.16.37/src/clients/isdn_proposal.ycp 2008-04-14 11:04:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: ISDN configuration proposal
* Authors: Michal Svec
*
- * $Id: isdn_proposal.ycp 22792 2005-03-24 14:46:40Z mvidner $
+ * $Id: isdn_proposal.ycp 46138 2008-04-04 16:31:10Z locilka $
*/
{
@@ -18,6 +18,7 @@
import "ISDN";
import "Progress";
+import "GetInstArgs";
include "network/routines.ycp";
@@ -34,13 +35,15 @@
if(force_reset || !ISDN::proposal_valid) {
ISDN::proposal_valid = true;
- /* Popup text */
- BusyPopup(_("Detecting ISDN cards..."));
+ if (! GetInstArgs::automatic_configuration())
+ /* Popup text */
+ BusyPopup(_("Detecting ISDN cards..."));
boolean progress_orig = Progress::set (false);
ISDN::Read();
// no ISDN::Propose () ?
Progress::set (progress_orig);
- BusyPopupClose();
+ if (! GetInstArgs::automatic_configuration())
+ BusyPopupClose();
}
list sum = ISDN::Summary(false);
proposal = sum[0]:"";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/clients/lan_proposal.ycp new/yast2-network-2.16.37/src/clients/lan_proposal.ycp
--- old/yast2-network-2.16.36/src/clients/lan_proposal.ycp 2008-03-10 11:56:40.000000000 +0100
+++ new/yast2-network-2.16.37/src/clients/lan_proposal.ycp 2008-04-14 15:03:45.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec
*
- * $Id: lan_proposal.ycp 40330 2007-08-17 10:55:11Z mzugec $
+ * $Id: lan_proposal.ycp 46138 2008-04-04 16:31:10Z locilka $
*/
{
@@ -22,6 +22,8 @@
import "Popup";
import "Progress";
import "LanItems";
+import "GetInstArgs";
+
include "network/lan/wizards.ycp";
list args = WFM::Args();
@@ -39,15 +41,17 @@
if(force_reset || !LanItems::proposal_valid) {
LanItems::proposal_valid = true;
- /* Popup text */
- BusyPopup(_("Detecting network cards..."));
+ if (! GetInstArgs::automatic_configuration())
+ /* Popup text */
+ BusyPopup(_("Detecting network cards..."));
boolean progress_orig = Progress::set (false);
// NM wants us to repropose but while at it Lan::Read should not
// think it does a full reread and unset Lan::modified. #147270
Lan::Read (force_reset? `nocache: `cache);
Lan::Propose();
Progress::set (progress_orig);
- BusyPopupClose();
+ if (! GetInstArgs::automatic_configuration())
+ BusyPopupClose();
}
list sum = Lan::Summary("proposal");
proposal = sum[0]:"";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/clients/Makefile.in new/yast2-network-2.16.37/src/clients/Makefile.in
--- old/yast2-network-2.16.36/src/clients/Makefile.in 2008-04-03 21:59:43.000000000 +0200
+++ new/yast2-network-2.16.37/src/clients/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/clients/modem_proposal.ycp new/yast2-network-2.16.37/src/clients/modem_proposal.ycp
--- old/yast2-network-2.16.36/src/clients/modem_proposal.ycp 2008-03-10 11:56:40.000000000 +0100
+++ new/yast2-network-2.16.37/src/clients/modem_proposal.ycp 2008-04-14 11:04:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Modem configuration proposal
* Authors: Michal Svec
*
- * $Id: modem_proposal.ycp 20958 2005-01-25 16:34:37Z mvidner $
+ * $Id: modem_proposal.ycp 46138 2008-04-04 16:31:10Z locilka $
*/
{
@@ -19,6 +19,7 @@
import "Modem";
import "Popup";
import "Progress";
+import "GetInstArgs";
include "network/routines.ycp";
@@ -35,12 +36,14 @@
if(force_reset || !Modem::proposal_valid) {
Modem::proposal_valid = true;
- /* Popup text */
- BusyPopup(_("Detecting modems..."));
+ if (! GetInstArgs::automatic_configuration())
+ /* Popup text */
+ BusyPopup(_("Detecting modems..."));
boolean progress_orig = Progress::set (false);
Modem::Read();
// no Modem::Propose () ?
- Progress::set (progress_orig);
+ if (! GetInstArgs::automatic_configuration())
+ Progress::set (progress_orig);
BusyPopupClose();
}
list sum = Modem::Summary(false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/config/Makefile.in new/yast2-network-2.16.37/src/config/Makefile.in
--- old/yast2-network-2.16.36/src/config/Makefile.in 2008-04-03 21:59:43.000000000 +0200
+++ new/yast2-network-2.16.37/src/config/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/dsl/Makefile.in new/yast2-network-2.16.37/src/dsl/Makefile.in
--- old/yast2-network-2.16.36/src/dsl/Makefile.in 2008-04-03 21:59:43.000000000 +0200
+++ new/yast2-network-2.16.37/src/dsl/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/installation/Makefile.in new/yast2-network-2.16.37/src/installation/Makefile.in
--- old/yast2-network-2.16.36/src/installation/Makefile.in 2008-04-03 21:59:44.000000000 +0200
+++ new/yast2-network-2.16.37/src/installation/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/isdn/Makefile.in new/yast2-network-2.16.37/src/isdn/Makefile.in
--- old/yast2-network-2.16.36/src/isdn/Makefile.in 2008-04-03 21:59:44.000000000 +0200
+++ new/yast2-network-2.16.37/src/isdn/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/lan/complex.ycp new/yast2-network-2.16.37/src/lan/complex.ycp
--- old/yast2-network-2.16.36/src/lan/complex.ycp 2008-03-10 11:56:41.000000000 +0100
+++ new/yast2-network-2.16.37/src/lan/complex.ycp 2008-04-14 18:04:16.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec
*
- * $Id: complex.ycp 44025 2008-01-30 16:51:53Z kmachalkova $
+ * $Id: complex.ycp 46604 2008-04-14 15:11:16Z mzugec $
*/
{
@@ -128,8 +128,9 @@
}
}
*/
+ string fw = "";
if (LanItems::needFirmwareCurrentItem()){
- string fw = LanItems::GetFirmwareForCurrentItem();
+ fw = LanItems::GetFirmwareForCurrentItem();
if (fw != ""){
if ((!Package::Installed(fw) && !Package::Available(fw))){
Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from
@@ -155,6 +156,16 @@
if(LanItems::Requires != [] && LanItems::Requires != nil) {
if(PackagesInstall(LanItems::Requires) != `next)
return false;
+ if (fw=="b43-fwcutter"){
+ if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation it needs to execute install_bcm43xx_firmwar script. Should I execute it?"))){
+ map command = (map)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware");
+ y2internal("command %1", command);
+// Popup::ShowFile ("Boot Messages", "/tmp/bcm_firmware.log");
+// Popup::LongText(command["stdout"]:"");
+ if (command["exit"]:-1!=0) Popup::ErrorDetails(_("An error occured during installation."), command["stderr"]:"");
+ else Popup::Message("bcm43xx_firmware installed successfully");
+ }
+ }
}
/*
TODO: Refresh hwinfo in LanItems
@@ -411,7 +422,8 @@
/* Network setup method dialog caption */
"caption": _("Network Setup Method"),
"back_button" : Label::BackButton (),
- "next_button" : Label::AcceptButton (),
+ "abort_button" : Label::CancelButton (),
+ "next_button" : Label::OKButton (),
// #54027
"disable_buttons" : (["back_button"]),
"fallback_functions" : functions,
@@ -444,7 +456,10 @@
Wizard::SetContentsButtons(caption, contents, help, Label::BackButton (), Label::FinishButton ());
Wizard::DisableBackButton();
- if (Mode::installation()) Wizard::SetNextButton (`next, Label::AcceptButton());
+ if (Mode::installation()){
+ Wizard::SetNextButton (`next, Label::OKButton());
+ Wizard::SetAbortButton(`abort, Label::CancelButton());
+ }
symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]);
return ret;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/lan/Makefile.in new/yast2-network-2.16.37/src/lan/Makefile.in
--- old/yast2-network-2.16.36/src/lan/Makefile.in 2008-04-03 21:59:44.000000000 +0200
+++ new/yast2-network-2.16.37/src/lan/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/Makefile.in new/yast2-network-2.16.37/src/Makefile.in
--- old/yast2-network-2.16.36/src/Makefile.in 2008-04-03 21:59:42.000000000 +0200
+++ new/yast2-network-2.16.37/src/Makefile.in 2008-02-04 15:58:18.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -285,8 +285,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -311,8 +311,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -322,12 +322,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/modem/Makefile.in new/yast2-network-2.16.37/src/modem/Makefile.in
--- old/yast2-network-2.16.36/src/modem/Makefile.in 2008-04-03 21:59:45.000000000 +0200
+++ new/yast2-network-2.16.37/src/modem/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/modules/LanItems.ycp new/yast2-network-2.16.37/src/modules/LanItems.ycp
--- old/yast2-network-2.16.36/src/modules/LanItems.ycp 2008-04-01 17:05:38.000000000 +0200
+++ new/yast2-network-2.16.37/src/modules/LanItems.ycp 2008-04-14 18:04:16.000000000 +0200
@@ -151,7 +151,7 @@
"ipw3945" : "ipw-firmware",
"iwl3945" : "iwl3945-ucode",
"iwl4965" : "iwl4965-ucode",
- "bcm43xx" : "",
+ "bcm43xx" : "b43-fwcutter",
"prism54" : "",
"spectrum_cs" : "",
"zd1201" : "",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/modules/Makefile.in new/yast2-network-2.16.37/src/modules/Makefile.in
--- old/yast2-network-2.16.36/src/modules/Makefile.in 2008-04-03 21:59:45.000000000 +0200
+++ new/yast2-network-2.16.37/src/modules/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/provider/Makefile.in new/yast2-network-2.16.37/src/provider/Makefile.in
--- old/yast2-network-2.16.36/src/provider/Makefile.in 2008-04-03 21:59:45.000000000 +0200
+++ new/yast2-network-2.16.37/src/provider/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/remote/Makefile.in new/yast2-network-2.16.37/src/remote/Makefile.in
--- old/yast2-network-2.16.36/src/remote/Makefile.in 2008-04-03 21:59:46.000000000 +0200
+++ new/yast2-network-2.16.37/src/remote/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/routines/Makefile.in new/yast2-network-2.16.37/src/routines/Makefile.in
--- old/yast2-network-2.16.36/src/routines/Makefile.in 2008-04-03 21:59:46.000000000 +0200
+++ new/yast2-network-2.16.37/src/routines/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/routines/routines.ycp new/yast2-network-2.16.37/src/routines/routines.ycp
--- old/yast2-network-2.16.36/src/routines/routines.ycp 2008-04-01 00:59:14.000000000 +0200
+++ new/yast2-network-2.16.37/src/routines/routines.ycp 2008-04-14 18:04:16.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Miscellaneous routines
* Authors: Michal Svec
*
- * $Id: routines.ycp 45489 2008-03-15 11:33:17Z mzugec $
+ * $Id: routines.ycp 46604 2008-04-14 15:11:16Z mzugec $
*/
{
@@ -610,6 +610,8 @@
allcards = [];
}
+allcards=[$["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth1", "dev_names":["eth1"], "device":"79c970 [PCnet32 LANCE]", "device_id":73728, "driver":"bcm43xx", "driver_module":"bcm43xx", "drivers":[$["active":true, "modprobe":true, "modules":[["bcm43xx", ""]]]], "modalias":"pci:v00001022d00002000sv00001022sd00002000bc02sc00i00", "model":"AMD PCnet - Fast 79C971", "old_unique_key":"R3zE.g18wkxJX7ME", "resource":$["hwaddr":[$["addr":"08:00:27:80:b5:07"]], "io":[$["active":true, "length":32, "mode":"rw", "start":49248]], "irq":[$["count":0, "enabled":true, "irq":10]], "link":[$["state":true]], "mem":[$["active":true, "length":4096, "start":4034920448]]], "rev":"64", "slot_id":8, "sub_class_id":0, "sub_device":"PCnet - Fast 79C971", "sub_device_id":73728, "sub_vendor":"AMD", "sub_vendor_id":69666, "sysfs_bus_id":"0000:00:08.0", "sysfs_id":"/devices/pci0000:00/0000:00:08.0", "udi":"/org/freedesktop/Hal/devices/pci_1022_2000_0", "unique_key":"JNkJ.g18wkxJX7ME", "vendor":"AMD", "vendor_id":69666], $["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth0", "dev_names":["eth0"], "device":"79c970 [PCnet32 LANCE]", "device_id":73728, "driver":"pcnet32", "driver_module":"pcnet32", "drivers":[$["active":true, "modprobe":true, "modules":[["pcnet32", ""]]]], "modalias":"pci:v00001022d00002000sv00001022sd00002000bc02sc00i00", "model":"AMD PCnet - Fast 79C971", "old_unique_key":"Wkdv.g18wkxJX7ME", "resource":$["hwaddr":[$["addr":"08:00:27:b6:4a:d4"]], "io":[$["active":true, "length":32, "mode":"rw", "start":49184]], "irq":[$["count":2242394, "enabled":true, "irq":11]], "link":[$["state":true]], "mem":[$["active":true, "length":4096, "start":4026531840]]], "rev":"64", "slot_id":3, "sub_class_id":0, "sub_device":"PCnet - Fast 79C971", "sub_device_id":73728, "sub_vendor":"AMD", "sub_vendor_id":69666, "sysfs_bus_id":"0000:00:03.0", "sysfs_id":"/devices/pci0000:00/0000:00:03.0", "udi":"/org/freedesktop/Hal/devices/pci_1022_2000", "unique_key":"rBUF.g18wkxJX7ME", "vendor":"AMD", "vendor_id":69666]];
+
// #97540
string bms = (string)SCR::Read (.etc.install_inf.BrokenModules);
if (bms == nil) bms = "";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/src/services/Makefile.in new/yast2-network-2.16.37/src/services/Makefile.in
--- old/yast2-network-2.16.36/src/services/Makefile.in 2008-04-03 21:59:46.000000000 +0200
+++ new/yast2-network-2.16.37/src/services/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/testsuite/Makefile.in new/yast2-network-2.16.37/testsuite/Makefile.in
--- old/yast2-network-2.16.36/testsuite/Makefile.in 2008-04-03 21:59:47.000000000 +0200
+++ new/yast2-network-2.16.37/testsuite/Makefile.in 2008-02-04 15:58:19.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/testsuite/tests/Provider.out new/yast2-network-2.16.37/testsuite/tests/Provider.out
--- old/yast2-network-2.16.36/testsuite/tests/Provider.out 2008-03-10 11:56:42.000000000 +0100
+++ new/yast2-network-2.16.37/testsuite/tests/Provider.out 2008-04-14 11:04:51.000000000 +0200
@@ -7,5 +7,9 @@
Dir .sysconfig.network.providers.v."third": ["PROVIDER"]
Read .sysconfig.network.providers.v."third"."PROVIDER" "third one"
Read .target.yast2 "country.ycp" $["CZ":"Czech"]
+Log Provider::GetCountry ()
+Log Provider::Read ()
+Log Testsuite::Test (FUNCTION, INPUT, DEFAULT)
+Log TEST ({ return Provider::Read (); }, [READ, $[], EXEC], nil)
Dir .providers.s: ["CZ", "DE", "GB", "HU", "NL", "US"]
Return true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.36/VERSION new/yast2-network-2.16.37/VERSION
--- old/yast2-network-2.16.36/VERSION 2008-04-03 22:04:31.000000000 +0200
+++ new/yast2-network-2.16.37/VERSION 2008-04-14 18:04:16.000000000 +0200
@@ -1 +1 @@
-2.16.36
+2.16.37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org