[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.dfsg-1-172-g3a1ed2b

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 3a1ed2b4ec93f18f191c6df0fb10d5b23e79c036
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Sep 4 14:16:41 2009 +0200

    Update changelog, debian/control and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index bd3f295..6f67760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,6 @@ awstats (6.9~dfsg-3) UNRELEASED; urgency=low
   * Add Description & Author fields for patches.
   * Fix dos->unix fileformat for patch 1007.
   * Add semicolon in yahoo patch.
-  * Bump up debhelper deps (clean lintian warnings postinst/prerm-has-
-    useless-call-to-install-docs)
   * 1xxx patches are submitted to upstream, cleanup TODO
   * Modify default path to awstats.pl in tools/
   * Add /var/cache/awstats for static html reports
@@ -52,6 +50,17 @@ awstats (6.9~dfsg-3) UNRELEASED; urgency=low
   * Mention git-orig-source build target in watch file.
   * Bump standards-version to 3.8.1.
   * Bump debhelper compatibility level to 6.
+  * Update CDBS snippets:
+    + Enhance package-relations.mk to support all binary package
+      relations (except -indep ones).
+    + Extend package-relation cleanup to include debhelper 6 and 7.0.1.
+    + Implement fail-source-not-repackaged rule in upstream-tarball.mk.
+    + Update URL to draft DEP5 format in copyright-check.mk output.
+    + Update package-relations.mk: Cleanup unversioned+versioned
+      dependency mix. Improve whitespace cleanup. Rewrite and silence
+      applying dependencies.
+  * Reformat debian/copyright to conform to proposal DEP5 rev. 54.
+  * Include actual licensing text of GPL-2+ in debian/copyright.
 
   [ Andreas Henriksson ]
   * Replace apache with apache2 as default config choice. Closes:
@@ -62,7 +71,7 @@ awstats (6.9~dfsg-3) UNRELEASED; urgency=low
       (Reported by Andreas Westwik)
   * Remove Charles Fry from uploaders on his request.
 
- -- Andreas Henriksson <andreas at fatal.se>  Thu, 03 Sep 2009 11:07:38 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 04 Sep 2009 13:38:52 +0200
 
 awstats (6.9~dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d931e3f..94c3baf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian AWStats Team <pkg-awstats-devel at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Jonas Smedegaard <dr at jones.dk>, Sergey B Kirpichev <skirpichev at gmail.com>
-Build-Depends: debhelper (>= 7), quilt, patchutils (>= 0.2.25), dh-buildinfo, devscripts (>= 2.10.7), cdbs (>= 0.4.39), sharutils
+Build-Depends: debhelper (>= 6), quilt, patchutils (>= 0.2.25), dh-buildinfo, devscripts (>= 2.10.7), cdbs (>= 0.4.39), sharutils, openjdk-6-jdk
 Vcs-Git: git://git.debian.org/git/collab-maint/awstats.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/awstats.git;a=summary
 Standards-Version: 3.8.1
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 614fe5e..732b70c 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,5 +1,5 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX
-Upstream-Name: Untrusted draft - double-check copyrights yourself!
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
+Name: Untrusted draft - double-check copyrights yourself!
 
 Files: README.TXT
 	debian/NEWS
@@ -12,29 +12,32 @@ Files: README.TXT
 	debian/awstats.install
 	debian/awstats.postinst
 	debian/awstats.postrm
+	debian/buildstatic.sh
 	debian/compat
 	debian/control
 	debian/control.in
+	debian/default/awstats
 	debian/examples/apache.conf
-	debian/examples/awstats-update
-	debian/examples/awstats-update.8
 	debian/examples/redostats.sh
 	debian/examples/staticpages.sh
 	debian/gbp.conf
 	debian/icons/firefox.png.uu
+	debian/patches/0006_more_xss.patch
+	debian/patches/0007_russian_lang.patch
+	debian/patches/0011_geoipfree.patch
 	debian/patches/1002_disable_configdir.patch
 	debian/patches/1003_redirect_to_STDERR.patch
 	debian/patches/1004_perl_version.patch
-	debian/patches/1006_more_xss.patch
-	debian/patches/1007_russian_lang.patch
 	debian/patches/1008_extrasections_with_top.patch
 	debian/patches/1009_hurd_url.patch
 	debian/patches/1010_dirdata_permissions.patch
-	debian/patches/1011_geoipfree.patch
 	debian/patches/1012_ipv6_strip_trailing_dot.patch
 	debian/patches/1013_yahoo_search.patch
+	debian/patches/1014_websec_robot.patch
+	debian/patches/2001_awstatsprog_path.patch
 	debian/patches/README
 	debian/patches/series
+	debian/update.sh
 	debian/watch
 	docs/awstats_benchmark.html
 	docs/awstats_changelog.txt

-- 
awstats Debian packaging