[SCM] hydrogen packaging branch, master, updated. 1f8e4361335aef5d223885927c688d654b9566e2

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 926b5a8b676893650fea2b0d1f89abfc866da16a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Mar 2 16:40:25 2010 +0100

    Make copyright-checkmk strict when in DEB_MAINTAINER_MODE.

diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index e9438fc..b81109e 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -26,12 +26,14 @@ include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
 
-# Set to yes to fail on changed/new hints are found
-#DEB_COPYRIGHT_CHECK_STRICT = yes
+# Routines convenient for maintainers but unsuitable for build daemons
+#  * strict checking makes rule fail if changed/new hints are found
+ifneq (,$(DEB_MAINTAINER_MODE))
+  DEB_COPYRIGHT_CHECK_STRICT = yes
+endif
 
 # Single regular expression for files to include or ignore
 DEB_COPYRIGHT_CHECK_REGEX ?= .*
-#DEB_COPYRIGHT_CHECK_IGNORE_REGEX ?= ^\./(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX ?= ^\./debian/(changelog|copyright(|_hints|_newhints))$
 
 # number of lines from the top of each file to investigate
@@ -42,7 +44,6 @@ DEB_COPYRIGHT_CHECK_ARGS ?= -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i
 DEB_COPYRIGHT_CHECK_INVOKE ?= $(DEB_COPYRIGHT_CHECK_SCRIPT) $(DEB_COPYRIGHT_CHECK_ARGS)
 
 pre-build:: debian/stamp-copyright-check
-
 debian/stamp-copyright-check:
 	@echo 'Scanning upstream source for new/changed copyright notices...'
 	@echo $(DEB_COPYRIGHT_CHECK_INVOKE) \

-- 
hydrogen packaging