[Python-apps-commits] r11946 - in packages/osc/trunk/debian (2 files)

[nijel at users.alioth.debian.org]

    Date: Friday, May 15, 2015 @ 06:45:36
  Author: nijel
Revision: 11946

Fix path to vc command (Closes: #785332).

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

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2015-05-14 09:51:24 UTC (rev 11945)
+++ packages/osc/trunk/debian/changelog	2015-05-15 06:45:36 UTC (rev 11946)
@@ -1,3 +1,9 @@
+osc (0.151.2-2) UNRELEASED; urgency=medium
+
+  * Fix path to vc command (Closes: #785332).
+
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 15 May 2015 08:45:10 +0200
+
 osc (0.151.2-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/osc/trunk/debian/patches/osc-build.patch
===================================================================
--- packages/osc/trunk/debian/patches/osc-build.patch	2015-05-14 09:51:24 UTC (rev 11945)
+++ packages/osc/trunk/debian/patches/osc-build.patch	2015-05-15 06:45:36 UTC (rev 11946)
@@ -16,11 +16,9 @@
  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:
+@@ -28,7 +28,7 @@
                                                 'http_headers':(('Host','api.suse.de'),
                                                                 ('User','faye'))},
                        'foo.opensuse.org': {'user': 'foo', 'pass': 'foo'}},
@@ -29,7 +27,7 @@
   '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',
+@@ -102,7 +102,7 @@
              'su-wrapper': 'sudo',
  
              # build type settings
@@ -38,6 +36,12 @@
              '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
-
+@@ -175,7 +175,7 @@
+             'maintained_update_project_attribute': 'OBS:UpdateProject',
+             'show_download_progress': '0',
+             # path to the vc script
+-            'vc-cmd': '/usr/lib/build/vc'
++            'vc-cmd': '/usr/lib/obs-build/vc'
+ }
+ 
+ # being global to this module, this dict can be accessed from outside