[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 5380c8e99626f42a4c75a0f4bd23aaea09e2a5c7
Author: Alexandre Quessy <alexandre at quessy.net>
Date:   Tue Jun 22 14:09:49 2010 -0400

    added rules to build python targets for different versions

diff --git a/debian/control b/debian/control
index 0a1d0fc..8fa7882 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Build-Depends:
  python-gtk2,
  python-simplejson | python (>= 2.6),
  python-support,
- python-twisted
+ python-twisted-core
 Standards-Version: 3.8.4
 Homepage: http://scenic.sat.qc.ca/
 
@@ -72,7 +72,7 @@ Depends:
  python-gst0.10 (>= 0.10.17),
  python-gtk2,
  python-simplejson | python (>= 2.6),
- python-twisted,
+ python-twisted-core,
  x11-utils,
  yelp, 
  scenic-utils, 
@@ -147,7 +147,7 @@ Architecture: all
 Depends:
  ${misc:Depends},
  python (>= 2.4),
- python-twisted
+ python-twisted-core
 Suggests: python-pygame (>= 1.9.1) | python-portmidi,
 Description: streams MIDI notes and controls over RTP
  Scenic is a free software suite for streaming audio, video and MIDI
diff --git a/debian/rules b/debian/rules
index 3f2610d..7916db7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,30 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-mt
 
+# Approach comes from 
+# http://www.technovelty.org/linux/debian/python-cdbs-autotools.html
+PY_VERSIONS = $(shell pyversions --requested debian/control)
+
+configure/scenic:: $(addprefix configure-stamp-, $(PY_VERSIONS))
+
+configure/midistream:: $(addprefix configure-stamp-, $(PY_VERSIONS))
+
+build-stamp-%:
+	make -C build-$*
+	touch $@
+
+build/scenic:: $(addprefix build-stamp-, $(PY_VERSIONS))
+
+build/midistream:: $(addprefix build-stamp-, $(PY_VERSIONS))
+
+install-stamp-%:
+	make -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
+	touch $@
+
+install/scenic:: $(addprefix install-stamp-, $(PY_VERSIONS))
+
+install/midistream:: $(addprefix install-stamp-, $(PY_VERSIONS))
+
 # Unit tests are disabled for now, since it's Python path is broken when they are ran.
 #DEB_MAKE_CHECK_TARGET = check 
 
@@ -24,5 +48,10 @@ binary-indep/midistream::
 	dh_pysupport -pmidistream rtpmidi
 
 # cleanup after upstream
+# cleanup stamp targets
 clean::
-	rm -rf $(DEB_BUILDDIR)
+	-rm -rf $(DEB_BUILDDIR)
+	-rm -rf $(addprefix build-, $(PY_VERSIONS))
+	-rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS))
+	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
+	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))

-- 
scenic packaging