commit yast2-wagon for openSUSE:Factory
Hello community, here is the log from the commit of package yast2-wagon for openSUSE:Factory checked in at Thu Sep 10 13:09:17 CEST 2009. -------- --- yast2-wagon/yast2-wagon.changes 2009-02-09 10:11:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes 2009-09-08 13:59:58.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Sep 8 13:46:06 CEST 2009 - kmachalkova@suse.cz + +- Adapted control file to new validation schema (compulsory unique + IDs in proposals) +- 2.18.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-wagon-2.18.0.tar.bz2 New: ---- yast2-wagon-2.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-wagon.spec ++++++ --- /var/tmp/diff_new_pack.VxF377/_old 2009-09-10 13:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.VxF377/_new 2009-09-10 13:09:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-wagon (Version 2.18.0) +# spec file for package yast2-wagon (Version 2.18.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2-wagon -Version: 2.18.0 +Version: 2.18.1 Release: 1 -License: GPL v2 or later -Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-wagon-2.18.0.tar.bz2 +Source0: yast2-wagon-2.18.1.tar.bz2 Prefix: /usr +Group: System/YaST +License: GPL v2 or later # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 @@ -43,14 +43,8 @@ does not contain any extra functionality beyond what's available through command line tools. - - -Authors: --------- - Lukas Ocilka <locilka@suse.cz> - %prep -%setup -n yast2-wagon-2.18.0 +%setup -n yast2-wagon-2.18.1 %build %{prefix}/bin/y2tool y2autoconf @@ -60,7 +54,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-wagon-2.18.0.tar.bz2 -> yast2-wagon-2.18.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/Makefile.am new/yast2-wagon-2.18.1/Makefile.am --- old/yast2-wagon-2.18.0/Makefile.am 2009-02-09 10:31:09.000000000 +0100 +++ new/yast2-wagon-2.18.1/Makefile.am 2009-09-08 13:55:59.000000000 +0200 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/Makefile.in new/yast2-wagon-2.18.1/Makefile.in --- old/yast2-wagon-2.18.0/Makefile.in 2009-02-09 10:31:13.000000000 +0100 +++ new/yast2-wagon-2.18.1/Makefile.in 2009-09-08 13:56:05.000000000 +0200 @@ -226,10 +226,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec POT_DST = $(shell find -type d -name testsuite -prune , \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/VERSION new/yast2-wagon-2.18.1/VERSION --- old/yast2-wagon-2.18.0/VERSION 2009-02-09 10:08:19.000000000 +0100 +++ new/yast2-wagon-2.18.1/VERSION 2009-09-08 13:53:02.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.18.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/autodocs-ycp.ami new/yast2-wagon-2.18.1/autodocs-ycp.ami --- old/yast2-wagon-2.18.0/autodocs-ycp.ami 2009-02-09 10:31:09.000000000 +0100 +++ new/yast2-wagon-2.18.1/autodocs-ycp.ami 2009-09-08 13:55:59.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/configure new/yast2-wagon-2.18.1/configure --- old/yast2-wagon-2.18.0/configure 2009-02-09 10:31:12.000000000 +0100 +++ new/yast2-wagon-2.18.1/configure 2009-09-08 13:56:03.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-wagon 2.18.0. +# Generated by GNU Autoconf 2.63 for yast2-wagon 2.18.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-wagon' PACKAGE_TARNAME='yast2-wagon' -PACKAGE_VERSION='2.18.0' -PACKAGE_STRING='yast2-wagon 2.18.0' +PACKAGE_VERSION='2.18.1' +PACKAGE_STRING='yast2-wagon 2.18.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-wagon 2.18.0 to adapt to many kinds of systems. +\`configure' configures yast2-wagon 2.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-wagon 2.18.0:";; + short | recursive ) echo "Configuration of yast2-wagon 2.18.1:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-wagon configure 2.18.0 +yast2-wagon configure 2.18.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,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-wagon $as_me 2.18.0, which was +It was created by yast2-wagon $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-wagon' - VERSION='2.18.0' + VERSION='2.18.1' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.18.0" +VERSION="2.18.1" RPMNAME="yast2-wagon" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" @@ -3458,7 +3458,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-wagon $as_me 2.18.0, which was +This file was extended by yast2-wagon $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3508,7 +3508,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-wagon config.status 2.18.0 +yast2-wagon config.status 2.18.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/configure.in new/yast2-wagon-2.18.1/configure.in --- old/yast2-wagon-2.18.0/configure.in 2009-02-09 10:31:09.000000000 +0100 +++ new/yast2-wagon-2.18.1/configure.in 2009-09-08 13:55:59.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-wagon dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-wagon, 2.18.0, http://bugs.opensuse.org/, yast2-wagon) +AC_INIT(yast2-wagon, 2.18.1, http://bugs.opensuse.org/, yast2-wagon) 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.18.0" +VERSION="2.18.1" RPMNAME="yast2-wagon" MAINTAINER="Lukas Ocilka <locilka@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/doc/autodocs/Makefile.in new/yast2-wagon-2.18.1/doc/autodocs/Makefile.in --- old/yast2-wagon-2.18.0/doc/autodocs/Makefile.in 2009-02-09 10:31:12.000000000 +0100 +++ new/yast2-wagon-2.18.1/doc/autodocs/Makefile.in 2009-09-08 13:56:04.000000000 +0200 @@ -17,7 +17,7 @@ # Makefile.am for wagon/doc/autodocs # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -26,6 +26,10 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -142,7 +146,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -184,7 +188,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ AUTODOCS_YCP = $(top_srcdir)/src/*/*.ycp -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp all: all-am @@ -370,14 +374,15 @@ AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/online-migration.pot new/yast2-wagon-2.18.1/online-migration.pot --- old/yast2-wagon-2.18.0/online-migration.pot 2008-11-28 13:05:39.000000000 +0100 +++ new/yast2-wagon-2.18.1/online-migration.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-28 13:05+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/config/online_migration.glade:154 -msgid "Distribution Upgrade Settings" -msgstr "" - -#: src/config/online_migration.glade:178 -msgid "Online Migration" -msgstr "" - -#: src/config/online_migration.glade:186 -msgid "Preparation" -msgstr "" - -#: src/config/online_migration.glade:191 -msgid "Welcome" -msgstr "" - -#: src/config/online_migration.glade:199 src/config/online_migration.glade:206 -#: src/config/online_migration.glade:217 src/config/online_migration.glade:227 -#: src/config/online_migration.glade:237 -msgid "Renew Update Stack" -msgstr "" - -#: src/config/online_migration.glade:244 -msgid "Migration" -msgstr "" - -#: src/config/online_migration.glade:252 -msgid "Update" -msgstr "" - -#: src/config/online_migration.glade:282 -msgid "Registration" -msgstr "" - -#: src/config/online_migration.glade:289 -msgid "Finished" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/wagon.ycp new/yast2-wagon-2.18.1/src/clients/wagon.ycp --- old/yast2-wagon-2.18.0/src/clients/wagon.ycp 2008-10-29 16:56:32.000000000 +0100 +++ new/yast2-wagon-2.18.1/src/clients/wagon.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -12,7 +12,7 @@ * Summary: * Online Migration Tool * - * $Id$ + * $Id: wagon.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/wagon_congratulate.ycp new/yast2-wagon-2.18.1/src/clients/wagon_congratulate.ycp --- old/yast2-wagon-2.18.0/src/clients/wagon_congratulate.ycp 2009-02-09 10:04:04.000000000 +0100 +++ new/yast2-wagon-2.18.1/src/clients/wagon_congratulate.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id:$ + * $Id: wagon_congratulate.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/wagon_custom_url.ycp new/yast2-wagon-2.18.1/src/clients/wagon_custom_url.ycp --- old/yast2-wagon-2.18.0/src/clients/wagon_custom_url.ycp 2008-10-16 16:05:34.000000000 +0200 +++ new/yast2-wagon-2.18.1/src/clients/wagon_custom_url.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id$ + * $Id: wagon_custom_url.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/wagon_selfupdate.ycp new/yast2-wagon-2.18.1/src/clients/wagon_selfupdate.ycp --- old/yast2-wagon-2.18.0/src/clients/wagon_selfupdate.ycp 2008-11-24 15:11:32.000000000 +0100 +++ new/yast2-wagon-2.18.1/src/clients/wagon_selfupdate.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id$ + * $Id: wagon_selfupdate.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/wagon_update_proposal.ycp new/yast2-wagon-2.18.1/src/clients/wagon_update_proposal.ycp --- old/yast2-wagon-2.18.0/src/clients/wagon_update_proposal.ycp 2008-11-28 13:04:43.000000000 +0100 +++ new/yast2-wagon-2.18.1/src/clients/wagon_update_proposal.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id$ + * $Id: wagon_update_proposal.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/wagon_update_url.ycp new/yast2-wagon-2.18.1/src/clients/wagon_update_url.ycp --- old/yast2-wagon-2.18.0/src/clients/wagon_update_url.ycp 2008-10-16 16:17:42.000000000 +0200 +++ new/yast2-wagon-2.18.1/src/clients/wagon_update_url.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id$ + * $Id: wagon_update_url.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/clients/welcome_in_wagon.ycp new/yast2-wagon-2.18.1/src/clients/welcome_in_wagon.ycp --- old/yast2-wagon-2.18.0/src/clients/welcome_in_wagon.ycp 2008-10-16 15:35:35.000000000 +0200 +++ new/yast2-wagon-2.18.1/src/clients/welcome_in_wagon.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Online Migration Tool * - * $Id$ + * $Id: welcome_in_wagon.ycp 57028 2009-04-29 10:58:09Z lslezak $ * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/config/online_migration.xml new/yast2-wagon-2.18.1/src/config/online_migration.xml --- old/yast2-wagon-2.18.0/src/config/online_migration.xml 2009-02-09 10:09:38.000000000 +0100 +++ new/yast2-wagon-2.18.1/src/config/online_migration.xml 2009-09-08 12:19:18.000000000 +0200 @@ -159,6 +159,7 @@ <mode>update</mode> <stage>normal</stage> <name>wagon_proposal</name> + <unique_id>wagon_proposal</unique_id> <enable_skip>no</enable_skip> <proposal_modules config:type="list"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/src/modules/Wagon.ycp new/yast2-wagon-2.18.1/src/modules/Wagon.ycp --- old/yast2-wagon-2.18.0/src/modules/Wagon.ycp 2008-10-29 17:04:39.000000000 +0100 +++ new/yast2-wagon-2.18.1/src/modules/Wagon.ycp 2009-06-24 12:53:06.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Lukas Ocilka <locilka@suse.cz> * Internal * - * $Id$ + * $Id: Wagon.ycp 57028 2009-04-29 10:58:09Z lslezak $ * * Module for handling WAGON. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.18.0/wagon.pot new/yast2-wagon-2.18.1/wagon.pot --- old/yast2-wagon-2.18.0/wagon.pot 2008-11-28 13:05:39.000000000 +0100 +++ new/yast2-wagon-2.18.1/wagon.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,123 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-28 13:05+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/clients/wagon_selfupdate.ycp:38 -msgid "Solving the package dependencies..." -msgstr "" - -#. TRANSLATORS: headline -#: src/clients/wagon_selfupdate.ycp:201 -msgid "Aborting the Upgrade" -msgstr "" - -#. TRANSLATORS: pop-up question -#: src/clients/wagon_selfupdate.ycp:203 -msgid "" -"Cannot continue without installing the required patches.\n" -"Are sure you want to abort the upgrade process?" -msgstr "" - -#: src/clients/wagon_selfupdate.ycp:205 -msgid "Abort Upgrade" -msgstr "" - -#: src/clients/wagon_update_proposal.ycp:44 -msgid "There is nothing to set." -msgstr "" - -#: src/clients/wagon_update_proposal.ycp:49 -msgid "Update Options" -msgstr "" - -#: src/clients/wagon_update_proposal.ycp:50 -msgid "&Update Options" -msgstr "" - -#: src/clients/wagon_update_url.ycp:27 -msgid "Select from where to get the update URL" -msgstr "" - -#: src/clients/wagon_update_url.ycp:46 -msgid "&Customer Center" -msgstr "" - -#: src/clients/wagon_update_url.ycp:52 -msgid "Custom &URL" -msgstr "" - -#: src/clients/wagon_update_url.ycp:60 -msgid "Update URL" -msgstr "" - -#. FIXME: ... -#: src/clients/wagon_update_url.ycp:63 -msgid "FIXME: some help text" -msgstr "" - -#. heading text -#: src/clients/welcome_in_wagon.ycp:28 -msgid "Welcome" -msgstr "" - -#: src/clients/welcome_in_wagon.ycp:31 -msgid "" -"This tool will help to update the\n" -"running system to a service pack.\n" -"\n" -"Click 'Next' to start the update." -msgstr "" - -#. help text -#: src/clients/welcome_in_wagon.ycp:38 -msgid "<p>This tools updates the running system to a service pack.</p>" -msgstr "" - -#. Report error but let user go further -#. Might help us in the future -#: src/clients/welcome_in_wagon.ycp:58 -msgid "Cannot initialize package manager." -msgstr "" - -#. TRANSLATORS: error message -#: src/modules/Wagon.ycp:95 -msgid "No workflow defined." -msgstr "" - -#: src/modules/Wagon.ycp:173 -msgid "" -"\n" -"This module does not support command-line interface.\n" -"To do so, please, use zypper instead.\n" -msgstr "" - -#: src/modules/Wagon.ycp:179 -msgid "Target file name ('xmlfile' option) is missing. Use xmlfile=<target_XML_file> command line option." -msgstr "" - -#. popup heading, with rich text widget and Yes/No buttons -#: src/modules/Wagon.ycp:224 -msgid "Do you accept this license agreement?" -msgstr "" - -#: src/modules/Wagon.ycp:283 -msgid "Distribution Upgrade" -msgstr "" - -#: src/modules/Wagon.ycp:284 -msgid "<p>FIXME</p>" -msgstr "" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de