[Pkg-awstats-commits] r54 - in awstats/trunk/debian: . cdbs/1/rules

[Jonas Smedegaard]

Author: js
Date: 2006-05-09 21:07:32 +0000 (Tue, 09 May 2006)
New Revision: 54

Modified:
   awstats/trunk/debian/cdbs/1/rules/copyright-check.mk
   awstats/trunk/debian/changelog
   awstats/trunk/debian/control
   awstats/trunk/debian/copyright_hints
Log:
Update cdbs snippet copyright-check.mk. Semi-auto-update debian/control (yes, cdbs generates a duplicate build-dependency but it is harmless and non-policy-violating AFAIK). Semi-auto-update debian/copyright_hints.

Modified: awstats/trunk/debian/cdbs/1/rules/copyright-check.mk
===================================================================
--- awstats/trunk/debian/cdbs/1/rules/copyright-check.mk	2006-05-09 20:25:35 UTC (rev 53)
+++ awstats/trunk/debian/cdbs/1/rules/copyright-check.mk	2006-05-09 21:07:32 UTC (rev 54)
@@ -29,12 +29,13 @@
 include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
 cdbs_copyright-check_find_opts := -not -regex '\./debian/.*'
+cdbs_copyright-check_egrep_opts := --text -rih '(copyright|\(c\) ).*[0-9]{4}'
 
 clean::
 	@echo 'Scanning upstream source for new/changed copyright notices...'
 	@echo '(the debian/ subdir is _not_ examined - do that manually!)'
 	find . -type f $(cdbs_copyright-check_find_opts) -exec cat '{}' ';' \
-		| egrep --text -rih 'copyright.*[0-9]{4}' \
+		| egrep $(cdbs_copyright-check_egrep_opts) \
 		| sed -e 's/^[[:space:]*#]*//' -e 's/[[:space:]]*$$//' \
 		| LC_ALL=C sort -u \
 		> debian/copyright_newhints

Modified: awstats/trunk/debian/changelog
===================================================================
--- awstats/trunk/debian/changelog	2006-05-09 20:25:35 UTC (rev 53)
+++ awstats/trunk/debian/changelog	2006-05-09 21:07:32 UTC (rev 54)
@@ -1,5 +1,6 @@
 awstats (6.5-2) unstable; urgency=low
 
+  [ Charles Fry ]
   * Require AWSTATS_ENABLE_CONFIG_DIR environmental variable in order to
     enable configdir. Closes: #365910 (thanks to Hendrik Weimer
     <hendrik at enyo.de>)
@@ -10,8 +11,16 @@
       <hendrik at enyo.de>)
   * Indent Homepage in long description, per debian reference guideline
 
- -- Charles Fry <debian at frogcircus.org>  Sat,  6 May 2006 17:36:46 -0400
+  [ Jonas Smedegaard ]
+  * Update local cdbs snippet copyright-check.mk:
+    + Broaden scan to also look for "(c)" by default.
+    + Make egrep options configurable.
+  * Semi-auto-update debian/control:
+    + Bump up versioned build-dependency on debhelper.
+  * Semi-auto-update debian/copyright_hints (nothing remarkable).
 
+ -- Jonas Smedegaard <dr at jones.dk>  Tue,  9 May 2006 22:39:12 +0200
+
 awstats (6.5-1) unstable; urgency=low
 
   [ Jonas Smedegaard ]

Modified: awstats/trunk/debian/control
===================================================================
--- awstats/trunk/debian/control	2006-05-09 20:25:35 UTC (rev 53)
+++ awstats/trunk/debian/control	2006-05-09 21:07:32 UTC (rev 54)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian AWStats Team <pkg-awstats-devel at lists.alioth.debian.org>
 Uploaders: Charles Fry <debian at frogcircus.org>, Jonas Smedegaard <dr at jones.dk>
-Build-Depends-Indep: debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), dh-buildinfo
+Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), dh-buildinfo
 Standards-Version: 3.6.2
 
 Package: awstats

Modified: awstats/trunk/debian/copyright_hints
===================================================================
--- awstats/trunk/debian/copyright_hints	2006-05-09 20:25:35 UTC (rev 53)
+++ awstats/trunk/debian/copyright_hints	2006-05-09 21:07:32 UTC (rev 54)
@@ -1,3 +1,4 @@
 1 0 obj<</Producer(htmldoc 1.8.21 Copyright 1997-2002 Easy Software Products, All Rights Reserved.)/CreationDate(D:20051224220656+0100)/Title(AWStats logfile analyzer Documentation)/Keywords(awstats, awstat, index, main, page, faq, doc, documentation, docs, setup, manual, instructions, questions, support, help, problems)>>endobj
 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 Copyright (C) 2000-2006 - Laurent Destailleur - eldy at users.sourceforge.net
+print "----- $PROG $VERSION (c) 2000-2005 Laurent Destailleur -----\n";