[SCM] hydrogen packaging branch, master, updated. b932e87c6695bf7b436fcb94b3810feaa6436733

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 39cb260f67b9de4c38b2332f98ba7f5b24485564
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Mar 12 02:05:25 2010 +0100

    Sync scons.mk with HEAD of mainline cdbs.

diff --git a/debian/cdbs/1/class/scons-vars.mk b/debian/cdbs/1/class/scons-vars.mk
index b2c71cb..e5f8755 100644
--- a/debian/cdbs/1/class/scons-vars.mk
+++ b/debian/cdbs/1/class/scons-vars.mk
@@ -1,7 +1,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2005 Matthew A. Nicholson <matt at matt-land.com>
-# Description: Defines useful variables for packages which have a SConstruct
-#              file
+# Copyright © 2008,2010 Jonas Smedegaard <dr at jones.dk>
+# Description: Defines useful variables for SCons (SConstruct file) packages
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -14,24 +14,19 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-ifndef _cdbs_bootstrap
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
 _cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
 
 ifndef _cdbs_class_scons_vars
-_cdbs_class_scons_vars := 1
+_cdbs_class_scons_vars = 1
 
 include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
 
 DEB_SCONS_ENVVARS = 
-DEB_SCONS_INVOKE = $(DEB_SCONS_ENVVARS) scons --directory="$(DEB_BUILDDIR)" CC="$(CC)" CFLAGS="$(if $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" CXX="$(CXX)" CXXFLAGS="$(if $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))"
+DEB_SCONS_INVOKE = $(DEB_SCONS_ENVVARS) scons --directory="$(DEB_BUILDDIR)" CC="$(or $(CC_$(cdbs_curpkg)),$(CC))" CFLAGS="$(or $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" CXX="$(or $(CXX_$(cdbs_curpkg)),$(CXX))" CXXFLAGS="$(or $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))"
 
 # general options (passed on all scons commands)
 DEB_SCONS_OPTIONS =
diff --git a/debian/cdbs/1/class/scons.mk b/debian/cdbs/1/class/scons.mk
index 1d99ffa..2d78fdf 100644
--- a/debian/cdbs/1/class/scons.mk
+++ b/debian/cdbs/1/class/scons.mk
@@ -1,6 +1,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 # Copyright © 2005 Matthew A. Nicholson <matt at matt-land.com>
-# Description: Builds and cleans packages which have a SConstruct file
+# Copyright © 2008,2010 Jonas Smedegaard <dr at jones.dk>
+# Description: Builds and cleans SCons (SConstruct file) packages
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -13,25 +14,21 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-ifndef _cdbs_bootstrap
 _cdbs_scripts_path ?= /usr/lib/cdbs
 _cdbs_rules_path ?= /usr/share/cdbs/1/rules
 _cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
 
 ifndef _cdbs_class_scons
-_cdbs_class_scons := 1
+_cdbs_class_scons = 1
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 #include $(_cdbs_class_path)/scons-vars.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/1/class/scons-vars.mk$(_cdbs_makefile_suffix)
 
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), scons
+CDBS_BUILD_DEPENDS_class_scons ?= scons
+CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_scons)
 
 DEB_PHONY_RULES += scons-clean
 

-- 
hydrogen packaging