[Python-apps-commits] r11586 - in packages/osc/trunk/debian (4 files)

[nijel at users.alioth.debian.org]

    Date: Friday, November 14, 2014 @ 13:02:13
  Author: nijel
Revision: 11586

Change default build-cmd to obs-build (Closes: #769547).

Added:
  packages/osc/trunk/debian/patches/
  packages/osc/trunk/debian/patches/osc-build.patch
  packages/osc/trunk/debian/patches/series
Modified:
  packages/osc/trunk/debian/changelog

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2014-11-14 10:54:35 UTC (rev 11585)
+++ packages/osc/trunk/debian/changelog	2014-11-14 13:02:13 UTC (rev 11586)
@@ -1,3 +1,9 @@
+osc (0.149.0-2) UNRELEASED; urgency=medium
+
+  * Change default build-cmd to obs-build (Closes: #769547).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 14 Nov 2014 14:01:10 +0100
+
 osc (0.149.0-1) unstable; urgency=medium
 
   * New upstream release.

Added: packages/osc/trunk/debian/patches/osc-build.patch
===================================================================
--- packages/osc/trunk/debian/patches/osc-build.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/osc-build.patch	2014-11-14 13:02:13 UTC (rev 11586)
@@ -0,0 +1,43 @@
+From: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Subject: [PATCH] Default build-cmd to /usr/bin/obs-build
+Forwarded: no, debian specific
+
+Unlike upstream packaging the "build" tool has been renamed to
+"obs-build" in debian. Thus, if "obs-build" package is install "$ osc
+build" will work on Debian, if the build-cmd is adjusted by default
+and/or in the user's ~/.oscrc file.
+
+I would also like to request for osc to recommend or depend on
+obs-build, as you see most appropriate, to enable local build of osc
+checked out packages against any distribution out of the box.
+
+Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+---
+ osc/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/osc/conf.py b/osc/conf.py
+index 67f1c97..c4b4a10 100644
+--- a/osc/conf.py
++++ b/osc/conf.py
+@@ -28,7 +28,7 @@ The configuration dictionary could look like this:
+                                                'http_headers':(('Host','api.suse.de'),
+                                                                ('User','faye'))},
+                       'foo.opensuse.org': {'user': 'foo', 'pass': 'foo'}},
+- 'build-cmd': '/usr/bin/build',
++ 'build-cmd': '/usr/bin/obs-build',
+  'build-root': '/abuild/oscbuild-%(repo)s-%(arch)s',
+  'packagecachedir': '/var/cache/osbuild',
+  'su-wrapper': 'sudo',
+@@ -102,7 +102,7 @@ DEFAULTS = {'apiurl': 'https://api.opensuse.org',
+             'su-wrapper': 'sudo',
+ 
+             # build type settings
+-            'build-cmd': '/usr/bin/build',
++            'build-cmd': '/usr/bin/obs-build',
+             'build-type': '',                   # may be empty for chroot, kvm or xen
+             'build-root': '/var/tmp/build-root/%(repo)s-%(arch)s',
+             'build-uid': '',                    # use the default provided by build
+-- 
+2.1.0
+

Added: packages/osc/trunk/debian/patches/series
===================================================================
--- packages/osc/trunk/debian/patches/series	                        (rev 0)
+++ packages/osc/trunk/debian/patches/series	2014-11-14 13:02:13 UTC (rev 11586)
@@ -0,0 +1 @@
+osc-build.patch