Hello community,

here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Wed Mar 30 16:23:41 CEST 2011.



--------
--- kiwi/kiwi.changes   2011-03-29 18:04:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes      2011-03-30 
12:14:33.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Mar 30 12:00:53 CEST 2011 - adr...@suse.de
+  
+- do not replace @ to . in package names when building products
+  
+-------------------------------------------------------------------
+Wed Mar 30 11:56:16 CEST 2011 - m...@suse.de
+  
+- fixed xen examples for suse 11.4, xen-tools-domU doesn't
+  exist anymore. xen-tools is used instead
+  
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.txIWAg/_old  2011-03-30 16:23:28.000000000 +0200
+++ /var/tmp/diff_new_pack.txIWAg/_new  2011-03-30 16:23:28.000000000 +0200
@@ -66,7 +66,7 @@
 %endif
 Summary:        OpenSuSE - KIWI Image System
 Version:        4.83
-Release:        3
+Release:        5
 Group:          System/Management
 License:        GPLv2
 Source:         %{name}.tar.bz2

++++++ kiwi-docu.tar.bz2 ++++++
kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 
differ: char 11, line 1

++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision  2011-03-25 14:47:34.000000000 +0100
+++ new/kiwi/.revision  2011-03-25 14:47:34.000000000 +0100
@@ -1 +1 @@
-33f5eead4f25d50af8cd2e600590a3b3f730fbfe
+78b2fed47441b022998ece32918d3192d06aafb4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm
--- old/kiwi/modules/KIWIXML.pm 2011-03-29 18:00:22.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2011-03-30 12:10:37.000000000 +0200
@@ -2879,7 +2879,7 @@
                        if (! defined $package) {
                                next;
                        }
-                       if ($type ne "metapackages") {
+                       if ($type ne "metapackages" && $type ne "instpackages") 
{
                                if (($package =~ /@/) && $manager && ($manager 
eq "zypper")) {
                                        $package =~ s/@/\./;
                                }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kiwi/template/ix86/suse-11.4-JeOS/config.xml 
new/kiwi/template/ix86/suse-11.4-JeOS/config.xml
--- old/kiwi/template/ix86/suse-11.4-JeOS/config.xml    2011-03-17 
18:50:53.000000000 +0100
+++ new/kiwi/template/ix86/suse-11.4-JeOS/config.xml    2011-03-30 
12:10:37.000000000 +0200
@@ -74,12 +74,12 @@
        </packages>
        <packages type="image" profiles="xenFlavour">
                <package name="kernel-xen" replaces="kernel-default"/>
-               <package name="xen-tools-domU" replaces=""/>
+               <package name="xen-tools" replaces=""/>
                <package name="xen" replaces=""/>
        </packages>
        <packages type="image" profiles="vmxFlavour">
                <package name="kernel-default" replaces="kernel-xen"/>
-               <package name="kernel-default" replaces="xen-tools-domU"/>
+               <package name="kernel-default" replaces="xen-tools"/>
                <package name="kernel-default" replaces="xen"/>
        </packages>
        <packages type="bootstrap">


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to