CONFLICT Accepting request 42249: Copy from openSUSE:Tools/build based on submit request 42249 from user mlschroe

Rev openSUSE:Factory/33 Md5 c7cbf5fc42d5d0be81d123e6b432b6a8 2010-06-29 15:48:08 autobuild 42249

build-2010.05.29.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3edb4dc9dddb3d4b678a840885a59cf29d1d12ad06c158b5e2e8f271c2c129c6
-size 103603

build-2010.06.29.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:06335d01cbd32301fffe12548c7efdcb1215b67288e79a0f48bb557544f1a550
+size 108340

build.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Jun 29 15:06:06 CEST 2010 - mls@suse.de
+
+- update to current git
+  * add 11.3 config
+  * fix repo creation in --noinit case
+  * support ovf files directly
+  * allow multiple --oldpackages
+  * delta rpm support
+
+-------------------------------------------------------------------
+Mon Jun 21 12:20:36 UTC 2010 - adrian@suse.de
+
+- update to current git
+  * fixes for image building for SLE 10
+  * fix parsing of macros that contain {} blocks
+  * support xz decoder helper script
+  * don't substitute in lines with %(), the parser cannot handle it (bnc#613965)
+  * run kvm instance with the right number of cpus according to given parallel build jobs
+
 -------------------------------------------------------------------
 Sat May 29 13:35:34 UTC 2010 - adrian@suse.de
 

build.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 2010.05.29
+Version: 2010.06.29
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all

build.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package build (Version 2010.05.29)
+# spec file for package build (Version 2010.06.29)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,7 +23,7 @@ License:        GPLv2+
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        A Script to Build SUSE Linux RPMs
-Version:        2010.05.29
+Version:        2010.06.29
 Release:        1
 # osc rm build-*tar.bz2
 # REVISION=$(svn info https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/build | sed -ne "/Revision: /s///p")

debian.changelog

@@ -1,3 +1,14 @@
+build (2010.06.29-1) unstable; urgency=low
+
+  * Update to current git trunk
+    - add 11.3 config
+    - fix repo creation in --noinit case
+    - support ovf files directly
+    - allow multiple --oldpackages
+    - delta rpm support
+
+ -- Adrian Schroeter <adrian@suse.de>  Tue, 29 Jun 2010 10:03:54 +0200
+
 build (2010.02.02-1) unstable; urgency=low
 
   * Update to current git trunk