[SCM] liblo/master: Drop local CDBS snippet: included in cdbs package now.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 97c6b777eab7858dd49a8b9bd983b7d3cbc584d1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jan 2 19:22:18 2011 +0100

    Drop local CDBS snippet: included in cdbs package now.

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 37280e3..4b13e71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ include /usr/share/cdbs/1/class/autotools.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_rules_upstream-tarball =

-- 
liblo packaging