From 8dbeaff1f6f0e8e513dbdc7f0b92b6cdb2e0965f1520a44993d3c8f8c38406f6 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 5 Mar 2010 15:04:39 +0000
Subject: [PATCH] Accepting request 34119 from openSUSE:Tools

Copy from openSUSE:Tools/osc based on submit request 34119 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34119
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/osc?expand=0&rev=39
---
 debian.changelog   | 15 ++++++++++-----
 debian.tar.gz      |  4 ++--
 osc-0.125.4.tar.gz |  3 ---
 osc-0.125.5.tar.gz |  3 +++
 osc.changes        |  8 ++++++++
 osc.dsc            |  2 +-
 osc.spec           |  4 ++--
 7 files changed, 26 insertions(+), 13 deletions(-)
 delete mode 100644 osc-0.125.4.tar.gz
 create mode 100644 osc-0.125.5.tar.gz

diff --git a/debian.changelog b/debian.changelog
index fce7f05..fe8b958 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,12 +1,17 @@
-osc (0.125.4-1) unstable; urgency=high
-- Updated to 0.125.4
+osc (0.125.4-2) unstable; urgency=low
+  - Fix build and install
 
--- Adrian Schroeter <adrian@suse.de>  Wed, 27 Jan 2010 10:00:00 +0200
+ -- Lubos Lunak <llunak@novell.com>  Thu, 28 Jan 2010 16:39:57 +0100
+
+osc (0.125.4-1) unstable; urgency=high
+  - Updated to 0.125.4
+
+ -- Adrian Schroeter <adrian@suse.de>  Wed, 27 Jan 2010 10:00:00 +0200
 
 osc (0.125.1-1) unstable; urgency=high
-- Updated to 0.125.1
+  - Updated to 0.125.1
 
--- Adrian Schroeter <adrian@suse.de>  Fr, 15 Jan 2010 10:00:00 +0200
+ -- Adrian Schroeter <adrian@suse.de>  Fr, 15 Jan 2010 10:00:00 +0200
 
 osc (0.123-1) unstable; urgency=high
   - Updated to 0.123
diff --git a/debian.tar.gz b/debian.tar.gz
index 540e2cc..3f3dc6a 100644
--- a/debian.tar.gz
+++ b/debian.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f375d152c760441df8215c6a009b96d56d833ad70be844b1ca1fc5780b8cbf4
-size 2131
+oid sha256:82d16afaa81c40865f76d0c97ec91a3092566382145ab7f88cd05fcd7205c3d1
+size 2185
diff --git a/osc-0.125.4.tar.gz b/osc-0.125.4.tar.gz
deleted file mode 100644
index 9a0c2d1..0000000
--- a/osc-0.125.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f2a2535e8a6d373e2c16b5e4d18aad5fc3697b8fa3b8a4651771146e081c3884
-size 159894
diff --git a/osc-0.125.5.tar.gz b/osc-0.125.5.tar.gz
new file mode 100644
index 0000000..4ea8805
--- /dev/null
+++ b/osc-0.125.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e88fd37831f6b154e3ae2b9c35cfcf714d4f2a1e0a520e26b7e2cd48dcc9e77
+size 159631
diff --git a/osc.changes b/osc.changes
index cc8d595..2f8c83c 100644
--- a/osc.changes
+++ b/osc.changes
@@ -1,3 +1,11 @@
+Mon Feb  1 09:16:17 UTC 2010 - adrian@suse.de
+
+- update to version 0.125.5
+  - rdiff happens against baserev now
+  - fixed "osc build --local-package
+  - detect a kiwi file on build
+  - improved _service file handling
+
 -------------------------------------------------------------------
 Wed Jan 27 12:18:34 UTC 2010 - adrian@suse.de
 
diff --git a/osc.dsc b/osc.dsc
index fca082c..cfc7f0a 100644
--- a/osc.dsc
+++ b/osc.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: osc
-Version: 0.125.4-1
+Version: 0.125.5-1
 Binary: osc
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: any
diff --git a/osc.spec b/osc.spec
index e295c64..c1abaf5 100644
--- a/osc.spec
+++ b/osc.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package osc (Version 0.125.4)
+# spec file for package osc (Version 0.125.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -26,7 +26,7 @@ Requires:       python-m2crypto > 0.19
 BuildRequires:  m2crypto
 Requires:       m2crypto > 0.19
 %endif
-Version:        0.125.4
+Version:        0.125.5
 Release:        1
 Group:          Development/Tools/Other
 License:        GPLv2+