[SCM] scenic packaging branch, master, updated. upstream/0.6.2-96-gf2bbe88

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

The following commit has been merged in the master branch:
commit 9323a8d721224bc0da56ce68b129e4a44438c3d2
Author: Alexandre Quessy <alexandre at quessy.net>
Date:   Tue Jun 22 16:59:47 2010 -0400

    merged binary-install and binary-fixup targets

diff --git a/debian/rules b/debian/rules
index 24811ba..45a05ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 # http://www.technovelty.org/linux/debian/python-cdbs-autotools.html
 PY_VERSIONS = $(shell pyversions --requested debian/control)
 
-DEB_DH_INSTALL_SOURCEDIR = $(CURDIR)/debian/tmp
 DEB_BUILDDIR := build
 DEB_PYTHON_SYSTEM = pysupport
 DEB_PYTHON_MODULE_PACKAGES = scenic rtpmidi
@@ -14,6 +13,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-mt
 include /usr/share/cdbs/1/class/python-autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
+.PRECIOUS: configure-stamp-%
+
 configure-stamp-%:
 	mkdir build-$*
 	cd build-$* && PYTHON=`which $*` $(DEB_CONFIGURE_SCRIPT_ENV) \
@@ -50,14 +51,14 @@ install/midistream:: $(addprefix install-stamp-, $(PY_VERSIONS))
 #DEB_MAKE_CHECK_TARGET = check 
 
 # Ensure proper hash-bang in Python script (Python Policy 0.9 §3.1)
-binary-fixup/scenic::
+binary-install/scenic::
 	egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)/usr/bin/* \
 		| xargs -r -0 perl -pi -e 's,^#! ?/usr/bin/(env )?python[[:print:]]*$$,#!/usr/bin/python$(cdbs_python_nondefault_version),'
-
-binary-install/scenic::
 	dh_pysupport -pscenic
 
 binary-install/midistream::
+	egrep -r -l -Z '^#! ?/usr/bin/(env )?python[[:print:]]*$$' debian/$(cdbs_curpkg)/usr/bin/* \
+		| xargs -r -0 perl -pi -e 's,^#! ?/usr/bin/(env )?python[[:print:]]*$$,#!/usr/bin/python$(cdbs_python_nondefault_version),'
 	dh_pysupport -pmidistream
 
 # cleanup after upstream

-- 
scenic packaging