[Python-modules-commits] r29260 - in packages/moksha.common/branches/wheezy-backports/debian (7 files)

Sun Jun 8 14:18:48 UTC 2014

Date: Sunday, June 8, 2014 @ 14:18:47
  Author: olasd
Revision: 29260

Updating the moksha.common backport

Added:
  packages/moksha.common/branches/wheezy-backports/debian/source/include-binaries
    (from rev 28857, packages/moksha.common/trunk/debian/source/include-binaries)
  packages/moksha.common/branches/wheezy-backports/debian/upstream-signing-key.pgp
    (from rev 28857, packages/moksha.common/trunk/debian/upstream-signing-key.pgp)
Modified:
  packages/moksha.common/branches/wheezy-backports/debian/changelog
  packages/moksha.common/branches/wheezy-backports/debian/control
  packages/moksha.common/branches/wheezy-backports/debian/copyright
  packages/moksha.common/branches/wheezy-backports/debian/rules
  packages/moksha.common/branches/wheezy-backports/debian/watch

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

--- packages/moksha.common/branches/wheezy-backports/debian/changelog	2014-06-08 13:03:12 UTC (rev 29259)
+++ packages/moksha.common/branches/wheezy-backports/debian/changelog	2014-06-08 14:18:47 UTC (rev 29260)
@@ -1,9 +1,38 @@
-moksha.common (1.2.0-1~bpo70+1) wheezy-backports; urgency=low
+moksha.common (1.2.3-2~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:09:26 +0200
+
+moksha.common (1.2.3-2) unstable; urgency=medium
+
+  * Restore tests during build
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 17:33:35 +0200
+
+moksha.common (1.2.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Add dependency on python-six
+  * Switch buildsystem to pybuild
+
+ -- Nicolas Dandrimont <olasd at debian.org>  Sun, 11 May 2014 15:52:19 +0200
+
+moksha.common (1.2.1-1) unstable; urgency=low
+
+  [ Simon Chopin ]
+  * d/copyright: Add the license version to the shortnames
+
+  [ Nicolas Dandrimont ]
+  * New upstream release
+  * Run tests by default
+    - Add build-dependencies on python-mock and python-nose
   * Add myself to uploaders
+  * Bump Standards-Version to 3.9.5 (no changes)
+  * Have uscan verify the upstream PGP signature
 
- -- Nicolas Dandrimont <olasd at debian.org>  Sat, 05 Oct 2013 16:47:20 +0200
+ -- Nicolas Dandrimont <olasd at debian.org>  Sat, 21 Dec 2013 20:29:35 +0100
 
 moksha.common (1.2.0-1) unstable; urgency=low
 

Modified: packages/moksha.common/branches/wheezy-backports/debian/control
===================================================================
--- packages/moksha.common/branches/wheezy-backports/debian/control	2014-06-08 13:03:12 UTC (rev 29259)
+++ packages/moksha.common/branches/wheezy-backports/debian/control	2014-06-08 14:18:47 UTC (rev 29260)
@@ -5,14 +5,18 @@
 Uploaders: Simon Chopin <chopin.simon at gmail.com>, Nicolas Dandrimont <olasd at debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-python,
  help2man,
  python-all (>= 2.6.6-3~),
  python-decorator,
  python-kitchen,
+ python-mock,
+ python-nose,
  python-setuptools,
+ python-six,
  python-twisted-core,
  python-tz
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 Homepage: http://mokshaproject.net/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/moksha.common/trunk/
@@ -20,7 +24,7 @@
 
 Package: python-moksha.common
 Architecture: all
-Depends: python-twisted-core, ${misc:Depends}, ${python:Depends}
+Depends: python-twisted-core, python-six, ${misc:Depends}, ${python:Depends}
 Description: Common components for the Moksha framework
  Moksha is a combination of Web framework and messaging hub that is
  written on top of widely-used and tested components such as Twisted,

Modified: packages/moksha.common/branches/wheezy-backports/debian/copyright
===================================================================
--- packages/moksha.common/branches/wheezy-backports/debian/copyright	2014-06-08 13:03:12 UTC (rev 29259)
+++ packages/moksha.common/branches/wheezy-backports/debian/copyright	2014-06-08 14:18:47 UTC (rev 29260)
@@ -4,7 +4,7 @@
 
 Files: *
 Copyright: 2008-2013 Red Hat, Inc
-License: Apache
+License: Apache-2.0
 
 Files: moksha/common/converters.py
 Copyright: 2005 Ian Bicking
@@ -52,9 +52,9 @@
 
 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.common/branches/wheezy-backports/debian/rules
===================================================================
--- packages/moksha.common/branches/wheezy-backports/debian/rules	2014-06-08 13:03:12 UTC (rev 29259)
+++ packages/moksha.common/branches/wheezy-backports/debian/rules	2014-06-08 14:18:47 UTC (rev 29260)
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
-UPSTREAM = $(shell dpkg-parsechangelog | egrep '^Version: ' | cut -d ' ' -f 2- | cut -d '-' -f 1)
-
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_install:
 	dh_install -Xusr/bin/moksha
 	rm debian/python-moksha.common/usr/lib/python*/dist-packages/moksha.common-*.egg-info/SOURCES.txt
+
+
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="cd {build_dir}; python{version} /usr/bin/nosetests -v" dh_auto_test

Copied: packages/moksha.common/branches/wheezy-backports/debian/source/include-binaries (from rev 28857, packages/moksha.common/trunk/debian/source/include-binaries)
===================================================================
--- packages/moksha.common/branches/wheezy-backports/debian/source/include-binaries	                        (rev 0)
+++ packages/moksha.common/branches/wheezy-backports/debian/source/include-binaries	2014-06-08 14:18:47 UTC (rev 29260)
@@ -0,0 +1 @@
+debian/upstream-signing-key.pgp

Copied: packages/moksha.common/branches/wheezy-backports/debian/upstream-signing-key.pgp (from rev 28857, packages/moksha.common/trunk/debian/upstream-signing-key.pgp)
===================================================================
(Binary files differ)

Modified: packages/moksha.common/branches/wheezy-backports/debian/watch
===================================================================
--- packages/moksha.common/branches/wheezy-backports/debian/watch	2014-06-08 13:03:12 UTC (rev 29259)
+++ packages/moksha.common/branches/wheezy-backports/debian/watch	2014-06-08 14:18:47 UTC (rev 29260)
@@ -1,3 +1,3 @@
 version=3
 
-https://pypi.python.org/packages/source/m/moksha.common/moksha.common-(.+).tar.gz
+opts=pgpsigurlmangle=s/$/.asc/ https://pypi.python.org/packages/source/m/moksha.common/moksha.common-(.+).tar.gz


