[SCM] hydrogen packaging branch, master, updated. 0e5b279b27fcef251c185d059977342af18424f9

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0e5b279b27fcef251c185d059977342af18424f9
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 10 14:15:30 2010 +0100

    Tighten and relax CDBS includes, to both use very newest features and be backports-friendly.

diff --git a/debian/rules b/debian/rules
index 7ee0c19..54e5efa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,11 +16,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-include debian/cdbs/1/rules/upstream-tarball.mk
-include debian/cdbs/1/rules/copyright-check.mk
+-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/rules/debhelper.mk
-include debian/cdbs/1/rules/buildinfo.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 =
+CDBS_BUILD_DEPENDS_rules_buildinfo =
 
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/hydrogen
 
@@ -52,6 +58,3 @@ CDBS_BUILD_DEPENDS += , libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-
 
 # Needed for our packaging
 CDBS_BUILD_DEPENDS += , librsvg2-bin, netpbm
-
-# Resolve, cleanup and apply CDBS-declared dependencies
-include debian/cdbs/1/rules/package-relations.mk

-- 
hydrogen packaging