diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-12-19 17:16:53 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-12-19 17:16:53 (GMT) |
commit | fe4603ceb76fcfb738bc29436b9fbb976c46e9c6 (patch) | |
tree | 3b816d821be18cec653d3a523d4b5a225912655c | |
parent | 49695d517999dd5f7c0414bee2671daea7aeeef3 (diff) |
Update CDBS snippets.
+ Fix use underscore (not dash) for internal variable
+ Ignore only debian changelog and copyright-related files by default in
copyright-check.mk
+ Correct and update copyright hints of the snippets themselves
-rw-r--r-- | debian/cdbs/1/class/autotools-vars.mk | 2 | ||||
-rw-r--r-- | debian/cdbs/1/class/makefile.mk | 2 | ||||
-rw-r--r-- | debian/cdbs/1/class/python-vars.mk | 3 | ||||
-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 |
6 files changed, 9 insertions, 9 deletions
diff --git a/debian/cdbs/1/class/autotools-vars.mk b/debian/cdbs/1/class/autotools-vars.mk index 87e3a3c..0b290cb 100644 --- a/debian/cdbs/1/class/autotools-vars.mk +++ b/debian/cdbs/1/class/autotools-vars.mk @@ -1,6 +1,6 @@ # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2002,2003 Colin Walters <walters@debian.org> -# Copyright © 2008 Jonas Smedegaard <dr@jones.dk> +# Copyright © 2003,2008 Jonas Smedegaard <dr@jones.dk> # Description: Common variables for GNU autoconf+automake packages # # This program is free software; you can redistribute it and/or diff --git a/debian/cdbs/1/class/makefile.mk b/debian/cdbs/1/class/makefile.mk index 7a50962..be9bb75 100644 --- a/debian/cdbs/1/class/makefile.mk +++ b/debian/cdbs/1/class/makefile.mk @@ -1,6 +1,6 @@ # -*- mode: makefile; coding: utf-8 -*- # Copyright © 2002,2003 Colin Walters <walters@debian.org> -# Copyright © 2008 Jonas Smedegaard <dr@jones.dk> +# Copyright © 2003,2008 Jonas Smedegaard <dr@jones.dk> # Description: Builds and cleans packages which have a Makefile # # This program is free software; you can redistribute it and/or diff --git a/debian/cdbs/1/class/python-vars.mk b/debian/cdbs/1/class/python-vars.mk index 3f78176..729a3c2 100644 --- a/debian/cdbs/1/class/python-vars.mk +++ b/debian/cdbs/1/class/python-vars.mk @@ -1,6 +1,5 @@ # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2008 Jonas Smedegaard <dr@jones.dk> -# Copyright © 2008 Jonas Smedegaard <dr@jones.dk> +# Copyright © 2003,2008 Jonas Smedegaard <dr@jones.dk> # Description: Defines useful variables for Python packages # # This program is free software; you can redistribute it and/or 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 |