[Python-modules-commits] r29262 - in packages/moksha.hub/branches/wheezy-backports/debian (5 files)

Sun Jun 8 14:37:19 UTC 2014

Date: Sunday, June 8, 2014 @ 14:37:18
  Author: olasd
Revision: 29262

Update the wheezy backport of moksha.hub

Modified:
  packages/moksha.hub/branches/wheezy-backports/debian/changelog
  packages/moksha.hub/branches/wheezy-backports/debian/control
  packages/moksha.hub/branches/wheezy-backports/debian/copyright
  packages/moksha.hub/branches/wheezy-backports/debian/patches/0001-Account-for-twisted-package-split.patch
  packages/moksha.hub/branches/wheezy-backports/debian/rules

Modified: packages/moksha.hub/branches/wheezy-backports/debian/changelog
===================================================================

--- packages/moksha.hub/branches/wheezy-backports/debian/changelog	2014-06-08 14:19:02 UTC (rev 29261)
+++ packages/moksha.hub/branches/wheezy-backports/debian/changelog	2014-06-08 14:37:18 UTC (rev 29262)
@@ -1,3 +1,20 @@
+moksha.hub (1.3.2-1~bpo70+1) wheezy-backports; urgency=medium
+
+  * Rebuild for wheezy-backports.
+  * Change nosetests invocation in d/rules to work with wheezy's nose
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 08 Jun 2014 16:24:51 +0200
+
+moksha.hub (1.3.2-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refresh patches
+  * Add explicit (build-)dependency on python-six
+  * Switch buildsystem to pybuild
+  * Update d/copyright years
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 17:59:17 +0200
+
 moksha.hub (1.2.2-1) unstable; urgency=low
 
   [ Simon Chopin ]

Modified: packages/moksha.hub/branches/wheezy-backports/debian/control
===================================================================
--- packages/moksha.hub/branches/wheezy-backports/debian/control	2014-06-08 14:19:02 UTC (rev 29261)
+++ packages/moksha.hub/branches/wheezy-backports/debian/control	2014-06-08 14:37:18 UTC (rev 29262)
@@ -5,12 +5,14 @@
 Uploaders: Simon Chopin <chopin.simon at gmail.com>, Nicolas Dandrimont <olasd at debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  python-all (>= 2.6.6-3~),
  python-daemon,
  python-mock,
  python-moksha.common,
  python-nose,
  python-setuptools,
+ python-six,
  python-stomper,
  python-twisted,
  python-txws,
@@ -27,6 +29,7 @@
 Architecture: all
 Depends:
  python-moksha.common (>= 1.0.6),
+ python-six,
  ${misc:Depends},
  ${python:Depends}
 Description: Hub components for the Moksha framework

Modified: packages/moksha.hub/branches/wheezy-backports/debian/copyright
===================================================================
--- packages/moksha.hub/branches/wheezy-backports/debian/copyright	2014-06-08 14:19:02 UTC (rev 29261)
+++ packages/moksha.hub/branches/wheezy-backports/debian/copyright	2014-06-08 14:37:18 UTC (rev 29262)
@@ -3,14 +3,14 @@
 Source: http://mokshaproject.net/
 
 Files: *
-Copyright: 2008-2013 Red Hat, Inc
-License: Apache
+Copyright: 2008-2014 Red Hat, Inc
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2013 Simon Chopin <chopin.simon at gmail.com>
-License: Apache
+License: Apache-2.0
 
-License: Apache
+License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

Modified: packages/moksha.hub/branches/wheezy-backports/debian/patches/0001-Account-for-twisted-package-split.patch
===================================================================
--- packages/moksha.hub/branches/wheezy-backports/debian/patches/0001-Account-for-twisted-package-split.patch	2014-06-08 14:19:02 UTC (rev 29261)
+++ packages/moksha.hub/branches/wheezy-backports/debian/patches/0001-Account-for-twisted-package-split.patch	2014-06-08 14:37:18 UTC (rev 29262)
@@ -2,16 +2,16 @@
 Author: Nicolas Dandrimont <nicolas.dandrimont at crans.org>
 Forwarded: not-needed
 
-Index: moksha.hub-1.2.1/setup.py
+Index: moksha.hub-1.3.2/setup.py
 ===================================================================
---- moksha.hub-1.2.1.orig/setup.py	2013-07-12 20:01:40.650976847 +0200
-+++ moksha.hub-1.2.1/setup.py	2013-07-12 20:01:55.602205186 +0200
+--- moksha.hub-1.3.2.orig/setup.py	2014-05-11 16:53:18.552175210 +0200
++++ moksha.hub-1.3.2/setup.py	2014-05-11 16:53:27.116183882 +0200
 @@ -46,7 +46,7 @@
      url='http://moksha.fedorahosted.org',
      install_requires=[
          "moksha.common>=1.0.6",
 -        "Twisted",
 +        "Twisted_Core",
-         "stomper",
+         #"stomper",
          "pyzmq",
          "txZMQ",

Modified: packages/moksha.hub/branches/wheezy-backports/debian/rules
===================================================================
--- packages/moksha.hub/branches/wheezy-backports/debian/rules	2014-06-08 14:19:02 UTC (rev 29261)
+++ packages/moksha.hub/branches/wheezy-backports/debian/rules	2014-06-08 14:37:18 UTC (rev 29262)
@@ -1,20 +1,12 @@
 #!/usr/bin/make -f
 
-PY2VERS = $(shell pyversions -vr)
-
-export http_proxy = http://127.0.9.1:9
-export https_proxy = http://127.0.9.1:9
-
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_install:
 	dh_install
 	rm -f debian/python-moksha.hub/usr/lib/python*/dist-packages/moksha.hub-*.egg-info/SOURCES.txt
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	set -e; for py in $(PY2VERS); do \
-		python$$py setup.py test; \
-	done
-endif
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="cp development.ini {build_dir}; cd {build_dir}; python{version} /usr/bin/nosetests -v; rm {build_dir}/development.ini" dh_auto_test


