Update CDBS snippets.

+ Simplify internal variables
+ Ignore no files by default in copyright-check.mk
+ Correct and update copyright hints of the snippets themselves

9 files changed, 19 insertions, 19 deletions

diff --git a/debian/cdbs/1/class/autotools-vars.mk b/debian/cdbs/1/class/autotools-vars.mk
index 87e3a3c..6b841ba 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
@@ -22,8 +22,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_class_autotools_vars
-_cdbs_class_autotools_vars = 1
+ifndef _cdbs_class_autotools-vars
+_cdbs_class_autotools-vars = 1
 
 #include $(_cdbs_class_path)/makefile.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/1/class/makefile.mk
diff --git a/debian/cdbs/1/class/makefile-vars.mk b/debian/cdbs/1/class/makefile-vars.mk
index d731493..c21df1e 100644
--- a/debian/cdbs/1/class/makefile-vars.mk
+++ b/debian/cdbs/1/class/makefile-vars.mk
@@ -22,8 +22,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_class_makefile_vars
-_cdbs_class_makefile_vars = 1
+ifndef _cdbs_class_makefile-vars
+_cdbs_class_makefile-vars = 1
 
 include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
 
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-autotools.mk b/debian/cdbs/1/class/python-autotools.mk
index f75f67a..e311c5c 100644
--- a/debian/cdbs/1/class/python-autotools.mk
+++ b/debian/cdbs/1/class/python-autotools.mk
@@ -22,8 +22,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_class_python_autotools
-_cdbs_class_python_autotools = 1
+ifndef _cdbs_class_python-autotools
+_cdbs_class_python-autotools = 1
 
 #include $(_cdbs_class_path)/python-vars.mk$(_cdbs_makefile_suffix)
 include debian/cdbs/1/class/python-vars.mk
diff --git a/debian/cdbs/1/class/python-vars.mk b/debian/cdbs/1/class/python-vars.mk
index 3f78176..38cfa00 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
@@ -24,8 +23,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_class_python_vars
-_cdbs_class_python_vars = 1
+ifndef _cdbs_class_python-vars
+_cdbs_class_python-vars = 1
 
 include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
 
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..b7a04f0 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -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..d8b5529 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
@@ -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_package_relations
-_cdbs_rules_package_relations = 1
+ifndef _cdbs_rules_package-relations
+_cdbs_rules_package-relations = 1
 
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
diff --git a/debian/cdbs/1/rules/upstream-tarball.mk b/debian/cdbs/1/rules/upstream-tarball.mk
index b917ec1..825fd81 100644
--- a/debian/cdbs/1/rules/upstream-tarball.mk
+++ b/debian/cdbs/1/rules/upstream-tarball.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_upstream_tarball
-_cdbs_rules_upstream_tarball := 1
+ifndef _cdbs_rules_upstream-tarball
+_cdbs_rules_upstream-tarball := 1
 
 include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)