[Python-modules-commits] r12643 - in packages/django-countries/trunk/debian (control rules)

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

    Date: Monday, April 19, 2010 @ 12:34:52
  Author: fladi-guest
Revision: 12643

Don't run tests if nocheck is set in DEB_BUILD_OPTIONS.
Add workaround for bug #575377.

Modified:
  packages/django-countries/trunk/debian/control
  packages/django-countries/trunk/debian/rules

Modified: packages/django-countries/trunk/debian/control
===================================================================
--- packages/django-countries/trunk/debian/control	2010-04-19 12:21:41 UTC (rev 12642)
+++ packages/django-countries/trunk/debian/control	2010-04-19 12:34:52 UTC (rev 12643)
@@ -4,7 +4,7 @@
 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, 
- python-setuptools, python-pysqlite2, python-django, iso-codes
+ python-setuptools, python-django, iso-codes
 Standards-Version: 3.8.4
 Homepage: http://bitbucket.org/smileychris/django-countries/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/django-countries/trunk/
@@ -17,6 +17,6 @@
 Description: Provides a country field for Django models
  A Django application which provides all ISO 3166-1 countries as choices for 
  use with forms, and a country field for models.
- Also includes a small template filter for getting country flags by ISO 3166-1 
+ It also includes a small template filter for getting country flags by ISO 3166-1 
  alpha-2 country code. 
 

Modified: packages/django-countries/trunk/debian/rules
===================================================================
--- packages/django-countries/trunk/debian/rules	2010-04-19 12:21:41 UTC (rev 12642)
+++ packages/django-countries/trunk/debian/rules	2010-04-19 12:34:52 UTC (rev 12643)
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,21 +7,32 @@
 %:
 	dh  $@
 
+.PHONY: override_dh_auto_build
 override_dh_auto_build:
 	chmod 644 django_countries/media/flags/*
 	dh_auto_build
 
+.PHONY: override_dh_auto_test
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	django-admin startproject testproject
 	echo 'DATABASE_ENGINE = "sqlite3"' > testproject/settings.py
 	echo 'DATABASE_NAME = "testproject/test.db3"' >> testproject/settings.py
 	echo 'INSTALLED_APPS = ["django_countries","django.contrib.auth","django.contrib.contenttypes","django.contrib.admin","django.contrib.sites","django.contrib.sessions"]' >> testproject/settings.py
 	echo 'SITE_ID = 1' >> testproject/settings.py
 	echo 'ROOT_URLCONF = "testproject.urls"' >> testproject/settings.py
+	set -e; \
 	for python in $(shell pyversions -r); do \
 	  rm -f testproject/test.db3 ; \
 	  PYTHONPATH="." $$python testproject/manage.py syncdb --settings=testproject.settings --noinput ;\
 	  PYTHONPATH="." $$python testproject/manage.py test --settings=testproject.settings ;\
 	done
 	rm -rf testproject
+endif
 
+.PHONY: override_dh_pysupport
+override_dh_pysupport:
+	# Work-around for bug #575377:
+	find debian/ -name PKG-INFO | tail -n +2 | xargs -r -n1 cp -vf $(shell find debian/ -name PKG-INFO | head -n 1)
+	dh_pysupport
+