[Python-modules-commits] r15097 - in packages/sqlparse/trunk/debian (3 files)

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

    Date: Wednesday, December 15, 2010 @ 15:11:50
  Author: jollyroger-guest
Revision: 15097

Refactor rules. Remove Makefile from upstream to use debhelper possibilities.

Added:
  packages/sqlparse/trunk/debian/patches/remove-makefile.diff
Modified:
  packages/sqlparse/trunk/debian/patches/series
  packages/sqlparse/trunk/debian/rules

Added: packages/sqlparse/trunk/debian/patches/remove-makefile.diff
===================================================================
--- packages/sqlparse/trunk/debian/patches/remove-makefile.diff	                        (rev 0)
+++ packages/sqlparse/trunk/debian/patches/remove-makefile.diff	2010-12-15 15:11:50 UTC (rev 15097)
@@ -0,0 +1,27 @@
+Index: sqlparse-0.1.2/Makefile
+===================================================================
+--- sqlparse-0.1.2.orig/Makefile	2010-12-15 17:03:06.104895674 +0200
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+@@ -1,21 +0,0 @@
+-# Makefile to simplify some common development tasks.
+-# Run 'make help' for a list of commands.
+-
+-PYTHON=`which python`
+-
+-default: help
+-
+-help:
+-	@echo "Available commands:"
+-	@sed -n '/^[a-zA-Z0-9_.]*:/s/:.*//p' <Makefile | sort
+-
+-test:
+-	$(PYTHON) tests/run_tests.py
+-
+-coverage:
+-	nosetests --with-coverage --cover-inclusive --cover-package=sqlparse
+-
+-clean:
+-	$(PYTHON) setup.py clean
+-	find . -name '*.pyc' -delete
+-	find . -name '*~' -delete
+\ No newline at end of file


Property changes on: packages/sqlparse/trunk/debian/patches/remove-makefile.diff
___________________________________________________________________
Added: svn:mime-type
   + text/x-diff

Modified: packages/sqlparse/trunk/debian/patches/series
===================================================================
--- packages/sqlparse/trunk/debian/patches/series	2010-12-15 14:20:42 UTC (rev 15096)
+++ packages/sqlparse/trunk/debian/patches/series	2010-12-15 15:11:50 UTC (rev 15097)
@@ -1 +1,2 @@
 fix-interpreters.diff
+remove-makefile.diff

Modified: packages/sqlparse/trunk/debian/rules
===================================================================
--- packages/sqlparse/trunk/debian/rules	2010-12-15 14:20:42 UTC (rev 15096)
+++ packages/sqlparse/trunk/debian/rules	2010-12-15 15:11:50 UTC (rev 15097)
@@ -1,54 +1,12 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh --with python2 $@
 
-package_name = python-sqlparse
-install_dir = debian/${package_name}
-
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-	python setup.py build
-	touch build-stamp
-
-clean:
-	dh_testdir
-	rm -rf build-stamp build
-	find . -name '*.py[co]' | xargs rm -f
-	dh_clean
-
-build:
-	dh_testdir
-	python tests/run_tests.py
-	python setup.py build
-
-install: build
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	python setup.py install \
-		--root=$(install_dir) \
-		--install-layout=deb \
-		--no-compile
-	dh_installdocs
-	dh_installchangelogs
-	dh_installman
-	dh_installinfo
-	dh_python2
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep: build install
-
-binary-arch:
-
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary install
+override_dh_auto_test:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e; \
+	for ver in $(shell pyversions -vr); do \
+		python$$ver tests/run_tests.py; \
+	done
+endif