openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- 1 participants
- 372752 discussions
Hello community,
here is the log from the commit of package yast2-vm
checked in at Fri Apr 7 12:03:33 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-04-07 07:08:01.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-04-07 08:38:59.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 7 08:37:26 CEST 2006 - lslezak(a)suse.cz
+
+- don't modify bootloader configuration when confguring domain0,
+ it's modified by kernel-xen package (#163138)
+- 2.13.33
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.32.tar.bz2
New:
----
yast2-vm-2.13.33.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.HVWMzH/_old 2006-04-07 12:03:23.000000000 +0200
+++ /var/tmp/diff_new_pack.HVWMzH/_new 2006-04-07 12:03:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.32)
+# spec file for package yast2-vm (Version 2.13.33)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.13.32
+Version: 2.13.33
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.32.tar.bz2
+Source0: yast2-vm-2.13.33.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak <lslezak(a)suse.cz>
%prep
-%setup -n yast2-vm-2.13.32
+%setup -n yast2-vm-2.13.33
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,10 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Fri Apr 07 2006 - lslezak(a)suse.cz
+- don't modify bootloader configuration when confguring domain0,
+ it's modified by kernel-xen package (#163138)
+- 2.13.33
* Thu Apr 06 2006 - mgfritch(a)novell.com
- Add dialog for managing virtual machines, similar to the
xm commands (xm list, xm create, xm destory, etc.)
++++++ yast2-vm-2.13.32.tar.bz2 -> yast2-vm-2.13.33.tar.bz2 ++++++
++++ 3757 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/Makefile.am new/yast2-vm-2.13.33/Makefile.am
--- old/yast2-vm-2.13.32/Makefile.am 2006-04-07 07:08:13.000000000 +0200
+++ new/yast2-vm-2.13.33/Makefile.am 2006-03-28 15:47:28.000000000 +0200
@@ -6,7 +6,8 @@
# (Edit ./SUBDIRS instead)
#
-PREFIX = /usr
+#where devtools are
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -30,6 +31,10 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
AUTOMAKE_OPTIONS = foreign dist-bzip2
+# where devtools instal m4 snippets
+# argh, executed literally
+#ACLOCAL_AMFLAGS = -I $(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
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
@@ -57,12 +62,8 @@
# info '(automake)Conditionals'
if CREATE_PKGCONFIG
-# pkg-config
-# if a package does not have its own pc, copy the generic one
-$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in
- test -f $@ || cp -p $< $@
# create the file here instead of by configure
-# because the prerequisite is made here
+# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
$(RPMNAME).pc: $(RPMNAME).pc.in
@@ -153,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -198,6 +199,9 @@
false; \
fi
+check-textdomain:
+ $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
@@ -210,4 +214,4 @@
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents control doc src
+SUBDIRS = agents control doc src testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/Makefile.am.common new/yast2-vm-2.13.33/Makefile.am.common
--- old/yast2-vm-2.13.32/Makefile.am.common 2006-04-07 07:08:13.000000000 +0200
+++ new/yast2-vm-2.13.33/Makefile.am.common 2006-03-28 15:47:28.000000000 +0200
@@ -9,7 +9,7 @@
# suffix mapping: info '(make)Static Usage'
# apply only to our modules, not external ones
${ybcfiles}: %.ybc: %.ycp $(ycpchook)
- Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $<
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
# files to clean
CLEANFILES = ${ybcfiles}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/VERSION new/yast2-vm-2.13.33/VERSION
--- old/yast2-vm-2.13.32/VERSION 2006-04-05 00:52:00.000000000 +0200
+++ new/yast2-vm-2.13.33/VERSION 2006-04-07 08:37:14.000000000 +0200
@@ -1 +1 @@
-2.13.32
+2.13.33
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/configure.in new/yast2-vm-2.13.33/configure.in
--- old/yast2-vm-2.13.32/configure.in 2006-04-07 07:08:13.000000000 +0200
+++ new/yast2-vm-2.13.33/configure.in 2006-03-28 15:47:27.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-vm, 2.13.32, http://www.suse.de/feedback, yast2-vm)
+AC_INIT(yast2-vm, 2.13.29, http://www.suse.de/feedback, yast2-vm)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.32"
+VERSION="2.13.29"
RPMNAME="yast2-vm"
MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>"
@@ -110,8 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
-devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools`
-devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools`
+devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
+devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
dnl producing pkg-config for others?
AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x)
@@ -138,6 +138,10 @@
if test "$YCPMAKEDEP" = "false"; then
AC_MSG_ERROR([ycpmakedep is not installed])
fi
+AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir)
+if test "$YCPC" = "false"; then
+ AC_MSG_ERROR([ycpc is not installed])
+fi
( cd control;
@@ -151,7 +155,8 @@
control/Makefile
doc/autodocs/Makefile
doc/Makefile
-src/Makefile)
+src/Makefile
+testsuite/Makefile)
AC_OUTPUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/src/dom0_setup.ycp new/yast2-vm-2.13.33/src/dom0_setup.ycp
--- old/yast2-vm-2.13.32/src/dom0_setup.ycp 2006-04-04 20:40:15.000000000 +0200
+++ new/yast2-vm-2.13.33/src/dom0_setup.ycp 2006-04-07 08:39:27.000000000 +0200
@@ -5,18 +5,15 @@
*
* Purpose: Configure domain0 (Xen management domain)
*
- * $Id: dom0_setup.ycp 29658 2006-04-04 13:06:24Z lslezak $
+ * $Id: dom0_setup.ycp 29853 2006-04-07 06:35:57Z lslezak $
*/
{
import "Package";
import "Progress";
import "Report";
- import "Bootloader";
- import "BootCommon";
import "Popup";
import "Wizard";
- import "Label";
textdomain "vm";
@@ -24,8 +21,6 @@
// progress stage
_("Install Packages"),
// progress stage
- _("Configure Boot Loader"),
- // progress stage
_("Firewall Configuration")
];
@@ -93,81 +88,6 @@
return `abort;
}
- // bootloader stage
- Progress::NextStage();
-
- // progressbar title - read bootloader settings
- Progress::Title(_("Reading boot loader configuration..."));
-
- // disable bootloader progress
- Progress::set(false);
- Bootloader::Read();
- Progress::set(true);
-
- // progressbar title - check whether GRUB or LILO is used as bootloader
- Progress::Title(_("Checking boot loader type..."));
-
- string loader_type = BootCommon::getLoaderType(false);
- string bootloader_changes = "";
-
- // false = don't recheck
- if (loader_type != "grub")
- {
- // progressbar title
- Progress::Title(_("Switching to GRUB boot loader..."));
-
- // set type to GRUB
- BootCommon::setLoaderType("grub");
- // summary text - item in the task list
- bootloader_changes = sformat(_("<LI>Switch to GRUB boot loader (current boot loader is '%1')</LI>"), loader_type);
- }
-
- // progressbar title - check if there is a Xen section
- Progress::Title(_("Searching for Xen section..."));
-
- // get all sections
- list sects = Bootloader::getSectionsList(`all);
- y2milestone("boot loader sections: %1", sects);
-
- if (!contains(sects, "xen") && !contains(sects, "XEN"))
- {
- // progressbar title - add missing Xen section to bootloader configuration
- Progress::Title(_("Adding Xen section..."));
- BootCommon::sections = add(BootCommon::sections, BootCommon::CreateLinuxSection("xen"));
- sects = Bootloader::getSectionsList(`all);
- y2milestone("boot loader sections: %1", sects);
- // summary text - item in the task list
- bootloader_changes = bootloader_changes + _("<LI>Add Xen section to the boot loader menu</LI>");
- }
-
- // confirm bootloader installation - dialog header
- if (bootloader_changes != "")
- {
- // progressbar title - write the modified bootloader configuration
- Progress::Title(_("Saving the boot loader configuration..."));
-
- bootloader_changes = bootloader_changes + _("<LI>Activate the new configuration</LI>");
-
- if (Popup::AnyQuestionRichText(_("Update of the Boot Loader Configuration"),
- sformat(_("<P><B>These actions will be performed:</B><UL>%1</UL></P>"), bootloader_changes),
- 60, 10, Label::ContinueButton(), Label::CancelButton(), `yes_focus))
- {
- // progressbar title - write the modified bootloader configuration
- Progress::Title(_("Writing boot loader configuration..."));
-
- Progress::set(false);
- BootCommon::location_changed = true;
- BootCommon::changed = true;
- success = Bootloader::Write();
- Progress::set(true);
-
- if (!success)
- {
- Report::Error(error);
- }
- }
- }
-
// firewall stage - modify the firewall setting, add the xen bridge to FW_FORWARD_ALWAYS_INOUT_DEV
Progress::NextStage();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-vm-2.13.32/testsuite/Makefile.am new/yast2-vm-2.13.33/testsuite/Makefile.am
--- old/yast2-vm-2.13.32/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-vm-2.13.33/testsuite/Makefile.am 2005-01-21 18:45:40.000000000 +0100
@@ -0,0 +1,21 @@
+#
+# Makefile.am for .../testsuite
+#
+# Do not edit this file (Makefile.am) as it will be overwritten!
+#
+
+AUTOMAKE_OPTIONS = dejagnu
+EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
+
+testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
+
+all-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir)
+
+clean-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean
+
+check-local: $(testsuite_prepare)
+ make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check
+
+# EOF
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-vm
checked in at Fri Apr 7 12:00:00 CEST 2006.
--------
--- yast2-vm/yast2-vm.changes 2006-04-04 15:23:14.000000000 +0200
+++ yast2-vm/yast2-vm.changes 2006-04-07 07:08:01.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Apr 6 22:57:50 MDT 2006 - mgfritch(a)novell.com
+
+- Add dialog for managing virtual machines, similar to the
+ xm commands (xm list, xm create, xm destory, etc.)
+- Add help text for MAC address and Bridge Name (#145663)
+- Change Control Center icon name to 'Virtual Machine Management (Xen)'.
+- Move Control Center icon from 'Software' catagory to 'System'.
+- Various text string changes (help and UI).
+- 2.13.32
+
+-------------------------------------------------------------------
Old:
----
yast2-vm-2.13.31.tar.bz2
New:
----
yast2-vm-2.13.32.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-vm.spec ++++++
--- /var/tmp/diff_new_pack.9beQe7/_old 2006-04-07 11:59:19.000000000 +0200
+++ /var/tmp/diff_new_pack.9beQe7/_new 2006-04-07 11:59:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-vm (Version 2.13.31)
+# spec file for package yast2-vm (Version 2.13.32)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-vm
-Version: 2.13.31
+Version: 2.13.32
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-vm-2.13.31.tar.bz2
+Source0: yast2-vm-2.13.32.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 yast2-installation
@@ -32,7 +32,7 @@
Ladislav Slezak <lslezak(a)suse.cz>
%prep
-%setup -n yast2-vm-2.13.31
+%setup -n yast2-vm-2.13.32
%build
%{prefix}/bin/y2tool y2autoconf
@@ -73,6 +73,14 @@
%doc %{prefix}/share/doc/packages/yast2-vm
%changelog -n yast2-vm
+* Thu Apr 06 2006 - mgfritch(a)novell.com
+- Add dialog for managing virtual machines, similar to the
+ xm commands (xm list, xm create, xm destory, etc.)
+- Add help text for MAC address and Bridge Name (#145663)
+- Change Control Center icon name to 'Virtual Machine Management (Xen)'.
+- Move Control Center icon from 'Software' catagory to 'System'.
+- Various text string changes (help and UI).
+- 2.13.32
* Tue Apr 04 2006 - lslezak(a)suse.cz
- dom0 configuration: modify firewall configuration - add the Xen
bridge into FW_FORWARD_ALWAYS_INOUT_DEV option (#154133),
++++++ yast2-vm-2.13.31.tar.bz2 -> yast2-vm-2.13.32.tar.bz2 ++++++
++++ 6377 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-printer
checked in at Fri Apr 7 11:59:16 CEST 2006.
--------
--- yast2-printer/yast2-printer.changes 2006-03-30 11:50:19.000000000 +0200
+++ yast2-printer/yast2-printer.changes 2006-04-07 11:13:01.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 7 11:09:26 CEST 2006 - mzugec(a)suse.cz
+
+- #163870 - auto-select printer model
+
+-------------------------------------------------------------------
Old:
----
yast2-printer-2.13.6.tar.bz2
New:
----
yast2-printer-2.13.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-printer.spec ++++++
--- /var/tmp/diff_new_pack.veXHQK/_old 2006-04-07 11:58:55.000000000 +0200
+++ /var/tmp/diff_new_pack.veXHQK/_new 2006-04-07 11:58:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-printer (Version 2.13.6)
+# spec file for package yast2-printer (Version 2.13.7)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-printer
-Version: 2.13.6
+Version: 2.13.7
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-printer-2.13.6.tar.bz2
+Source0: yast2-printer-2.13.7.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2 netcat zlib blocxx
@@ -33,7 +33,7 @@
%prep
-%setup -n yast2-printer-2.13.6
+%setup -n yast2-printer-2.13.7
%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +99,8 @@
%doc %{prefix}/share/doc/packages/yast2-printer
%changelog -n yast2-printer
+* Fri Apr 07 2006 - mzugec(a)suse.cz
+- #163870 - auto-select printer model
* Thu Mar 30 2006 - mzugec(a)suse.cz
- fixed #161050 - new queue for existing printer
* Wed Mar 15 2006 - mzugec(a)suse.cz
++++++ yast2-printer-2.13.6.tar.bz2 -> yast2-printer-2.13.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.6/VERSION new/yast2-printer-2.13.7/VERSION
--- old/yast2-printer-2.13.6/VERSION 2006-03-30 11:48:40.000000000 +0200
+++ new/yast2-printer-2.13.7/VERSION 2006-04-07 10:59:30.000000000 +0200
@@ -1 +1 @@
-2.13.6
+2.13.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.6/configure new/yast2-printer-2.13.7/configure
--- old/yast2-printer-2.13.6/configure 2006-03-30 11:37:51.000000000 +0200
+++ new/yast2-printer-2.13.7/configure 2006-04-07 10:54:41.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.5.
+# Generated by GNU Autoconf 2.59 for yast2-printer 2.13.6.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-printer'
PACKAGE_TARNAME='yast2-printer'
-PACKAGE_VERSION='2.13.5'
-PACKAGE_STRING='yast2-printer 2.13.5'
+PACKAGE_VERSION='2.13.6'
+PACKAGE_STRING='yast2-printer 2.13.6'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -959,7 +959,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-printer 2.13.5 to adapt to many kinds of systems.
+\`configure' configures yast2-printer 2.13.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1026,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-printer 2.13.5:";;
+ short | recursive ) echo "Configuration of yast2-printer 2.13.6:";;
esac
cat <<\_ACEOF
@@ -1169,7 +1169,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-printer configure 2.13.5
+yast2-printer configure 2.13.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1183,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-printer $as_me 2.13.5, which was
+It was created by yast2-printer $as_me 2.13.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1913,7 +1913,7 @@
# Define the identity of the package.
PACKAGE='yast2-printer'
- VERSION='2.13.5'
+ VERSION='2.13.6'
cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2124,7 @@
-VERSION="2.13.5"
+VERSION="2.13.6"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
@@ -22774,7 +22774,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-printer $as_me 2.13.5, which was
+This file was extended by yast2-printer $as_me 2.13.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22837,7 +22837,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-printer config.status 2.13.5
+yast2-printer config.status 2.13.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.6/configure.in new/yast2-printer-2.13.7/configure.in
--- old/yast2-printer-2.13.6/configure.in 2006-03-30 11:37:30.000000000 +0200
+++ new/yast2-printer-2.13.7/configure.in 2006-04-07 10:54:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-printer, 2.13.5, http://www.suse.de/feedback, yast2-printer)
+AC_INIT(yast2-printer, 2.13.6, http://www.suse.de/feedback, yast2-printer)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.5"
+VERSION="2.13.6"
RPMNAME="yast2-printer"
MAINTAINER="Michal Zugec <mzugec(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.6/src/common/dialogs-connection.ycp new/yast2-printer-2.13.7/src/common/dialogs-connection.ycp
--- old/yast2-printer-2.13.6/src/common/dialogs-connection.ycp 2006-03-30 11:49:28.000000000 +0200
+++ new/yast2-printer-2.13.7/src/common/dialogs-connection.ycp 2006-04-07 11:10:35.000000000 +0200
@@ -9,7 +9,7 @@
* Petr Blahos <pblahos(a)suse.cz>
* Jiri Srain <jsrain(a)suse.cz>
*
- * $Id: dialogs-connection.ycp 29553 2006-03-30 09:49:24Z mzugec $
+ * $Id: dialogs-connection.ycp 29858 2006-04-07 09:10:30Z mzugec $
*
*/
{
@@ -343,6 +343,7 @@
Label::BackButton (), Label::NextButton ());
Wizard::RestoreBackButton ();
Wizard::RestoreAbortButton ();
+ UI::ChangeWidget(`connection_type, `CurrentItem, 0);
any ret = nil;
while (ret == nil)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.13.6/src/common/dialogs.ycp new/yast2-printer-2.13.7/src/common/dialogs.ycp
--- old/yast2-printer-2.13.6/src/common/dialogs.ycp 2006-03-21 08:59:06.000000000 +0100
+++ new/yast2-printer-2.13.7/src/common/dialogs.ycp 2006-04-07 11:10:35.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Petr Blahos <pblahos(a)suse.cz>
*
- * $Id: dialogs.ycp 29005 2006-03-15 13:49:42Z mzugec $
+ * $Id: dialogs.ycp 29858 2006-04-07 09:10:30Z mzugec $
* Main dialogs.
*/
{
@@ -139,6 +139,19 @@
UI::ReplaceWidget (`id (`modelsel_rep), modelsel);
if (! haskey (Printerdb::foomatic[manuf_db]:$[], model_db))
{
+
+ while(size(model_db)>0){
+ foreach (any k, any v, Printerdb::foomatic[manuf_db]:$[],``{
+ if (is(k, string) && issubstring((string)k, model_db)){
+ y2internal("matched %1", k);
+ model_db=tostring(k);
+ break;
+ }
+ });
+ if (haskey (Printerdb::foomatic[manuf_db]:$[], model_db)) break;
+ model_db=substring(model_db,0,size(model_db)-1);
+ }
+
foreach (any k, any v, Printerdb::foomatic[manuf_db]:$[],``{
if ((model_db == "" || model_db == nil)
&& is (k, string) && k != "" && k != nil)
@@ -146,6 +159,7 @@
model_db = (string)k;
}
});
+
}
if (model_db != "")
UI::ChangeWidget (`id (`modelsel), `CurrentItem, model_db);
@@ -1310,7 +1324,8 @@
* Create contents for edit dialog. Calls Setwizardcontents at the end.
*/
define void createEditDialog () ``{
- map ppd_info = Printer::printer["ppd_info"]:$[]; //["ppd_info"]:$[];
+ map ppd_info = Printer::printer["ppd_info"]:$[];
+ if (ppd_info == $[]) ppd_info = Printer::printer["detected", "ppd_info"]:$[];
string manuf_db = ppd_info["manufacturer_db"]:"";
string model_db = ppd_info["model_db"]:"";
string nick = ppd_info["nick"]:"";
@@ -1328,8 +1343,7 @@
//
// texts
//
- string model_text = sformat ("%1 %2", ppd_info["manufacturer"]:"",
- ppd_info["model"]:"");
+ string model_text = sformat ("%1 %2", ppd_info["manufacturer"]:"", ppd_info["model"]:"");
string config_text = GetPpdFileDescription (
nick,
lang,
@@ -2237,8 +2251,9 @@
]);
SetHWDialogData ();
- WizardHW::SetSelectedItem (Printer::runAutoprobedListDialog__current);
+ Wizard::SetNextButton(`next, _("Finish"));
+ WizardHW::SetSelectedItem (Printer::runAutoprobedListDialog__current);
boolean cont = true;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-country
checked in at Fri Apr 7 11:56:03 CEST 2006.
--------
--- yast2-country/yast2-country.changes 2006-04-03 15:13:47.000000000 +0200
+++ yast2-country/yast2-country.changes 2006-04-07 09:16:37.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 7 09:08:36 CEST 2006 - jsuchome(a)suse.cz
+
+- US/Eastern is the default time zone for en_US (#163018)
+- 2.13.21
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.13.20.tar.bz2
New:
----
yast2-country-2.13.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.rvNFZT/_old 2006-04-07 11:55:28.000000000 +0200
+++ /var/tmp/diff_new_pack.rvNFZT/_new 2006-04-07 11:55:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.13.20)
+# spec file for package yast2-country (Version 2.13.21)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-country
-Version: 2.13.20
+Version: 2.13.21
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.13.20.tar.bz2
+Source0: yast2-country-2.13.21.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-trans-stats yast2-perl-bindings
@@ -60,7 +60,7 @@
Jiri Suchomel <jsuchome(a)suse.cz>
%prep
-%setup -n yast2-country-2.13.20
+%setup -n yast2-country-2.13.21
%build
%{prefix}/bin/y2tool y2autoconf
@@ -105,6 +105,9 @@
%{prefix}/share/applications/YaST2/timezone.desktop
%changelog -n yast2-country
+* Fri Apr 07 2006 - jsuchome(a)suse.cz
+- US/Eastern is the default time zone for en_US (#163018)
+- 2.13.21
* Mon Apr 03 2006 - jsuchome(a)suse.cz
- fixed setting of console font (#153190)
- fixed Australian/NSW time zone (#162820)
++++++ yast2-country-2.13.20.tar.bz2 -> yast2-country-2.13.21.tar.bz2 ++++++
++++ 3009 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.13.20/VERSION new/yast2-country-2.13.21/VERSION
--- old/yast2-country-2.13.20/VERSION 2006-04-03 14:55:05.000000000 +0200
+++ new/yast2-country-2.13.21/VERSION 2006-04-07 09:09:03.000000000 +0200
@@ -1 +1 @@
-2.13.20
+2.13.21
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.13.20/language/src/language.ycp new/yast2-country-2.13.21/language/src/language.ycp
--- old/yast2-country-2.13.20/language/src/language.ycp 2006-03-31 16:33:55.000000000 +0200
+++ new/yast2-country-2.13.21/language/src/language.ycp 2006-04-03 15:14:34.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: client for language configuration in running system
*
- * $Id: language.ycp 26747 2006-01-03 17:32:59Z jsuchome $
+ * $Id: language.ycp 29621 2006-04-03 13:14:28Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.13.20/timezone/data/lang2tz.ycp new/yast2-country-2.13.21/timezone/data/lang2tz.ycp
--- old/yast2-country-2.13.20/timezone/data/lang2tz.ycp 2006-01-10 10:07:00.000000000 +0100
+++ new/yast2-country-2.13.21/timezone/data/lang2tz.ycp 2006-04-07 08:50:11.000000000 +0200
@@ -40,7 +40,7 @@
"en_CA" : "Canada/Eastern",
"en_GB" : "Europe/London",
"en_IE" : "Europe/Belfast",
- "en_US" : "US/Mountain",
+ "en_US" : "US/Eastern",
"en_NZ" : "Pacific/Auckland",
"en_IN" : "Asia/Calcutta",
"es_AR" : "America/Buenos_Aires",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.13.20/timezone/data/timezone_raw.ycp new/yast2-country-2.13.21/timezone/data/timezone_raw.ycp
--- old/yast2-country-2.13.20/timezone/data/timezone_raw.ycp 2006-04-03 14:43:03.000000000 +0200
+++ new/yast2-country-2.13.21/timezone/data/timezone_raw.ycp 2006-04-03 15:14:34.000000000 +0200
@@ -3,7 +3,7 @@
* Authors: Thomas Roelz <tom(a)suse.de>
* Summary: The untranslated timezone database.
*
- * $Id: timezone_raw.ycp 26914 2006-01-10 09:07:00Z jsuchome $
+ * $Id: timezone_raw.ycp 29621 2006-04-03 13:14:28Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following files in sync:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.13.20/timezone/src/Timezone.ycp new/yast2-country-2.13.21/timezone/src/Timezone.ycp
--- old/yast2-country-2.13.20/timezone/src/Timezone.ycp 2006-03-20 16:21:34.000000000 +0100
+++ new/yast2-country-2.13.21/timezone/src/Timezone.ycp 2006-04-07 09:08:20.000000000 +0200
@@ -200,8 +200,9 @@
"Australia/Canberra" : "Australia/ACT",
"Australia/Brisbane" : "Australia/Queensland",
"Australia/Hobart" : "Australia/Tasmania",
- "Australia/Perth" : "Australia/West"
+ "Australia/Perth" : "Australia/West",
// etc.
+ "America/Los_Angeles" : "US/Pacific",
];
if (haskey (tmz_duplicates, tmz))
@@ -330,7 +331,7 @@
*/
global define void SetTimezoneForLanguage (string sys_language) {
- string tmz = GetTimezoneForLanguage (sys_language, "US/Mountain");
+ string tmz = GetTimezoneForLanguage (sys_language, "US/Eastern");
y2debug ("language %1 proposed timezone %2", sys_language, tmz);
if (tmz != "")
{
@@ -514,7 +515,7 @@
// User has not yet chosen a timezone ==> follow language.
//
string local_timezone =
- GetTimezoneForLanguage( Language::language, "US/Mountain");
+ GetTimezoneForLanguage( Language::language, "US/Eastern");
if( local_timezone != "" )
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package libzypp
checked in at Fri Apr 7 11:55:24 CEST 2006.
--------
--- libzypp/libzypp.changes 2006-04-06 16:00:43.000000000 +0200
+++ libzypp/libzypp.changes 2006-04-07 10:47:03.000000000 +0200
@@ -1,0 +2,32 @@
+Fri Apr 7 10:36:05 CEST 2006 - ma(a)suse.de
+
+- Avoid excessive CD hopping on commit. But still far from
+ being perfect. (#159679)
+- Fixed Target::commit: Despite dry_run set True, packages
+ were depeted.
+
+-------------------------------------------------------------------
+Fri Apr 7 08:32:32 CEST 2006 - visnov(a)suse.cz
+
+- honour if user decides to skip a package in commit (#156031)
+
+-------------------------------------------------------------------
+Thu Apr 6 18:14:30 CEST 2006 - jsrain(a)suse.de
+
+- fixed parsing external reference to script in patch (#163221)
+- r2981
+
+-------------------------------------------------------------------
+Thu Apr 6 17:07:10 CEST 2006 - dmacvicar(a)suse.de
+
+- cache and provide content.asc/key optionally. Dont show a
+ popup if they dont exists. (dmacvicar)
+- Actually abort when verify signature workflow is false. (dmacvicar)
+- r2978
+
+-------------------------------------------------------------------
+Thu Apr 6 16:37:49 CEST 2006 - jsrain(a)suse.de
+
+- fixed setting autorefresh flag for installation sources
+
+-------------------------------------------------------------------
@@ -34 +66 @@
-- Use the original media descr_dir on refresh for
+- Use the original media descr_dir on refresh for
@@ -68,2 +100,2 @@
-- only try to create a source of a given type when restoring
- from the persistent store (#162111)
+- only try to create a source of a given type when restoring
+ from the persistent store (#162111)
@@ -81 +113 @@
-- properly initialize autorefresh for non-remote sources (#154990)
+- properly initialize autorefresh for non-remote sources (#154990)
@@ -96 +128 @@
--implement callbacks for when package verification (checksum)
+-implement callbacks for when package verification (checksum)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.AtO215/_old 2006-04-07 11:51:35.000000000 +0200
+++ /var/tmp/diff_new_pack.AtO215/_new 2006-04-07 11:51:35.000000000 +0200
@@ -18,7 +18,7 @@
Autoreqprov: on
Summary: Package, Patch, Pattern, and Product Management
Version: 0.0.8
-Release: 78
+Release: 79
Source: zypp-0.0.0.tar.bz2
Prefix: /usr
Provides: yast2-packagemanager
@@ -104,6 +104,23 @@
%{_libdir}/pkgconfig/libzypp.pc
%changelog -n libzypp
+* Fri Apr 07 2006 - ma(a)suse.de
+- Avoid excessive CD hopping on commit. But still far from
+ being perfect. (#159679)
+- Fixed Target::commit: Despite dry_run set True, packages
+ were depeted.
+* Fri Apr 07 2006 - visnov(a)suse.cz
+- honour if user decides to skip a package in commit (#156031)
+* Thu Apr 06 2006 - jsrain(a)suse.de
+- fixed parsing external reference to script in patch (#163221)
+- r2981
+* Thu Apr 06 2006 - dmacvicar(a)suse.de
+- cache and provide content.asc/key optionally. Dont show a
+ popup if they dont exists. (dmacvicar)
+- Actually abort when verify signature workflow is false. (dmacvicar)
+- r2978
+* Thu Apr 06 2006 - jsrain(a)suse.de
+- fixed setting autorefresh flag for installation sources
* Thu Apr 06 2006 - kkaempf(a)suse.de
- drop patches with incompatible architecture.
- rev 2972
++++++ zypp-0.0.0.tar.bz2 ++++++
libzypp/zypp-0.0.0.tar.bz2 libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Fri Apr 7 06:13:05 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-06 20:30:10.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-06 23:01:43.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 6 22:38:39 CEST 2006 - visnov(a)suse.cz
+
+- fix build
+- 2.13.52
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.51.tar.bz2
New:
----
yast2-pkg-bindings-2.13.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.jkUogp/_old 2006-04-07 06:12:43.000000000 +0200
+++ /var/tmp/diff_new_pack.jkUogp/_new 2006-04-07 06:12:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.51)
+# spec file for package yast2-pkg-bindings (Version 2.13.52)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.13.51
+Version: 2.13.52
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.51.tar.bz2
+Source0: yast2-pkg-bindings-2.13.52.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-pkg-bindings-2.13.51
+%setup -n yast2-pkg-bindings-2.13.52
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,9 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Thu Apr 06 2006 - visnov(a)suse.cz
+- fix build
+- 2.13.52
* Thu Apr 06 2006 - jsrain(a)suse.de
- fixed YCP signature of Pkg::SourceCleanupBroken
- 2.13.50
++++++ yast2-pkg-bindings-2.13.51.tar.bz2 -> yast2-pkg-bindings-2.13.52.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.51/VERSION new/yast2-pkg-bindings-2.13.52/VERSION
--- old/yast2-pkg-bindings-2.13.51/VERSION 2006-04-06 20:28:38.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.52/VERSION 2006-04-06 22:39:03.000000000 +0200
@@ -1 +1 @@
-2.13.51
+2.13.52
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.51/src/Callbacks.cc new/yast2-pkg-bindings-2.13.52/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.51/src/Callbacks.cc 2006-04-06 20:24:08.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.52/src/Callbacks.cc 2006-04-06 22:52:28.000000000 +0200
@@ -364,7 +364,7 @@
if ( zypp::isKind<zypp::Package> (resolvable_ptr) )
{
- zypp::Package::Ptr pkg =
+ zypp::Package::constPtr pkg =
zypp::asKind<zypp::Package>(resolvable_ptr);
size = pkg->archivesize();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.51/src/Package.cc new/yast2-pkg-bindings-2.13.52/src/Package.cc
--- old/yast2-pkg-bindings-2.13.51/src/Package.cc 2006-04-06 20:26:23.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.52/src/Package.cc 2006-04-06 22:38:28.000000000 +0200
@@ -2105,8 +2105,8 @@
zypp::ZYpp::CommitResult result;
// clean the last reported source
- DownloadResolvableReceive::last_source_id = -1;
- DownloadResolvableReceive::last_source_media = -1;
+ // DownloadResolvableReceive::last_source_id = -1;
+ // DownloadResolvableReceive::last_source_media = -1;
try
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package gnome2-SuSE
checked in at Thu Apr 6 22:09:15 CEST 2006.
--------
--- GNOME/gnome2-SuSE/gnome2-SuSE.changes 2006-04-05 21:27:02.000000000 +0200
+++ gnome2-SuSE/gnome2-SuSE.changes 2006-04-06 21:57:26.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 6 21:57:05 CEST 2006 - dobey(a)suse.de
+
+- Update Gilouche gtk+ theme to fix colors in main menu, and the
+ app browser and control center panel side strips
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome2-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.Qdntba/_old 2006-04-06 22:09:08.000000000 +0200
+++ /var/tmp/diff_new_pack.Qdntba/_new 2006-04-06 22:09:08.000000000 +0200
@@ -16,7 +16,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 10.1
-Release: 15
+Release: 16
Summary: Distribution Default Settings for the GNOME 2.x Desktop
Source: gnome2-SuSE-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -73,6 +73,9 @@
/opt/gnome/share/gnome-background-properties
%changelog -n gnome2-SuSE
+* Thu Apr 06 2006 - dobey(a)suse.de
+- Update Gilouche gtk+ theme to fix colors in main menu, and the
+ app browser and control center panel side strips
* Wed Apr 05 2006 - dobey(a)suse.de
- Update Gilouche GTK+ theme
Fixes https://bugzilla.novell.com/show_bug.cgi?id=160984
++++++ gnome2-SuSE-10.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gnome2-defaults-10.1/gtk-theme/Gilouche/gtk-2.0/gtkrc new/gnome2-defaults-10.1/gtk-theme/Gilouche/gtk-2.0/gtkrc
--- old/gnome2-defaults-10.1/gtk-theme/Gilouche/gtk-2.0/gtkrc 2006-03-27 18:12:21.000000000 +0200
+++ new/gnome2-defaults-10.1/gtk-theme/Gilouche/gtk-2.0/gtkrc 2006-04-06 21:48:51.000000000 +0200
@@ -178,7 +178,7 @@
{
bg[SELECTED] = "#84b0da" # Outline
bg[NORMAL] = "#fdfbf7" # Base bg color
- bg[ACTIVE] = "#f3eee4" # Right side bg color
+ bg[ACTIVE] = "#e9eef5" # Right side bg color
fg[NORMAL] = "#6a97c5" # Left side caption text color
fg[INSENSITIVE] = "#5c8dbf" # Right side caption text color
}
@@ -190,7 +190,7 @@
style "theme-shell" = "theme-default"
{
- bg[ACTIVE] = "#f3eee4" # Left side bg color
+ bg[ACTIVE] = "#e9eef5" # Left side bg color
fg[NORMAL] = "#5c8dbf" # Left side text color
base[NORMAL] = "#fdfbf7" # Base bg color
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-update
checked in at Thu Apr 6 22:07:59 CEST 2006.
--------
--- yast2-update/yast2-update.changes 2006-04-05 21:27:38.000000000 +0200
+++ yast2-update/yast2-update.changes 2006-04-06 19:54:32.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 6 19:19:07 CEST 2006 - jsrain(a)suse.de
+
+- do not display hidden patterns in proposal (#159450)
+- 2.13.14
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.13.13.tar.bz2
New:
----
yast2-update-2.13.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.3hND6g/_old 2006-04-06 22:07:50.000000000 +0200
+++ /var/tmp/diff_new_pack.3hND6g/_new 2006-04-06 22:07:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.13.13)
+# spec file for package yast2-update (Version 2.13.14)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.13.13
+Version: 2.13.14
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.13.13.tar.bz2
+Source0: yast2-update-2.13.14.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml
Requires: yast2 yast2-installation yast2-storage yast2-packager
@@ -39,7 +39,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-update-2.13.13
+%setup -n yast2-update-2.13.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog -n yast2-update
+* Thu Apr 06 2006 - jsrain(a)suse.de
+- do not display hidden patterns in proposal (#159450)
+- 2.13.14
* Wed Apr 05 2006 - jsrain(a)suse.de
- call Pkg::PkgFreshen when generating update proposal (#156980)
- 2.13.13
++++++ yast2-update-2.13.13.tar.bz2 -> yast2-update-2.13.14.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.13/VERSION new/yast2-update-2.13.14/VERSION
--- old/yast2-update-2.13.13/VERSION 2006-04-05 21:21:36.000000000 +0200
+++ new/yast2-update-2.13.14/VERSION 2006-04-06 19:52:03.000000000 +0200
@@ -1 +1 @@
-2.13.13
+2.13.14
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.13/configure new/yast2-update-2.13.14/configure
--- old/yast2-update-2.13.13/configure 2006-04-05 21:24:31.000000000 +0200
+++ new/yast2-update-2.13.14/configure 2006-04-06 19:54:30.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-update 2.13.13.
+# Generated by GNU Autoconf 2.59 for yast2-update 2.13.14.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-update'
PACKAGE_TARNAME='yast2-update'
-PACKAGE_VERSION='2.13.13'
-PACKAGE_STRING='yast2-update 2.13.13'
+PACKAGE_VERSION='2.13.14'
+PACKAGE_STRING='yast2-update 2.13.14'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-update 2.13.13 to adapt to many kinds of systems.
+\`configure' configures yast2-update 2.13.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-update 2.13.13:";;
+ short | recursive ) echo "Configuration of yast2-update 2.13.14:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-update configure 2.13.13
+yast2-update configure 2.13.14
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-update $as_me 2.13.13, which was
+It was created by yast2-update $as_me 2.13.14, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-update'
- VERSION='2.13.13'
+ VERSION='2.13.14'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.13"
+VERSION="2.13.14"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-update $as_me 2.13.13, which was
+This file was extended by yast2-update $as_me 2.13.14, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-update config.status 2.13.13
+yast2-update config.status 2.13.14
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.13/configure.in new/yast2-update-2.13.14/configure.in
--- old/yast2-update-2.13.13/configure.in 2006-04-05 21:24:27.000000000 +0200
+++ new/yast2-update-2.13.14/configure.in 2006-04-06 19:54:26.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-update, 2.13.13, http://www.suse.de/feedback, yast2-update)
+AC_INIT(yast2-update, 2.13.14, http://www.suse.de/feedback, yast2-update)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.13"
+VERSION="2.13.14"
RPMNAME="yast2-update"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.13.13/src/clients/update_proposal.ycp new/yast2-update-2.13.14/src/clients/update_proposal.ycp
--- old/yast2-update-2.13.13/src/clients/update_proposal.ycp 2006-04-05 21:19:58.000000000 +0200
+++ new/yast2-update-2.13.14/src/clients/update_proposal.ycp 2006-04-06 19:18:37.000000000 +0200
@@ -268,7 +268,7 @@
{
list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, "");
patterns = filter (map<string,any> p, patterns, {
- return p["status"]:nil == `selected && p["summary"]:p["name"]:"" != "";
+ return p["status"]:nil == `selected && p["user_visible"]:true && p["summary"]:p["name"]:"" != "";
});
// proposal string
tmp = add (tmp, _("Update Based on Patterns"));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Apr 6 22:07:38 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-06 19:02:10.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-06 20:30:10.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Apr 6 20:26:26 CEST 2006 - visnov(a)suse.cz
+
+- invoke SourceChange callback (#161298)
+- 2.13.51
+
+-------------------------------------------------------------------
+Thu Apr 6 20:26:27 CEST 2006 - jsrain(a)suse.de
+
+- fixed YCP signature of Pkg::SourceCleanupBroken
+- 2.13.50
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.49.tar.bz2
New:
----
yast2-pkg-bindings-2.13.51.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.kFc5us/_old 2006-04-06 22:07:26.000000000 +0200
+++ /var/tmp/diff_new_pack.kFc5us/_new 2006-04-06 22:07:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.49)
+# spec file for package yast2-pkg-bindings (Version 2.13.51)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.13.49
-Release: 2
+Version: 2.13.51
+Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.49.tar.bz2
+Source0: yast2-pkg-bindings-2.13.51.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky <visnov(a)suse.cz>
%prep
-%setup -n yast2-pkg-bindings-2.13.49
+%setup -n yast2-pkg-bindings-2.13.51
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,12 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Thu Apr 06 2006 - jsrain(a)suse.de
+- fixed YCP signature of Pkg::SourceCleanupBroken
+- 2.13.50
+* Thu Apr 06 2006 - visnov(a)suse.cz
+- invoke SourceChange callback (#161298)
+- 2.13.51
* Thu Apr 06 2006 - kkaempf(a)suse.de
- more debug for DoProvideNameKind()
* Thu Apr 06 2006 - schubi(a)suse.de
++++++ yast2-pkg-bindings-2.13.49.tar.bz2 -> yast2-pkg-bindings-2.13.51.tar.bz2 ++++++
++++ 17580 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.49/Makefile.am new/yast2-pkg-bindings-2.13.51/Makefile.am
--- old/yast2-pkg-bindings-2.13.49/Makefile.am 2006-04-04 12:47:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.51/Makefile.am 2006-03-13 14:00:24.000000000 +0100
@@ -154,7 +154,7 @@
$(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
+package: check-up-to-date check-tagversion check-all-packages package-local
TAGVERSION = $(PREFIX)/bin/y2tool tagversion
@@ -199,9 +199,6 @@
false; \
fi
-check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
-
stable: checkin-stable
checkin-stable: package
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.49/VERSION new/yast2-pkg-bindings-2.13.51/VERSION
--- old/yast2-pkg-bindings-2.13.49/VERSION 2006-04-06 18:42:45.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.51/VERSION 2006-04-06 20:28:38.000000000 +0200
@@ -1 +1 @@
-2.13.49
+2.13.51
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.49/configure.in new/yast2-pkg-bindings-2.13.51/configure.in
--- old/yast2-pkg-bindings-2.13.49/configure.in 2006-04-04 12:47:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.51/configure.in 2006-03-13 14:00:24.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.45, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.25, http://www.suse.de/feedback, yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.45"
+VERSION="2.13.25"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres <ma(a)suse.de>"
@@ -158,7 +158,6 @@
AC_HEADER_STDC
-PKG_CHECK_MODULES([ZYPP], [libzypp])
AX_CHECK_DOCBOOK
AC_CONFIG_FILES(Makefile doc/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.49/src/Callbacks.cc new/yast2-pkg-bindings-2.13.51/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.49/src/Callbacks.cc 2006-04-06 14:49:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.51/src/Callbacks.cc 2006-04-06 20:24:08.000000000 +0200
@@ -33,6 +33,7 @@
#include <zypp/Package.h>
#include <zypp/Product.h>
#include <zypp/KeyRing.h>
+#include <zypp/SourceManager.h>
// FIXME: do this nicer, source create use this to avoid user feedback
// on probing of source type
@@ -342,6 +343,9 @@
///////////////////////////////////////////////////////////////////
struct DownloadResolvableReceive : public Recipient, public zypp::callback::ReceiveReport<zypp::source::DownloadResolvableReport>
{
+ static int last_source_id;
+ static int last_source_media;
+
DownloadResolvableReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
int last_reported;
@@ -357,11 +361,28 @@
{
unsigned size = 0;
last_reported = 0;
-
+
if ( zypp::isKind<zypp::Package> (resolvable_ptr) )
{
- size = (zypp::asKind<zypp::Package>(resolvable_ptr))->archivesize();
+ zypp::Package::Ptr pkg =
+ zypp::asKind<zypp::Package>(resolvable_ptr);
+
+ size = pkg->archivesize();
+
+ int source_id = pkg->source().numericId();
+ int media_nr = pkg->mediaId();
+
+ if( source_id != last_source_id || media_nr != last_source_media )
+ {
+ CB callback( ycpcb( YCPCallbacks::CB_SourceChange ) );
+ if (callback._set) {
+ callback.addInt( source_id );
+ callback.addInt( media_nr );
+ callback.evaluate();
+ }
+ }
}
+
CB callback( ycpcb( YCPCallbacks::CB_StartProvide ) );
if (callback._set) {
bool remote = url.getScheme() != "cd" && url.getScheme() != "dvd"
@@ -423,6 +444,9 @@
};
+ int DownloadResolvableReceive::last_source_id = -1;
+ int DownloadResolvableReceive::last_source_media = -1;
+
/*
///////////////////////////////////////////////////////////////////
// InstTargetCallbacks::ScriptExecCallback
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.49/src/Package.cc new/yast2-pkg-bindings-2.13.51/src/Package.cc
--- old/yast2-pkg-bindings-2.13.49/src/Package.cc 2006-04-06 18:42:44.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.51/src/Package.cc 2006-04-06 20:26:23.000000000 +0200
@@ -2104,6 +2104,10 @@
zypp::ZYpp::CommitResult result;
+ // clean the last reported source
+ DownloadResolvableReceive::last_source_id = -1;
+ DownloadResolvableReceive::last_source_media = -1;
+
try
{
result = zypp_ptr()->commit(medianr);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.13.49/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.51/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.13.49/src/PkgModuleFunctions.h 2006-04-06 18:42:44.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.51/src/PkgModuleFunctions.h 2006-04-06 20:28:01.000000000 +0200
@@ -205,7 +205,7 @@
YCPValue SourceCreate (const YCPString&, const YCPString&);
/* TYPEINFO: list<integer>(boolean)*/
YCPValue SourceStartCache (const YCPBoolean&);
- /* TYPEINFO: boolean(void)*/
+ /* TYPEINFO: boolean()*/
YCPValue SourceCleanupBroken ();
/* TYPEINFO: list<integer>(boolean)*/
YCPValue SourceGetCurrent (const YCPBoolean& enabled);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0
Hello community,
here is the log from the commit of package yast2-packager
checked in at Thu Apr 6 22:07:22 CEST 2006.
--------
--- yast2-packager/yast2-packager.changes 2006-04-06 15:58:42.000000000 +0200
+++ yast2-packager/yast2-packager.changes 2006-04-06 19:57:45.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Apr 6 19:57:09 CEST 2006 - mvidner(a)suse.cz
+
+- Only add the alias parameter to rug sa for --type=ZYPP (#164083).
+- 2.13.69
+
+-------------------------------------------------------------------
+Thu Apr 6 19:18:40 CEST 2006 - jsrain(a)suse.de
+
+- do not display hidden patterns in proposal (#159450)
+
+-------------------------------------------------------------------
+Thu Apr 6 16:19:19 CEST 2006 - mvidner(a)suse.cz
+
+- Use Pkg::SourceGeneralData["type"] for rug sa, do not hardcode "zypp".
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-2.13.68.tar.bz2
New:
----
yast2-packager-2.13.69.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.cKKWv9/_old 2006-04-06 22:07:06.000000000 +0200
+++ /var/tmp/diff_new_pack.cKKWv9/_new 2006-04-06 22:07:06.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-packager (Version 2.13.68)
+# spec file for package yast2-packager (Version 2.13.69)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-packager
-Version: 2.13.68
+Version: 2.13.69
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-packager-2.13.68.tar.bz2
+Source0: yast2-packager-2.13.69.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml
Requires: yast2 yast2-installation checkmedia yast2-country
@@ -41,7 +41,7 @@
Arvin Schnell <arvin(a)suse.de>
%prep
-%setup -n yast2-packager-2.13.68
+%setup -n yast2-packager-2.13.69
%build
%{prefix}/bin/y2tool y2autoconf
@@ -78,6 +78,13 @@
%doc %{prefix}/share/doc/packages/yast2-packager
%changelog -n yast2-packager
+* Thu Apr 06 2006 - mvidner(a)suse.cz
+- Only add the alias parameter to rug sa for --type=ZYPP (#164083).
+- 2.13.69
+* Thu Apr 06 2006 - jsrain(a)suse.de
+- do not display hidden patterns in proposal (#159450)
+* Thu Apr 06 2006 - mvidner(a)suse.cz
+- Use Pkg::SourceGeneralData["type"] for rug sa, do not hardcode "zypp".
* Thu Apr 06 2006 - lslezak(a)suse.cz
- increased minimum free size for update (from 2%% to 5%%) (#163197)
- 2.13.68
++++++ yast2-packager-2.13.68.tar.bz2 -> yast2-packager-2.13.69.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/VERSION new/yast2-packager-2.13.69/VERSION
--- old/yast2-packager-2.13.68/VERSION 2006-04-06 15:58:45.000000000 +0200
+++ new/yast2-packager-2.13.69/VERSION 2006-04-06 19:54:34.000000000 +0200
@@ -1 +1 @@
-2.13.68
+2.13.69
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/configure new/yast2-packager-2.13.69/configure
--- old/yast2-packager-2.13.68/configure 2006-03-06 14:16:57.000000000 +0100
+++ new/yast2-packager-2.13.69/configure 2006-04-06 20:11:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.39.
+# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.69.
#
# Report bugs to <http://www.suse.de/feedback>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-packager'
PACKAGE_TARNAME='yast2-packager'
-PACKAGE_VERSION='2.13.39'
-PACKAGE_STRING='yast2-packager 2.13.39'
+PACKAGE_VERSION='2.13.69'
+PACKAGE_STRING='yast2-packager 2.13.69'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-packager 2.13.39 to adapt to many kinds of systems.
+\`configure' configures yast2-packager 2.13.69 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-packager 2.13.39:";;
+ short | recursive ) echo "Configuration of yast2-packager 2.13.69:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-packager configure 2.13.39
+yast2-packager configure 2.13.69
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-packager $as_me 2.13.39, which was
+It was created by yast2-packager $as_me 2.13.69, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-packager'
- VERSION='2.13.39'
+ VERSION='2.13.69'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.39"
+VERSION="2.13.69"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
@@ -2695,7 +2695,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-packager $as_me 2.13.39, which was
+This file was extended by yast2-packager $as_me 2.13.69, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2750,7 +2750,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-packager config.status 2.13.39
+yast2-packager config.status 2.13.69
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/configure.in new/yast2-packager-2.13.69/configure.in
--- old/yast2-packager-2.13.68/configure.in 2006-03-06 14:16:53.000000000 +0100
+++ new/yast2-packager-2.13.69/configure.in 2006-04-06 20:11:44.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-packager
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-packager, 2.13.39, http://www.suse.de/feedback, yast2-packager)
+AC_INIT(yast2-packager, 2.13.69, http://www.suse.de/feedback, yast2-packager)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.39"
+VERSION="2.13.69"
RPMNAME="yast2-packager"
MAINTAINER="Jiri Srain <jsrain(a)suse.cz>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/packager.pot new/yast2-packager-2.13.69/packager.pot
--- old/yast2-packager-2.13.68/packager.pot 2006-03-10 16:31:46.000000000 +0100
+++ new/yast2-packager-2.13.69/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,301 +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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 14:35+0100\n"
-"PO-Revision-Date: 2006-03-07 12:52+0100\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. label for showing installation sources
-#: src/clients/inst_media.ycp:40 src/clients/inst_mediacopy.ycp:46
-msgid "Registered Catalogs:"
-msgstr "Registered Catalogs"
-
-#: src/clients/inst_packages.ycp:69 src/clients/inst_packages.ycp:74
-#: src/clients/inst_packages.ycp:79 src/clients/inst_packages.ycp:83
-msgid "<p>"
-msgstr ""
-
-#. Dialog title
-#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: src/clients/inst_packages.ycp:95
-msgid "Software Selection and System Tasks"
-msgstr ""
-
-#. error report
-#: src/clients/inst_rpmcopy.ycp:163
-msgid "Error occurred while switching the service pack catalog."
-msgstr ""
-
-#. 3. Copy <cached_source_datadir>/<arch>/<package> from cached source to Installation::destdir+"/{var?}/tmp"
-#. translators: this is an information popup, %1 is a number
-#: src/clients/inst_rpmcopy.ycp:418
-#, ycp-format
-msgid "Copying files from CD %1 to disk..."
-msgstr ""
-
-#. Intermediate contents of the software selection screen
-#: src/clients/inst_selections.ycp:45
-msgid "Initializing catalogs..."
-msgstr ""
-
-#. Help text Software Selection dialog
-#. Explain selectable system configurations but beware:
-#. some of the text in <b>'s, e.g. Default comes from the index file,
-#. translations must be consistent with po/index/index.??.po
-#: src/clients/inst_selections.ycp:83
-msgid ""
-"<p>\n"
-"The &product; Standard System is a good software\n"
-"selection for most users.\n"
-"</p>"
-msgstr ""
-
-#. help text, continued
-#: src/clients/inst_selections.ycp:95
-msgid ""
-"<p>\n"
-"The <b>Minimal</b> system includes just the bare essentials needed\n"
-"to safely run &product;. This selection <b><i>does not include\n"
-"graphical desktop environments</i></b> -- no X11, no KDE, no GNOME.\n"
-"Select this option as a base for your own custom selection, for\n"
-"dedicated server systems that do not need a graphical desktop, or for\n"
-"systems that are short on disk space or memory.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"The <b>Minimal</b> system includes just the bare essentials needed\n"
-"to safely run &product;. This selection does not include\n"
-"graphical desktop environments--no X11, no KDE, no GNOME.\n"
-"Select this option as a base for your own custom selection, for\n"
-"dedicated server systems that do not need a graphical desktop, or for\n"
-"systems that are short on disk space or memory.\n"
-"</p>"
-
-#. help text, continued
-#: src/clients/inst_selections.ycp:105
-msgid ""
-"<p>\n"
-"With the <b>Minimum graphical system</b>, install the &product;\n"
-"base system and all packages required for X11, the graphical user\n"
-"interface (GUI).\n"
-"You can then work with a simple graphical desktop. </p>"
-msgstr ""
-
-#. label
-#: src/clients/inst_source.ycp:99 src/modules/SourceManager.ycp:459
-msgid "Adding catalog..."
-msgstr ""
-
-#. message part 2 alt. 1
-#: src/clients/inst_source.ycp:115 src/modules/SourceManager.ycp:478
-msgid "A catalog for this product already exists."
-msgstr ""
-
-#. dialog caption
-#: src/clients/inst_source.ycp:264
-msgid "Media Containing the Software Catalog"
-msgstr ""
-
-#: src/clients/inst_source.ycp:312
-msgid ""
-"There were errors when restoring the sources configuration.\n"
-"Not all sources will be available for configuration."
-msgstr ""
-"There were errors when restoring the source configuration.\n"
-"Not all sources will be available for configuration."
-
-#: src/clients/inst_source.ycp:354
-msgid "No SLP catalogs found."
-msgstr ""
-
-#. translators: popup heading
-#: src/clients/inst_source.ycp:373
-msgid "Choose SLP Catalog"
-msgstr ""
-
-#. popup headline
-#: src/clients/inst_source.ycp:486
-msgid "Abort Catalog Configuration"
-msgstr ""
-
-#. popup message
-#: src/clients/inst_source.ycp:488
-msgid ""
-"Abort the catalog configuration?\n"
-"All changes will be lost."
-msgstr ""
-
-#. yes-no popup
-#: src/clients/inst_source.ycp:545
-msgid "Delete selected catalog from list?"
-msgstr "Delete the selected catalog from the list?"
-
-#. label
-#: src/include/inst_source_dialogs.ycp:157
-msgid "NFS Server Source"
-msgstr ""
-
-#. text entry
-#: src/include/inst_source_dialogs.ycp:161
-#: src/include/inst_source_dialogs.ycp:326
-#: src/include/inst_source_dialogs.ycp:498
-msgid "&Path to Directory or ISO Image"
-msgstr ""
-
-#. checkbox label
-#: src/include/inst_source_dialogs.ycp:163
-#: src/include/inst_source_dialogs.ycp:328
-#: src/include/inst_source_dialogs.ycp:506
-msgid "ISO Image"
-msgstr ""
-
-#. label
-#: src/include/inst_source_dialogs.ycp:495
-msgid "Local Directory or ISO"
-msgstr ""
-
-#. dialog caption
-#: src/include/inst_source_dialogs.ycp:528
-msgid "ISO Image File"
-msgstr ""
-
-#. label
-#: src/include/inst_source_dialogs.ycp:659
-msgid "Catalog URL"
-msgstr ""
-
-#. error popup during package installation, %1 is the name of the package
-#: src/modules/PackageCallbacks.ycp:365
-#, ycp-format
-msgid "Removal of package %1 failed."
-msgstr ""
-
-#. error report
-#: src/modules/PackageCallbacks.ycp:496
-msgid ""
-"<p>The source at the specified URL now provides a different media ID.\n"
-"If the URL is correct, this indicates that the source content has changed. To \n"
-"continue using this source, start <b>Change Source of Installation</b> from \n"
-"the YaST control center and refresh the installation source.</p>\n"
-msgstr ""
-
-#. currently unused
-#: src/modules/PackageCallbacks.ycp:553
-msgid "The correct catalog medium could not be mounted."
-msgstr ""
-
-#. error message - a label followed by a richtext with details
-#: src/modules/PackageCallbacks.ycp:733
-msgid "Error occurred while refreshing the catalog."
-msgstr ""
-
-#. error message - a label followed by a richtext with details
-#: src/modules/PackageCallbacks.ycp:736
-msgid "Unable to retrieve the remote catalog description."
-msgstr ""
-
-#. command line mode - ask user whether the installation should be aborted
-#: src/modules/PackageCallbacks.ycp:763
-msgid "Disable the catalog?"
-msgstr ""
-
-#. push button
-#: src/modules/PackageCallbacks.ycp:786
-msgid "&Disable Catalog"
-msgstr ""
-
-#. message popup
-#: src/modules/PackageCallbacks.ycp:814
-msgid "Catalog not refreshed."
-msgstr ""
-
-#. message popup
-#: src/modules/PackageCallbacks.ycp:820
-msgid "Catalog disabled."
-msgstr ""
-
-#. error in proposal, %1 is URL
-#: src/modules/Packages.ycp:522
-#, ycp-format
-msgid "No catalog found at '%1'."
-msgstr ""
-
-#. message popup, %1 is product name
-#: src/modules/Packages.ycp:530
-#, ycp-format
-msgid "Insert %1 CD 1"
-msgstr ""
-
-#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:130
-msgid "Initializing Available Catalogs"
-msgstr ""
-
-#. Progress stage 1/3
-#: src/modules/SourceManager.ycp:138
-msgid "Read configured catalogs"
-msgstr ""
-
-#. Progress stage 2/3
-#: src/modules/SourceManager.ycp:140
-msgid "Detect available catalogs via SLP"
-msgstr ""
-
-#. Progress step 1/3
-#: src/modules/SourceManager.ycp:143
-msgid "Reading configured catalogs..."
-msgstr ""
-
-#. Progress step 2/3
-#: src/modules/SourceManager.ycp:145
-msgid "Detecting available catalogs..."
-msgstr ""
-
-#. Error message
-#: src/modules/SourceManager.ycp:158
-msgid "Cannot read catalogs."
-msgstr ""
-
-#. Error message
-#: src/modules/SourceManager.ycp:166
-msgid "Cannot detect availabe catalogs."
-msgstr ""
-
-#. popup message header
-#: src/modules/SourceManager.ycp:192
-msgid ""
-"Unable to save changes to the catalog\n"
-" repository.\n"
-msgstr ""
-
-#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:222
-msgid "Saving Catalog Configuration"
-msgstr ""
-
-#. Progress stage 1/1
-#: src/modules/SourceManager.ycp:229
-msgid "Write catalog settings"
-msgstr ""
-
-#: src/modules/SourceManager.ycp:472
-#, ycp-format
-msgid ""
-"Unable to create catalog\n"
-"from URL '%1'."
-msgstr ""
-
-#. summary header
-#: src/modules/SourceManager.ycp:643
-msgid "Configured Catalogs"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/src/modules/Packages.ycp new/yast2-packager-2.13.69/src/modules/Packages.ycp
--- old/yast2-packager-2.13.68/src/modules/Packages.ycp 2006-04-06 15:58:29.000000000 +0200
+++ new/yast2-packager-2.13.69/src/modules/Packages.ycp 2006-04-06 19:53:16.000000000 +0200
@@ -3,7 +3,7 @@
* Package: Package selections
* Authors: Anas Nashif <nashif(a)suse.de>
*
- * $Id: Packages.ycp 29778 2006-04-05 19:27:24Z jsrain $
+ * $Id: Packages.ycp 29822 2006-04-06 17:37:34Z jsrain $
*/
{
@@ -1086,7 +1086,7 @@
{
list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, "");
foreach (map<string,any> p, patterns, {
- if (p["status"]:nil == `selected)
+ if (p["status"]:nil == `selected && p["user_visible"]:true)
{
string summary = p["summary"]:"";
if (summary == "")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/src/modules/SourceManager.ycp new/yast2-packager-2.13.69/src/modules/SourceManager.ycp
--- old/yast2-packager-2.13.68/src/modules/SourceManager.ycp 2006-04-06 15:58:29.000000000 +0200
+++ new/yast2-packager-2.13.69/src/modules/SourceManager.ycp 2006-04-06 19:57:50.000000000 +0200
@@ -3,9 +3,11 @@
* Package: Package Source Management
* Summary: SourceManager settings, input and output functions
* Authors: Anas Nashif <nashif(a)suse.de>
+ * Lukas Ocilka <locilka(a)suse.cz>
+ * Martin Vidner <mvidner(a)suse.cz>
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 29753 2006-04-05 15:59:42Z mvidner $
+ * $Id: SourceManager.ycp 29827 2006-04-06 17:57:47Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -791,26 +793,30 @@
*/
boolean AddOrDeleteZYPPServiceIntoZMD (integer src_id, boolean adding) {
map gendata = Pkg::SourceGeneralData (src_id);
+ string stype = gendata["type"]:"";
string url = gendata["url"]:"";
// ZMD must have unique URIs, so we append the alias
string alias = gendata["alias"]:"";
- y2milestone ("id: %1, url: %2, alias: %3", src_id, url, alias);
- if (url == "" || alias == "") {
+ y2milestone ("id: %1, type: %2, url: %3, alias: %4", src_id, stype, url, alias);
+ if (stype == "" || url == "" || alias == "") {
y2error ("ugh");
return false;
}
- // URL (un)escapes for us
- // maybe a bug with "="?
- map parsed_url = URL::Parse (url);
- string query = parsed_url["query"]:"";
- if (query != "") query = query + ";";
- parsed_url["query"] = query + "alias=" + alias;
- string test_url = URL::Build (parsed_url);
- y2milestone ("test zmd url: %1", test_url);
+ if (stype == "ZYPP") // yum sources do not need+understand the alias
+ {
+ // URL (un)escapes for us
+ // maybe a bug with "="?
+ map parsed_url = URL::Parse (url);
+ string query = parsed_url["query"]:"";
+ if (query != "") query = query + ";";
+ parsed_url["query"] = query + "alias=" + alias;
+ string test_url = URL::Build (parsed_url);
+ y2milestone ("test zmd url: %1", test_url);
- string separator = (search (url, "?") == nil)? "?": ";";
- url = url + separator + "alias=" + alias;
+ string separator = (search (url, "?") == nil)? "?": ";";
+ url = url + separator + "alias=" + alias;
+ }
y2milestone ("zmd url: %1", url);
string name = alias;
@@ -818,8 +824,8 @@
string command = nil;
if (adding) {
command = sformat (
- "/usr/bin/rug service-add --type=zypp '%1' '%2' && /usr/bin/rug subscribe '%1'",
- url, name
+ "/usr/bin/rug service-add --type='%3' '%1' '%2' && /usr/bin/rug subscribe '%1'",
+ url, name, stype
);
}
else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/src/modules/test.ycp new/yast2-packager-2.13.69/src/modules/test.ycp
--- old/yast2-packager-2.13.68/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100
+++ new/yast2-packager-2.13.69/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-
-{
- import "Package";
- import "CommandLine";
-
- textdomain "test";
-
- boolean startHandler(map<string,string> opts) {
- Package::InstallAll(["samba-doc", "qt3-devel-doc"]);
-// Package::InstallAll(["sambadocdfdfdf"]);
-
- return true;
- }
-
- symbol GUIhandler() {
- y2milestone("GUIhandler");
- return `next;
- }
-
- boolean Read() {
- return true;
- }
-
- boolean Write() {
- return true;
- }
-
- map cmdline = $[
- // help text
- "help" : _("Start installation in a virtual machine"),
- "id" : "vm",
- "guihandler": GUIhandler,
- "initialize": Read,
- "finish" : Write,
- "actions" : $[
- "start" : $[
- // command description
- "help" : _("Start installation"),
- "handler" : startHandler
- ]
- ],
- "options" : $[
- "configured" : $[
- // option description
- "help" : _("List only configured devices")
- ],
- "all" : $[
- // option description
- "help" : _("List all detected IDE devices")
- ]
- ],
- "mappings" : $[
- "start" : ["configured", "all"],
- ]
- ];
-
- any ret = CommandLine::Run(cmdline);
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.68/yast2-packager-2.13.68/packager.pot new/yast2-packager-2.13.69/yast2-packager-2.13.68/packager.pot
--- old/yast2-packager-2.13.68/yast2-packager-2.13.68/packager.pot 2006-03-10 16:31:46.000000000 +0100
+++ new/yast2-packager-2.13.69/yast2-packager-2.13.68/packager.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,301 +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.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: yast2 9.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-06 14:35+0100\n"
-"PO-Revision-Date: 2006-03-07 12:52+0100\n"
-"Last-Translator: proofreader\n"
-"Language-Team: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. label for showing installation sources
-#: src/clients/inst_media.ycp:40 src/clients/inst_mediacopy.ycp:46
-msgid "Registered Catalogs:"
-msgstr "Registered Catalogs"
-
-#: src/clients/inst_packages.ycp:69 src/clients/inst_packages.ycp:74
-#: src/clients/inst_packages.ycp:79 src/clients/inst_packages.ycp:83
-msgid "<p>"
-msgstr ""
-
-#. Dialog title
-#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: src/clients/inst_packages.ycp:95
-msgid "Software Selection and System Tasks"
-msgstr ""
-
-#. error report
-#: src/clients/inst_rpmcopy.ycp:163
-msgid "Error occurred while switching the service pack catalog."
-msgstr ""
-
-#. 3. Copy <cached_source_datadir>/<arch>/<package> from cached source to Installation::destdir+"/{var?}/tmp"
-#. translators: this is an information popup, %1 is a number
-#: src/clients/inst_rpmcopy.ycp:418
-#, ycp-format
-msgid "Copying files from CD %1 to disk..."
-msgstr ""
-
-#. Intermediate contents of the software selection screen
-#: src/clients/inst_selections.ycp:45
-msgid "Initializing catalogs..."
-msgstr ""
-
-#. Help text Software Selection dialog
-#. Explain selectable system configurations but beware:
-#. some of the text in <b>'s, e.g. Default comes from the index file,
-#. translations must be consistent with po/index/index.??.po
-#: src/clients/inst_selections.ycp:83
-msgid ""
-"<p>\n"
-"The &product; Standard System is a good software\n"
-"selection for most users.\n"
-"</p>"
-msgstr ""
-
-#. help text, continued
-#: src/clients/inst_selections.ycp:95
-msgid ""
-"<p>\n"
-"The <b>Minimal</b> system includes just the bare essentials needed\n"
-"to safely run &product;. This selection <b><i>does not include\n"
-"graphical desktop environments</i></b> -- no X11, no KDE, no GNOME.\n"
-"Select this option as a base for your own custom selection, for\n"
-"dedicated server systems that do not need a graphical desktop, or for\n"
-"systems that are short on disk space or memory.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"The <b>Minimal</b> system includes just the bare essentials needed\n"
-"to safely run &product;. This selection does not include\n"
-"graphical desktop environments--no X11, no KDE, no GNOME.\n"
-"Select this option as a base for your own custom selection, for\n"
-"dedicated server systems that do not need a graphical desktop, or for\n"
-"systems that are short on disk space or memory.\n"
-"</p>"
-
-#. help text, continued
-#: src/clients/inst_selections.ycp:105
-msgid ""
-"<p>\n"
-"With the <b>Minimum graphical system</b>, install the &product;\n"
-"base system and all packages required for X11, the graphical user\n"
-"interface (GUI).\n"
-"You can then work with a simple graphical desktop. </p>"
-msgstr ""
-
-#. label
-#: src/clients/inst_source.ycp:99 src/modules/SourceManager.ycp:459
-msgid "Adding catalog..."
-msgstr ""
-
-#. message part 2 alt. 1
-#: src/clients/inst_source.ycp:115 src/modules/SourceManager.ycp:478
-msgid "A catalog for this product already exists."
-msgstr ""
-
-#. dialog caption
-#: src/clients/inst_source.ycp:264
-msgid "Media Containing the Software Catalog"
-msgstr ""
-
-#: src/clients/inst_source.ycp:312
-msgid ""
-"There were errors when restoring the sources configuration.\n"
-"Not all sources will be available for configuration."
-msgstr ""
-"There were errors when restoring the source configuration.\n"
-"Not all sources will be available for configuration."
-
-#: src/clients/inst_source.ycp:354
-msgid "No SLP catalogs found."
-msgstr ""
-
-#. translators: popup heading
-#: src/clients/inst_source.ycp:373
-msgid "Choose SLP Catalog"
-msgstr ""
-
-#. popup headline
-#: src/clients/inst_source.ycp:486
-msgid "Abort Catalog Configuration"
-msgstr ""
-
-#. popup message
-#: src/clients/inst_source.ycp:488
-msgid ""
-"Abort the catalog configuration?\n"
-"All changes will be lost."
-msgstr ""
-
-#. yes-no popup
-#: src/clients/inst_source.ycp:545
-msgid "Delete selected catalog from list?"
-msgstr "Delete the selected catalog from the list?"
-
-#. label
-#: src/include/inst_source_dialogs.ycp:157
-msgid "NFS Server Source"
-msgstr ""
-
-#. text entry
-#: src/include/inst_source_dialogs.ycp:161
-#: src/include/inst_source_dialogs.ycp:326
-#: src/include/inst_source_dialogs.ycp:498
-msgid "&Path to Directory or ISO Image"
-msgstr ""
-
-#. checkbox label
-#: src/include/inst_source_dialogs.ycp:163
-#: src/include/inst_source_dialogs.ycp:328
-#: src/include/inst_source_dialogs.ycp:506
-msgid "ISO Image"
-msgstr ""
-
-#. label
-#: src/include/inst_source_dialogs.ycp:495
-msgid "Local Directory or ISO"
-msgstr ""
-
-#. dialog caption
-#: src/include/inst_source_dialogs.ycp:528
-msgid "ISO Image File"
-msgstr ""
-
-#. label
-#: src/include/inst_source_dialogs.ycp:659
-msgid "Catalog URL"
-msgstr ""
-
-#. error popup during package installation, %1 is the name of the package
-#: src/modules/PackageCallbacks.ycp:365
-#, ycp-format
-msgid "Removal of package %1 failed."
-msgstr ""
-
-#. error report
-#: src/modules/PackageCallbacks.ycp:496
-msgid ""
-"<p>The source at the specified URL now provides a different media ID.\n"
-"If the URL is correct, this indicates that the source content has changed. To \n"
-"continue using this source, start <b>Change Source of Installation</b> from \n"
-"the YaST control center and refresh the installation source.</p>\n"
-msgstr ""
-
-#. currently unused
-#: src/modules/PackageCallbacks.ycp:553
-msgid "The correct catalog medium could not be mounted."
-msgstr ""
-
-#. error message - a label followed by a richtext with details
-#: src/modules/PackageCallbacks.ycp:733
-msgid "Error occurred while refreshing the catalog."
-msgstr ""
-
-#. error message - a label followed by a richtext with details
-#: src/modules/PackageCallbacks.ycp:736
-msgid "Unable to retrieve the remote catalog description."
-msgstr ""
-
-#. command line mode - ask user whether the installation should be aborted
-#: src/modules/PackageCallbacks.ycp:763
-msgid "Disable the catalog?"
-msgstr ""
-
-#. push button
-#: src/modules/PackageCallbacks.ycp:786
-msgid "&Disable Catalog"
-msgstr ""
-
-#. message popup
-#: src/modules/PackageCallbacks.ycp:814
-msgid "Catalog not refreshed."
-msgstr ""
-
-#. message popup
-#: src/modules/PackageCallbacks.ycp:820
-msgid "Catalog disabled."
-msgstr ""
-
-#. error in proposal, %1 is URL
-#: src/modules/Packages.ycp:522
-#, ycp-format
-msgid "No catalog found at '%1'."
-msgstr ""
-
-#. message popup, %1 is product name
-#: src/modules/Packages.ycp:530
-#, ycp-format
-msgid "Insert %1 CD 1"
-msgstr ""
-
-#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:130
-msgid "Initializing Available Catalogs"
-msgstr ""
-
-#. Progress stage 1/3
-#: src/modules/SourceManager.ycp:138
-msgid "Read configured catalogs"
-msgstr ""
-
-#. Progress stage 2/3
-#: src/modules/SourceManager.ycp:140
-msgid "Detect available catalogs via SLP"
-msgstr ""
-
-#. Progress step 1/3
-#: src/modules/SourceManager.ycp:143
-msgid "Reading configured catalogs..."
-msgstr ""
-
-#. Progress step 2/3
-#: src/modules/SourceManager.ycp:145
-msgid "Detecting available catalogs..."
-msgstr ""
-
-#. Error message
-#: src/modules/SourceManager.ycp:158
-msgid "Cannot read catalogs."
-msgstr ""
-
-#. Error message
-#: src/modules/SourceManager.ycp:166
-msgid "Cannot detect availabe catalogs."
-msgstr ""
-
-#. popup message header
-#: src/modules/SourceManager.ycp:192
-msgid ""
-"Unable to save changes to the catalog\n"
-" repository.\n"
-msgstr ""
-
-#. SourceManager read dialog caption
-#: src/modules/SourceManager.ycp:222
-msgid "Saving Catalog Configuration"
-msgstr ""
-
-#. Progress stage 1/1
-#: src/modules/SourceManager.ycp:229
-msgid "Write catalog settings"
-msgstr ""
-
-#: src/modules/SourceManager.ycp:472
-#, ycp-format
-msgid ""
-"Unable to create catalog\n"
-"from URL '%1'."
-msgstr ""
-
-#. summary header
-#: src/modules/SourceManager.ycp:643
-msgid "Configured Catalogs"
-msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
1
0