Hello community,
here is the log from the commit of package yast2-metapackage-handler
checked in at Wed Apr 30 11:53:41 CEST 2008.
--------
--- yast2-metapackage-handler/yast2-metapackage-handler.changes 2008-04-16 09:52:27.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-metapackage-handler/yast2-metapackage-handler.changes 2008-04-30 09:16:22.000000000 +0200
@@ -1,0 +2,13 @@
+Wed Apr 30 09:15:18 CEST 2008 - mvidner@suse.cz
+
+- reviewed for autobuild
+
+-------------------------------------------------------------------
+Tue Apr 29 15:03:04 CEST 2008 - benji@opensuse.org
+
+- Fixed duplicated Wizard steps (bnc#384492).
+- Allow translatable repository names.
+- Disabled back button when on first step of wizard.
+- 0.8.4
+
+-------------------------------------------------------------------
Old:
----
yast2-metapackage-handler-0.8.3.tar.bz2
New:
----
yast2-metapackage-handler-0.8.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-metapackage-handler.spec ++++++
--- /var/tmp/diff_new_pack.l11789/_old 2008-04-30 11:53:37.000000000 +0200
+++ /var/tmp/diff_new_pack.l11789/_new 2008-04-30 11:53:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-metapackage-handler (Version 0.8.3)
+# spec file for package yast2-metapackage-handler (Version 0.8.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://en.opensuse.org/Meta_Packages
Name: yast2-metapackage-handler
-Version: 0.8.3
+Version: 0.8.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-metapackage-handler-0.8.3.tar.bz2
+Source0: yast2-metapackage-handler-0.8.4.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig
@@ -63,7 +63,7 @@
Benjamin Weber
%prep
-%setup -n yast2-metapackage-handler-0.8.3
+%setup -n yast2-metapackage-handler-0.8.4
%if %suse_version <= 1020
%patch0
%endif
@@ -133,8 +133,14 @@
%endif
%{_datadir}/mime/packages/*.xml
%{_datadir}/applications/yast2-metapackage-handler*.desktop
-
%changelog
+* Wed Apr 30 2008 mvidner@suse.cz
+- reviewed for autobuild
+* Tue Apr 29 2008 benji@opensuse.org
+- Fixed duplicated Wizard steps (bnc#384492).
+- Allow translatable repository names.
+- Disabled back button when on first step of wizard.
+- 0.8.4
* Wed Apr 16 2008 jsrain@suse.cz
- merged texts from proofread
- 0.8.3
++++++ yast2-metapackage-handler-0.8.3.tar.bz2 -> yast2-metapackage-handler-0.8.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/aclocal.m4 new/yast2-metapackage-handler-0.8.4/aclocal.m4
--- old/yast2-metapackage-handler-0.8.3/aclocal.m4 2008-04-16 09:47:55.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/aclocal.m4 2008-04-29 15:08:26.000000000 +0200
@@ -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-metapackage-handler-0.8.3/config.guess new/yast2-metapackage-handler-0.8.4/config.guess
--- old/yast2-metapackage-handler-0.8.3/config.guess 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/config.guess 2008-04-29 15:08:29.000000000 +0200
@@ -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-metapackage-handler-0.8.3/config.sub new/yast2-metapackage-handler-0.8.4/config.sub
--- old/yast2-metapackage-handler-0.8.3/config.sub 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/config.sub 2008-04-29 15:08:29.000000000 +0200
@@ -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-metapackage-handler-0.8.3/configure new/yast2-metapackage-handler-0.8.4/configure
--- old/yast2-metapackage-handler-0.8.3/configure 2008-04-16 09:47:58.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/configure 2008-04-29 15:08:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-metapackage-handler 0.8.3.
+# Generated by GNU Autoconf 2.61 for yast2-metapackage-handler 0.8.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-metapackage-handler'
PACKAGE_TARNAME='yast2-metapackage-handler'
-PACKAGE_VERSION='0.8.3'
-PACKAGE_STRING='yast2-metapackage-handler 0.8.3'
+PACKAGE_VERSION='0.8.4'
+PACKAGE_STRING='yast2-metapackage-handler 0.8.4'
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-metapackage-handler 0.8.3 to adapt to many kinds of systems.
+\`configure' configures yast2-metapackage-handler 0.8.4 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-metapackage-handler 0.8.3:";;
+ short | recursive ) echo "Configuration of yast2-metapackage-handler 0.8.4:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-metapackage-handler configure 0.8.3
+yast2-metapackage-handler configure 0.8.4
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-metapackage-handler $as_me 0.8.3, which was
+It was created by yast2-metapackage-handler $as_me 0.8.4, 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-metapackage-handler'
- VERSION='0.8.3'
+ VERSION='0.8.4'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="0.8.3"
+VERSION="0.8.4"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner "
@@ -3311,7 +3311,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-metapackage-handler $as_me 0.8.3, which was
+This file was extended by yast2-metapackage-handler $as_me 0.8.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3354,7 +3354,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-metapackage-handler config.status 0.8.3
+yast2-metapackage-handler config.status 0.8.4
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-metapackage-handler-0.8.3/configure.in new/yast2-metapackage-handler-0.8.4/configure.in
--- old/yast2-metapackage-handler-0.8.3/configure.in 2008-04-16 09:47:47.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/configure.in 2008-04-29 15:08:24.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-metapackage-handler
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-metapackage-handler, 0.8.3, http://bugs.opensuse.org/, yast2-metapackage-handler)
+AC_INIT(yast2-metapackage-handler, 0.8.4, http://bugs.opensuse.org/, yast2-metapackage-handler)
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="0.8.3"
+VERSION="0.8.4"
RPMNAME="yast2-metapackage-handler"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/doc/Makefile.in new/yast2-metapackage-handler-0.8.4/doc/Makefile.in
--- old/yast2-metapackage-handler-0.8.3/doc/Makefile.in 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/doc/Makefile.in 2008-04-29 15:08:29.000000000 +0200
@@ -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-metapackage-handler-0.8.3/install-sh new/yast2-metapackage-handler-0.8.4/install-sh
--- old/yast2-metapackage-handler-0.8.3/install-sh 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/install-sh 2008-04-29 15:08:29.000000000 +0200
@@ -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-metapackage-handler-0.8.3/Makefile.in new/yast2-metapackage-handler-0.8.4/Makefile.in
--- old/yast2-metapackage-handler-0.8.3/Makefile.in 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/Makefile.in 2008-04-29 15:08:30.000000000 +0200
@@ -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
@@ -504,10 +505,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)
@@ -534,8 +531,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*) \
@@ -692,10 +687,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-metapackage-handler-0.8.3/OneClickInstall.pot new/yast2-metapackage-handler-0.8.4/OneClickInstall.pot
--- old/yast2-metapackage-handler-0.8.3/OneClickInstall.pot 2008-04-01 10:48:40.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/OneClickInstall.pot 2007-09-03 14:25:50.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 10:48+0200\n"
+"POT-Creation-Date: 2007-09-03 14:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -16,341 +16,240 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/OneClickInstallCLI.ycp:23
-msgid "Error: Nothing to do specified in the YMP file"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:29
-msgid "If you choose to continue, the following repositories will be subscribed to:"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:39
-msgid "If you choose to continue, the following software packages will be installed:"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:61
-#, ycp-format
-msgid "Unable to retrieve YMP at %1"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:73
-msgid "Adding Repositories..."
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:80
-msgid "Error: Unable to add repositories"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:87
-msgid "Removing Packages..."
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:93
-msgid "Error: Unable to remove packages"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:100
-msgid "Installing Patterns..."
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:106
-msgid "Error: Unable to install patterns"
-msgstr ""
-
-#: src/OneClickInstallCLI.ycp:113
-msgid "Installing Packages..."
+#. * <region name="String constants"> *
+#: src/OneClickInstallUI.ycp:50
+msgid "Select the software components you wish to install:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:119
-msgid "Error: Unable to install packages"
+#: src/OneClickInstallUI.ycp:51
+msgid "Select the software components you wish to remove:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:131
-msgid "Warning: Unable to remove temporarily added repositories."
+#: src/OneClickInstallUI.ycp:52
+msgid "Select the software repositories you wish to subscribe to:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:134
-msgid "Finished"
+#: src/OneClickInstallUI.ycp:53
+msgid "Repository Description:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:152
-msgid "Error: Must be root"
+#: src/OneClickInstallUI.ycp:54
+msgid "Package Description:"
msgstr ""
-#: src/OneClickInstallCLI.ycp:159
-msgid "One Click Install Command Line Installer"
+#: src/OneClickInstallUI.ycp:55
+msgid "Additional Software Repositories"
msgstr ""
-#: src/OneClickInstallCLI.ycp:165 src/OneClickInstallCLI.ycp:170
-msgid "Processes a YMP file, ready for installation"
+#: src/OneClickInstallUI.ycp:56
+msgid "Software to be Installed"
msgstr ""
-#: src/OneClickInstallCLI.ycp:178
-msgid "URL of .ymp file"
+#: src/OneClickInstallUI.ycp:57
+msgid "Software to be Removed"
msgstr ""
-#: src/OneClickInstallCLI.ycp:183
-msgid "File to put internal representation of YMP into"
+#: src/OneClickInstallUI.ycp:58
+msgid "Please wait while this software is being installed."
msgstr ""
-#: src/OneClickInstallCLI.ycp:188
-msgid "File containing internal representation of One Click Install instructions"
+#: src/OneClickInstallUI.ycp:59
+msgid "Software installation"
msgstr ""
-#. * <region name="String constants"> *
-#: src/OneClickInstallUI.ycp:42
+#: src/OneClickInstallUI.ycp:60
msgid "This wizard will install software onto your computer."
msgstr ""
-#: src/OneClickInstallUI.ycp:43
+#: src/OneClickInstallUI.ycp:61
msgid "See http://en.opensuse.org/MetaPackages for more information."
msgstr ""
-#: src/OneClickInstallUI.ycp:48 src/OneClickInstallWidgets.ycp:35
-msgid "Select the software components you wish to install:"
-msgstr ""
-
-#. Add the splash to the advanced steps too. Requested.
-#: src/OneClickInstallUI.ycp:71 src/OneClickInstallUI.ycp:200
-msgid "Software Description"
-msgstr ""
-
-#: src/OneClickInstallUI.ycp:72 src/OneClickInstallUI.ycp:97
-#: src/OneClickInstallUI.ycp:117 src/OneClickInstallUI.ycp:135
-#: src/OneClickInstallUI.ycp:151 src/OneClickInstallUI.ycp:168
-msgid "Installation Settings"
-msgstr ""
-
-#: src/OneClickInstallUI.ycp:73 src/OneClickInstallUI.ycp:98
-#: src/OneClickInstallUI.ycp:118 src/OneClickInstallUI.ycp:136
-#: src/OneClickInstallUI.ycp:152 src/OneClickInstallUI.ycp:169
-msgid "Perform Installation"
+#: src/OneClickInstallUI.ycp:62
+msgid "Warning:"
msgstr ""
-#: src/OneClickInstallUI.ycp:74 src/OneClickInstallUI.ycp:99
-#: src/OneClickInstallUI.ycp:119 src/OneClickInstallUI.ycp:137
-#: src/OneClickInstallUI.ycp:153 src/OneClickInstallUI.ycp:170
-msgid "Results"
+#: src/OneClickInstallUI.ycp:63
+msgid "If you choose to continue, the following changes will be made to your system"
msgstr ""
-#: src/OneClickInstallUI.ycp:95 src/OneClickInstallUI.ycp:114
-#: src/OneClickInstallUI.ycp:134
-msgid "Repositories"
+#: src/OneClickInstallUI.ycp:64
+msgid "The following repositories will be subscribed to:"
msgstr ""
-#: src/OneClickInstallUI.ycp:96 src/OneClickInstallUI.ycp:115
-#: src/OneClickInstallUI.ycp:150 src/OneClickInstallUI.ycp:166
-msgid "Software"
+#: src/OneClickInstallUI.ycp:65
+msgid "The following software items will be installed:"
msgstr ""
-#: src/OneClickInstallUI.ycp:116 src/OneClickInstallUI.ycp:167
-msgid "Removals"
+#: src/OneClickInstallUI.ycp:66
+msgid "The following software items will be REMOVED:"
msgstr ""
-#: src/OneClickInstallUI.ycp:184
-msgid "Nothing to do"
+#: src/OneClickInstallUI.ycp:67
+msgid "Unfortunately the installation has failed, see the log file at /var/log/YaST2/y2log for more information. Failure stage was: "
msgstr ""
-#. #329644
-#: src/OneClickInstallUI.ycp:256
-#, ycp-format
-msgid "%1 Installation"
+#: src/OneClickInstallUI.ycp:68
+msgid "Error Message"
msgstr ""
-#: src/OneClickInstallUI.ycp:258
-msgid "Installation Steps"
+#: src/OneClickInstallUI.ycp:69
+msgid "Installation was successful"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:15
-msgid "Additional Software Repositories"
+#: src/OneClickInstallUI.ycp:70
+msgid "Installation was only partially successful."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:18
-msgid "Select the software repositories you wish to subscribe to:"
+#: src/OneClickInstallUI.ycp:71
+msgid "Installation status:"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:21
+#: src/OneClickInstallUI.ycp:72
msgid "Remain subscribed to these repositories after installation"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:32
-msgid "Software to be Installed"
-msgstr ""
-
-#: src/OneClickInstallWidgets.ycp:46
-msgid "Software to be Removed"
-msgstr ""
-
-#: src/OneClickInstallWidgets.ycp:49
-msgid "Select the software components you wish to remove:"
+#: src/OneClickInstallUI.ycp:73
+msgid "You will remain subscribed to these repositories after installation."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:58
-msgid "Installation not possible"
+#: src/OneClickInstallUI.ycp:74
+msgid "These repositories will only be added during installation, you will not remain subscribed."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:59
-msgid "The install link/file you opened does not contain instructions for this version of openSUSE."
+#: src/OneClickInstallUI.ycp:75
+msgid "Note:"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:68
-msgid "Please wait while this software is being installed."
+#: src/OneClickInstallUI.ycp:76
+msgid "There is nothing to do."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:104
-msgid "Repository Description:"
+#: src/OneClickInstallUI.ycp:77
+msgid "Advanced mode with ability to change settings."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:143 src/OneClickInstallWidgets.ycp:176
-msgid "Package Description:"
+#: src/OneClickInstallUI.ycp:78
+msgid "Welcome"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:225
-msgid ""
-"Have you reviewed the changes that will be made to your system?\n"
-"(Malicious packages could damage your system.)"
+#. %1: software package
+#: src/OneClickInstallUI.ycp:80
+#, ycp-format
+msgid "This wizard will install <b>%1</b> onto your computer."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:227
-msgid "Don't ask me this again"
+#: src/OneClickInstallUI.ycp:81
+msgid "Summary"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:295
-msgid "These repositories will only be added during installation, you will not remain subscribed."
+#: src/OneClickInstallUI.ycp:82
+msgid "Description"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:298
-msgid "You will remain subscribed to these repositories after installation."
+#: src/OneClickInstallUI.ycp:83
+msgid "The following repositories could not be added"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:302
-msgid "If you choose to continue, the following changes will be made to your system"
+#: src/OneClickInstallUI.ycp:84
+msgid "The following patterns could not be installed"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:307
-msgid "Software to be REMOVED:"
+#: src/OneClickInstallUI.ycp:85
+msgid "The following packages could not be installed"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:313
-msgid "Repositories to be added:"
+#: src/OneClickInstallUI.ycp:191
+msgid "Software Description"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:314
-msgid "Note:"
+#: src/OneClickInstallUI.ycp:192 src/OneClickInstallUI.ycp:217
+#: src/OneClickInstallUI.ycp:237 src/OneClickInstallUI.ycp:255
+#: src/OneClickInstallUI.ycp:271 src/OneClickInstallUI.ycp:288
+msgid "Installation Settings"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:320
-msgid "Software to be installed:"
+#: src/OneClickInstallUI.ycp:193 src/OneClickInstallUI.ycp:218
+#: src/OneClickInstallUI.ycp:238 src/OneClickInstallUI.ycp:256
+#: src/OneClickInstallUI.ycp:272 src/OneClickInstallUI.ycp:289
+msgid "Perform Installation"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:335
-msgid "Proposal"
+#: src/OneClickInstallUI.ycp:194 src/OneClickInstallUI.ycp:219
+#: src/OneClickInstallUI.ycp:239 src/OneClickInstallUI.ycp:257
+#: src/OneClickInstallUI.ycp:273 src/OneClickInstallUI.ycp:290
+msgid "Results"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:339
-msgid "Customise"
+#: src/OneClickInstallUI.ycp:215 src/OneClickInstallUI.ycp:234
+#: src/OneClickInstallUI.ycp:254
+msgid "Repositories"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:392
-msgid "Software installation"
+#: src/OneClickInstallUI.ycp:216 src/OneClickInstallUI.ycp:235
+#: src/OneClickInstallUI.ycp:270 src/OneClickInstallUI.ycp:286
+msgid "Software"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:402
-msgid "Installation was successful"
+#: src/OneClickInstallUI.ycp:236 src/OneClickInstallUI.ycp:287
+msgid "Removals"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:406
-msgid "Installation was only partially successful."
+#: src/OneClickInstallUI.ycp:304
+msgid "Nothing to do"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:410
-msgid "Unfortunately the installation has failed, see the log file at /var/log/YaST2/y2log for more information. Failure stage was: "
+#: src/OneClickInstallUI.ycp:389
+msgid "Installation Steps"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:411
-msgid "Error Message"
+#: src/OneClickInstallUI.ycp:509
+msgid ""
+"Have you reviewed the changes that will be made to your system?\n"
+"\n"
+"Malicious packages could damage your system."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:416
-msgid "The following repositories could not be added"
+#: src/OneClickInstallWorker.ycp:81
+msgid "An error occurred while creating the installation source."
msgstr ""
-#: src/OneClickInstallWidgets.ycp:426
-msgid "The following patterns could not be installed"
+#: src/OneClickInstallWorker.ycp:81
+msgid "Details:"
msgstr ""
-#: src/OneClickInstallWidgets.ycp:436
-msgid "The following packages could not be installed"
+#: src/OneClickInstallWorker.ycp:81
+msgid "Try again?"
msgstr ""
-#: src/OneClickInstallWorker.ycp:35
+#: src/OneClickInstallWorker.ycp:237
msgid "An error occurred while attempting to subscribe to the required repositories. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:54
+#: src/OneClickInstallWorker.ycp:248
msgid "An error occurred while attempting to remove the specified packages. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:67
+#: src/OneClickInstallWorker.ycp:259
msgid "An error occurred while attempting to install the specified patterns. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:79
+#: src/OneClickInstallWorker.ycp:270
msgid "An error occurred while attempting to install the specified packages. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:94
+#: src/OneClickInstallWorker.ycp:281
msgid "An error occurred while attempting to unsubscribe from the repositories that were used to perform the installation. You can remove them manually in YaST > Software Repositories. Please review the yast2 logs for more information."
msgstr ""
-#: src/OneClickInstallWorker.ycp:103
+#: src/OneClickInstallWorker.ycp:289
msgid "No error occurred."
msgstr ""
-#: src/OneClickInstallWorkerFunctions.ycp:88
-msgid "Loading Package Management"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:93
-#, ycp-format
-msgid "Adding repository %1"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:109
-msgid "An error occurred while initializing the software repository."
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:109
-msgid "Details:"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:109
-msgid "Try again?"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:143
-#, ycp-format
-msgid "Marking package %1 for installation"
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:146
-#, ycp-format
-msgid "Warning: package %1 could not be installed."
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:156
-msgid "Performing Installation..."
-msgstr ""
-
-#: src/OneClickInstallWorkerFunctions.ycp:184
-#, ycp-format
-msgid "Warning: pattern %1 could not be installed."
-msgstr ""
-
#: src/OneClickInstallWorkerResponse.ycp:7
msgid "unknown"
msgstr ""
#: src/OneClickInstallWorkerResponse.ycp:8
-msgid "Administrator (root) privileges are required, either they were not supplied or an unknown error occurred."
+msgid "An unknown error occurred."
msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/src/Makefile.in new/yast2-metapackage-handler-0.8.4/src/Makefile.in
--- old/yast2-metapackage-handler-0.8.3/src/Makefile.in 2008-04-16 09:47:59.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/src/Makefile.in 2008-04-29 15:08:29.000000000 +0200
@@ -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-metapackage-handler-0.8.3/src/OneClickInstallUI.ycp new/yast2-metapackage-handler-0.8.4/src/OneClickInstallUI.ycp
--- old/yast2-metapackage-handler-0.8.3/src/OneClickInstallUI.ycp 2008-04-16 09:33:41.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/src/OneClickInstallUI.ycp 2008-04-29 15:00:33.000000000 +0200
@@ -251,7 +251,7 @@
define void SetupWizard()
{
- Wizard::OpenNextBackStepsDialog();
+ UI::WizardCommand(`DeleteSteps());
Wizard::SetDesktopIcon("sw_single"); // #329644
Wizard::SetContents (sformat(_("%1 Installation"),OneClickInstall::GetName()), `Empty(), HELP_TEXT, true, true);
@@ -261,6 +261,7 @@
UI::WizardCommand(`AddStep( step["label"]:"", step["id"]:"" ) );
});
}
+ Wizard::OpenNextBackStepsDialog();
SetupWizard();
@@ -283,6 +284,14 @@
define void show_step(integer no)
{
+ if (no == 0)
+ {
+ Wizard::DisableBackButton();
+ } else
+ {
+ Wizard::EnableBackButton();
+ }
+
string current_id = (installation_steps[ no ]:nil)["id"]:"";
if (is_done(no))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/src/OneClickInstall.ycp new/yast2-metapackage-handler-0.8.4/src/OneClickInstall.ycp
--- old/yast2-metapackage-handler-0.8.3/src/OneClickInstall.ycp 2008-01-08 17:40:02.000000000 +0100
+++ new/yast2-metapackage-handler-0.8.4/src/OneClickInstall.ycp 2008-04-29 15:00:33.000000000 +0200
@@ -151,8 +151,14 @@
if (recommended != "false")
recommended = "true";
- //Find the name of this repository
- string name = YPX::SelectValue(xml,THIS_REPO_XPATH + "name");
+
+ //Get the name in our language
+ string name = YPX::SelectValue(xml,THIS_REPO_XPATH + "name[@lang='" + Language::language + "']");
+ //If that failed, try without a language
+ if (name == "")
+ name = YPX::SelectValue(xml,THIS_REPO_XPATH + "name[not(@lang)]");
+
+
//Find the summary of this repository, in our language.
string summary = YPX::SelectValue(xml,THIS_REPO_XPATH + "summary[@lang='"+ Language::language +"']");
//If that failed, try without a language.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-metapackage-handler-0.8.3/VERSION new/yast2-metapackage-handler-0.8.4/VERSION
--- old/yast2-metapackage-handler-0.8.3/VERSION 2008-04-16 09:34:36.000000000 +0200
+++ new/yast2-metapackage-handler-0.8.4/VERSION 2008-04-29 15:04:46.000000000 +0200
@@ -1 +1 @@
-0.8.3
+0.8.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org