Accepting request 313394 from home:hiberis:branches:openSUSE:Tools

OBS-URL: https://build.opensuse.org/request/show/313394
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-tar_scm?expand=0&rev=90

0001-Debianization-disable-running-mercurial-tests.patch

@@ -0,0 +1,45 @@
+From c2c2e7bbaea6d224ad5742f47fb4baab63365e6d Mon Sep 17 00:00:00 2001
+From: Hib Eris <hib@hiberis.nl>
+Date: Mon, 22 Jun 2015 15:23:30 +0200
+Subject: [PATCH] Debianization: disable running mercurial tests
+
+This is needed to make this package build on the Ubuntu
+distributions at build.opensuse.org. These distributions
+provide only Ubuntu's main repository, which does not contain
+the mercurial package. The mercurial package is only needed
+to run mercurial tests, thus disabeling mercurial tests allows
+building the package.
+---
+ debian/control | 2 +-
+ tests/test.py  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/debian/control b/debian/control
+index a45fa04..6f3551d 100644
+--- a/debian/control
++++ b/debian/control
+@@ -2,7 +2,7 @@ Source: obs-service-tar-scm
+ Section: devel
+ Priority: extra
+ Maintainer: Daniel Gollub <dgollub@brocade.com>
+-Build-Depends: debhelper (>= 8.0.0), bzr, git, mercurial, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion
++Build-Depends: debhelper (>= 8.0.0), bzr, git, pep8, python (>= 2.6), python-argparse | python (>= 2.7), python-unittest2, subversion
+ Standards-Version: 3.9.3
+ Homepage: https://github.com/openSUSE/obs-service-tar_scm
+ X-Python-Version: >= 2.6
+diff --git a/tests/test.py b/tests/test.py
+index 3814e71..ca480b7 100755
+--- a/tests/test.py
++++ b/tests/test.py
+@@ -23,7 +23,7 @@ if __name__ == '__main__':
+         # temporarily comment out any of these:
+         SvnTests,
+         GitTests,
+-        HgTests,
++        #HgTests,
+         BzrTests,
+         UnitTestCases
+     ]
+-- 
+2.1.4
+

debian.dsc

@@ -5,4 +5,4 @@ Binary: obs-service-tar-scm
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 7), bzr, git, mercurial, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml
+Build-Depends: debhelper (>= 7), bzr, git, python (>= 2.6), python-argparse | python (>= 2.7), subversion, python-unittest2, pep8, python-lxml

debian.series

@@ -0,0 +1 @@
+0001-Debianization-disable-running-mercurial-tests.patch -p1

obs-service-tar_scm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun 24 08:07:29 UTC 2015 - hib@hiberis.nl
+
+- Fix build on Ubuntu by disabling mercurial tests
+
 -------------------------------------------------------------------
 Mon Jun 22 14:41:27 UTC 2015 - hib@hiberis.nl