diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2009-01-20 04:45:54 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2009-01-20 04:45:54 (GMT) |
| commit | e8fb4ac278fa943605225e92b2220781c68c2579 (patch) | |
| tree | bcd1af6794f148ab702b92453c61de49a1c1254a | |
| parent | 35b75f94431b00c71413e37bde0bd323f9fe2647 (diff) | |
Update CDBS snippets.
+ Simplify internal variables
+ Ignore no files by default in copyright-check.mk
+ Correct and update copyright hints of the snippets themselves
| -rw-r--r-- | debian/cdbs/1/rules/buildinfo.mk | 2 | ||||
| -rw-r--r-- | debian/cdbs/1/rules/copyright-check.mk | 7 | ||||
| -rw-r--r-- | debian/cdbs/1/rules/package-relations.mk | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/debian/cdbs/1/rules/buildinfo.mk b/debian/cdbs/1/rules/buildinfo.mk index bd62ee5..b1298cc 100644 --- a/debian/cdbs/1/rules/buildinfo.mk +++ b/debian/cdbs/1/rules/buildinfo.mk @@ -1,5 +1,5 @@ # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2004-2006 Jonas Smedegaard <dr@jones.dk> +# Copyright © 2004-2007 Jonas Smedegaard <dr@jones.dk> # Description: Generate and include build information # # This program is free software; you can redistribute it and/or diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk index 98a0b12..8c437bc 100644 --- a/debian/cdbs/1/rules/copyright-check.mk +++ b/debian/cdbs/1/rules/copyright-check.mk @@ -21,8 +21,8 @@ _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_copyright-check -_cdbs_rules_copyright-check := 1 +ifndef _cdbs_rules_copyright_check +_cdbs_rules_copyright_check := 1 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix) @@ -33,7 +33,8 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7) # 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/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$ +DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^debian/(changelog|copyright(|_hints|_newhints))$ pre-build:: debian/stamp-copyright-check diff --git a/debian/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk index 3a92eb7..43e338b 100644 --- a/debian/cdbs/1/rules/package-relations.mk +++ b/debian/cdbs/1/rules/package-relations.mk @@ -1,5 +1,5 @@ # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2004-2006 Jonas Smedegaard <dr@jones.dk> +# Copyright © 2008 Jonas Smedegaard <dr@jones.dk> # Description: Resolve, cleanup and apply package relationships # # This program is free software; you can redistribute it and/or |