[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-3-15-g0275eb7

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 0275eb7bf5037f06a18b15a2ad3a7bad61f74d75
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Aug 6 23:29:31 2010 -0400

    Prepare release: Update changelog and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 3551d6f..852d0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,24 +1,28 @@
-awstats (6.9.5~dfsg-4) UNRELEASED; urgency=low
+awstats (6.9.5~dfsg-4) unstable; urgency=low
 
   [ Jonas Smedegaard ]
-  * Fix bashism in buildstatic.sh.  Closes: bug#582861.
-  * Recommend versions of coreutils supporting mktemp --tmpdir.  Closes:
-    bug#582602, thanks to Vincent Danjean.
+  * Fix bashism in buildstatic.sh.
+    Closes: bug#582861.
+  * Recommend versions of coreutils supporting mktemp --tmpdir.
+    Closes: bug#582602, thanks to Vincent Danjean.
 
   [ Andreas Henriksson ]
   * Remove myself from uploaders.
 
   [ Sergey B Kirpichev ]
-  * Install logresolvemerge.pl in tools.  Closes: bug#275491.
+  * Install logresolvemerge.pl in tools.
+    Closes: bug#275491.
   * Change order of configs parsing in update.sh and buildstatic.sh.
     Closes: bug#580699, thanks to Ken Neighbors.
   * Improve documentation.  Logfile permissions, EnableLockForUpdate
-    option, setup for multiple sites.  Closes: bug#580702, thanks to
-    Ken Neighbors.
-  * Prevent nested includes from being prematurely closed.  Closes:
-    bug#575545, thanks to Ken Neighbors.
-
- -- Sergey B Kirpichev <skirpichev at gmail.com>  Sat, 12 Jun 2010 11:22:29 +0400
+    option, setup for multiple sites.
+    Closes: bug#580702, thanks to Ken Neighbors.
+  * Prevent nested includes from being prematurely closed.
+    Closes: bug#575545, thanks to Ken Neighbors.
+  * Rephrase steps needed for apache.conf installation.
+    Closes: bug#590947.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 06 Aug 2010 23:26:53 -0400
 
 awstats (6.9.5~dfsg-3) unstable; urgency=low
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 3c34432..750c82c 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -27,6 +27,7 @@ Files: ./debian/NEWS,
 	./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,

-- 
awstats Debian packaging