[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-4-13-g63330d5

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 63330d5f994eaf637dea1efad1bf7b9bc0327ac7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Dec 24 00:09:10 2010 +0100

    Prepare release: Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index f83e7cc..54150f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 awstats (6.9.5~dfsg-5) unstable; urgency=high
 
+  [ Sergey B Kirpichev ]
   * Bump up Standards-Version to 3.9.1.
   * Remove examples/staticpages.sh.
   * Take sucurity fixes from upstream CVS:
@@ -9,7 +10,13 @@ awstats (6.9.5~dfsg-5) unstable; urgency=high
       disable overwriting of configdir parameter in cgi mode).
     Closes: bug#606263.
 
- -- Sergey B Kirpichev <skirpichev at gmail.com>  Thu, 16 Dec 2010 19:07:24 +0300
+  [ Jonas Smedegaard ]
+  * Unfuzz patches.
+  * Ease building with git-buildpackage:
+    + Add dpkg-source local-options.
+    + Suppress .pc dir.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 24 Dec 2010 00:05:07 +0100
 
 awstats (6.9.5~dfsg-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 33dcae4..14a0fff 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian AWStats Team <pkg-awstats-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>, Sergey B Kirpichev <skirpichev at gmail.com>
 Build-Depends: cdbs (>= 0.4.70~),
  devscripts (>= 2.10.7~),
- dh-buildinfo,
  debhelper (>= 6),
+ dh-buildinfo,
  ant,
  default-jdk,
  sharutils
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 750c82c..e67523d 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -19,15 +19,15 @@ Files: ./debian/NEWS,
 	./debian/default/awstats,
 	./debian/examples/apache.conf,
 	./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/0008_nested_includes.patch,
+	./debian/patches/0009_CVE-2010-4369.patch,
 	./debian/patches/1002_disable_configdir.patch,
 	./debian/patches/1003_redirect_to_STDERR.patch,
 	./debian/patches/1004_perl_version.patch,
-	./debian/patches/1005_nested_includes.patch,
 	./debian/patches/1008_extrasections_with_top.patch,
 	./debian/patches/1009_hurd_url.patch,
 	./debian/patches/1010_dirdata_permissions.patch,
@@ -40,6 +40,7 @@ Files: ./debian/NEWS,
 	./debian/patches/README,
 	./debian/patches/series,
 	./debian/source/format,
+	./debian/source/local-options,
 	./debian/update.sh,
 	./debian/watch,
 	./docs/awstats_benchmark.html,

-- 
awstats Debian packaging