[SCM] supercollider/master: Use the cdbs scons class

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f6cedc3b1c7fe1c694251f1a94ea60265782515d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Oct 5 18:51:45 2010 -0400

    Use the cdbs scons class

diff --git a/debian/control b/debian/control
index 7c6bcc3..d8ce449 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/supercollider.git;a=summary
 Maintainer: Debian Multimedia Packages Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alexandre Quessy <alexandre at quessy.net>
 Build-Depends: 
- cdbs, 
+ cdbs (>= 0.4.72),
  debhelper (>= 6),
  libasound2-dev,
  libavahi-client-dev,
diff --git a/debian/rules b/debian/rules
index 1c8b447..4f44289 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/scons.mk
 
 # Add here any variable or target overrides you need.
 DEB_DH_INSTALL_SOURCEDIR=debian/tmp
@@ -22,25 +23,22 @@ DEB_INSTALL_MANPAGES_supercollider-vim     = debian/scvim.1 debian/scvim_make_he
 DEB_INSTALL_EXAMPLES_supercollider         = common/build/examples/*
 DEB_INSTALL_DIRS_supercollider             = usr/share/SuperCollider/Extensions
 
+DEB_BUILDDIR=common
 # SCVIM/SCED=0 here, because we install them by hand below
 # (so that the build won't break)
-SCONS_FLAGS = --directory=$(DEB_BUILDDIR) DEVELOPMENT=yes PREFIX=/usr CROSSCOMPILE=1 STRIP=1 CURL=0 SCVIM=0 SCED=0
+DEB_SCONS_OPTIONS = DEVELOPMENT=yes PREFIX=/usr CROSSCOMPILE=1 STRIP=1 CURL=0 SCVIM=0 SCED=0 -j2
+DEB_SCONS_INSTALL_TARGET = --install-sandbox=$(DEB_DESTDIR) install
 
-common-build-arch common-build-indep:: debian/scons-build-stamp
-debian/scons-build-stamp:
-	dh_testdir
-	scons -C common $(SCONS_FLAGS)
-	touch $@
+# The build system apparently can't handle this
+CXXFLAGS =
 
 clean:: scons-clean
 scons-clean::
 	dh_testdir
-	scons -C common $(SCONS_FLAGS) --clean
 	scons -C common $(SCONS_FLAGS) --clean scrub
 	rm -f common/.sconsign.dblite
 	rm -f editors/scvim/.sconsign.dblite
 	rm -f editors/sced/.sconsign.dblite
-	rm -f debian/scons-build-stamp
 	# also remove some files, that SCons forgets about
 	rm -f editors/scel/el/sclang-vars.el
 	rm -f linux/libsclang.pc
@@ -49,7 +47,6 @@ scons-clean::
 
 common-install-arch common-install-indep:: common-install-impl
 common-install-impl::
-	scons -C common --install-sandbox=$(DEB_DESTDIR) $(SCONS_FLAGS) install
 	scons --install-sandbox=$(DEB_DESTDIR) --directory=editors/scvim PREFIX=/usr VIMFILE_DIR=/usr/share/vim/addons install-all
 	scons --install-sandbox=$(DEB_DESTDIR) --directory=editors/sced PREFIX=/usr install
 	# fixing some executables in class library and docs for happier lintian

-- 
supercollider packaging