[Python-modules-commits] r13443 - in packages/django-nose/trunk/debian (3 files)

[fladi-guest at users.alioth.debian.org]

    Date: Wednesday, June 16, 2010 @ 10:29:47
  Author: fladi-guest
Revision: 13443

Add commit URL to forwarded patch.
Don't use Build-Depends-Indep.
Check for 'nocheck' in DEB_BUILD_OPTIONS.

Modified:
  packages/django-nose/trunk/debian/control
  packages/django-nose/trunk/debian/patches/do_not_install_testapp
  packages/django-nose/trunk/debian/rules

Modified: packages/django-nose/trunk/debian/control
===================================================================
--- packages/django-nose/trunk/debian/control	2010-06-16 09:37:22 UTC (rev 13442)
+++ packages/django-nose/trunk/debian/control	2010-06-16 10:29:47 UTC (rev 13443)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Fladischer Michael <FladischerMichael at fladi.at>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-support
-Build-Depends-Indep: python-setuptools, python-django, python-nose
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.5), python-support, 
+ python-setuptools, python-django, python-nose
 Standards-Version: 3.8.4
 Homepage: http://pypi.python.org/pypi/django-nose/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-nose/trunk/

Modified: packages/django-nose/trunk/debian/patches/do_not_install_testapp
===================================================================
--- packages/django-nose/trunk/debian/patches/do_not_install_testapp	2010-06-16 09:37:22 UTC (rev 13442)
+++ packages/django-nose/trunk/debian/patches/do_not_install_testapp	2010-06-16 10:29:47 UTC (rev 13443)
@@ -2,7 +2,7 @@
   This patch delegates packaging of the `testapp` package to the
   MANIFEST.in file, avoiding installation in global namespace.
 Author: Fladischer Michael <FladischerMichael at fladi.at>
-Forwarded: yes
+Forwarded: http://github.com/jbalogh/django-nose/commit/b2e6e785ce1beec99d13221bfd0ef382f212ee14
 Last-Update: 2010-06-01
 
 Index: django-nose-0.1/setup.py

Modified: packages/django-nose/trunk/debian/rules
===================================================================
--- packages/django-nose/trunk/debian/rules	2010-06-16 09:37:22 UTC (rev 13442)
+++ packages/django-nose/trunk/debian/rules	2010-06-16 10:29:47 UTC (rev 13443)
@@ -7,9 +7,11 @@
 %:
 	dh  $@
 
+.PHONY: override_dh_auto_test
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	set -e; \
 	for python in $(shell pyversions -r); do \
 	  $$python /usr/bin/django-admin test --settings=testapp.settings --pythonpath=. ; \
 	done
-
+endif