[SCM] hydrogen packaging branch, master, updated. debian/0.9.4-2-24-g5379f57

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Mar 22 12:06:15 UTC 2010 

The following commit has been merged in the master branch:
commit 5110d54d9c4e0d4823ddf73e373399f05af8db34
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 20 17:49:50 2010 +0100

    Drop local CDBS snippets scons.mk and package-relations.mk.  tighten build-dependency on cdbs to versions providing same functionalities.

diff --git a/debian/cdbs/1/class/scons-vars.mk b/debian/cdbs/1/class/scons-vars.mk
deleted file mode 100644
index e5f8755..0000000
--- a/debian/cdbs/1/class/scons-vars.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005 Matthew A. Nicholson <matt at matt-land.com>
-# 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
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_scons_vars
-_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="$(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 =
-
-# build target and options (only passed on build)
-DEB_SCONS_BUILD_TARGET =
-DEB_SCONS_BUILD_OPTIONS =
-
-# install target and options (only passed on install)
-DEB_SCONS_INSTALL_TARGET = install
-DEB_SCONS_INSTALL_OPTIONS =
-
-# clean target
-DEB_SCONS_CLEAN_TARGET = .
-
-DEB_SCONS_CHECK_TARGET =
-
-endif
diff --git a/debian/cdbs/1/class/scons.mk b/debian/cdbs/1/class/scons.mk
deleted file mode 100644
index 2d78fdf..0000000
--- a/debian/cdbs/1/class/scons.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2005 Matthew A. Nicholson <matt at matt-land.com>
-# 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
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_scons
-_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_class_scons ?= scons
-CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_scons)
-
-DEB_PHONY_RULES += scons-clean
-
-common-build-arch common-build-indep:: debian/stamp-scons-build
-debian/stamp-scons-build:
-	$(DEB_SCONS_INVOKE) $(DEB_SCONS_BUILD_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_BUILD_OPTIONS)
-	touch debian/stamp-scons-build
-
-clean:: scons-clean
-scons-clean::
-	$(DEB_SCONS_INVOKE) $(DEB_SCONS_CLEAN_TARGET) $(DEB_SCONS_OPTIONS) --keep-going --clean || true
-	rm -f debian/stamp-scons-build
-	rm -rf .sconf_temp/
-	rm -f .sconsign.dblite config.log
-
-common-install-arch common-install-indep:: common-install-impl
-common-install-impl::
-	@if test -n "$(DEB_SCONS_INSTALL_TARGET)"; then \
-	  echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_INSTALL_OPTIONS); \
-	  $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_INSTALL_OPTIONS); \
-	else \
-	  echo "DEB_SCONS_INSTALL_TARGET unset, skipping default scons.mk common-install target"; \
-	fi
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-common-post-build-arch common-post-build-indep:: common-post-build-impl
-common-post-build-impl::
-	@if test -n "$(DEB_SCONS_CHECK_TARGET)"; then \
-	  echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_CHECK_TARGET); \
-	  $(DEB_SCONS_INVOKE) $(DEB_SCONS_CHECK_TARGET) $(DEB_SCONS_OPTIONS); \
-	else \
-	   echo "DEB_SCONS_CHECK_TARGET unset, not running checks"; \
-	fi
-endif
-
-endif
diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
deleted file mode 100644
index 73a3361..0000000
--- a/debian/cdbs/1/rules/package-relations.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2008-2010 Jonas Smedegaard <dr at jones.dk>
-# Description: Resolve and apply binary package relationships
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_package_relations
-_cdbs_rules_package_relations = 1
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-# TODO: Move these to buildcore.mk
-cdbs_curvar = $(or $($(1)_$(cdbs_curpkg)),$($1))
-cdbs_squash_commas = $(shell echo '$1' | sed -e 's/ *,[ ,]*/, /g' -e 's/^[ ,]*//' -e 's/[ ,]*$$//')
-
-cdbs_all_cur_squash_commas = $(call cdbs_squash_commas,$($(1)_ALL)$(comma) $(call cdbs_curvar,$1))
-
-# Apply CDBS-declared dependencies to binary packages
-$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
-	@echo 'Adding cdbs dependencies to debian/$(cdbs_curpkg).substvars'
-	@echo 'cdbs:Depends=$(call cdbs_all_cur_squash_commas,CDBS_DEPENDS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Pre-Depends=$(call cdbs_all_cur_squash_commas,CDBS_PREDEPENDS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Recommends=$(call cdbs_all_cur_squash_commas,CDBS_RECOMMENDS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Suggests=$(call cdbs_all_cur_squash_commas,CDBS_SUGGESTS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Breaks=$(call cdbs_all_cur_squash_commas,CDBS_BREAKS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Provides=$(call cdbs_all_cur_squash_commas,CDBS_PROVIDES)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Replaces=$(call cdbs_all_cur_squash_commas,CDBS_REPLACES)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Conflicts=$(call cdbs_all_cur_squash_commas,CDBS_CONFLICTS)' >> debian/$(cdbs_curpkg).substvars
-	@echo 'cdbs:Enhances=$(call cdbs_all_cur_squash_commas,CDBS_ENHANCES)' >> debian/$(cdbs_curpkg).substvars
-
-endif
diff --git a/debian/rules b/debian/rules
index 7937e7d..dd1ae38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,8 @@
 
 -include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
-include debian/cdbs/1/class/scons.mk
+include /usr/share/cdbs/1/class/scons.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-# buildinfo.mk not currently backports-friendly
-#include /usr/share/cdbs/1/rules/buildinfo.mk
-include debian/cdbs/1/rules/package-relations.mk
 
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_upstream-tarball =

-- 
hydrogen packaging

More information about the pkg-multimedia-commits mailing list