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

Sergey B Kirpichev skirpichev at gmail.com
Wed Nov 11 13:58:17 UTC 2009 

The following commit has been merged in the master branch:
commit e1e1ffc4e0efd933695960c1eda6034f018c7daf
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Wed Nov 11 16:54:20 2009 +0300

    use DEP3 for patch tagging

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index e74e449..e93ea41 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,3 +1,2 @@
   * Package relevant extra modules
   * Get rid of the last uses of $DIR in main script
-  * adopt http://dep.debian.net/deps/dep3/ ?
diff --git a/debian/patches/0006_more_xss.patch b/debian/patches/0006_more_xss.patch
index 25c06ac..e751e2b 100644
--- a/debian/patches/0006_more_xss.patch
+++ b/debian/patches/0006_more_xss.patch
@@ -1,18 +1,16 @@
-Description: CVS fix for upstream XSS bug 2001151 (Closes: #495432).
+Description: CVS fix for upstream XSS bug.
 Author: Florian Weimer <fw at deneb.enyo.de>
+Bug-Debian: http://bugs.debian.org/495432
 
 Index: awstats/wwwroot/cgi-bin/awstats.pl
 ===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-08 01:28:32.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-08 01:29:59.000000000 +0300
-@@ -7690,9 +7690,9 @@
+--- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:28:52.000000000 +0300
++++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:30:24.000000000 +0300
+@@ -7690,6 +7690,7 @@
  sub DecodeEncodedString {
  	my $stringtodecode = shift;
  	$stringtodecode =~ tr/\+/ /s;
 +	$stringtodecode =~ s/%22//g;
  	$stringtodecode =~ s/%([A-F0-9][A-F0-9])/pack("C", hex($1))/ieg;
  	$stringtodecode =~ s/["']//g;
--
- 	return $stringtodecode;
- }
  
diff --git a/debian/patches/0011_geoipfree.patch b/debian/patches/0011_geoipfree.patch
index 631189d..a02202d 100644
--- a/debian/patches/0011_geoipfree.patch
+++ b/debian/patches/0011_geoipfree.patch
@@ -1,5 +1,6 @@
-Description: Strip warnings with Geo::IPfree version >= 0.4 (Closes: #512373).
+Description: Strip warnings with Geo::IPfree version >= 0.4.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
+Bug-Debian: http://bugs.debian.org/512373
 
 Index: awstats/wwwroot/cgi-bin/plugins/geoipfree.pm
 ===================================================================
diff --git a/debian/patches/1002_disable_configdir.patch b/debian/patches/1002_disable_configdir.patch
index 49291fb..6245f65 100644
--- a/debian/patches/1002_disable_configdir.patch
+++ b/debian/patches/1002_disable_configdir.patch
@@ -1,5 +1,6 @@
-Description: Require AWSTATS_ENABLE_CONFIG_DIR environmental variable in order to enable configdir (Closes: #365910).
+Description: Require AWSTATS_ENABLE_CONFIG_DIR environmental variable in order to enable configdir.
 Author: Charles Fry <debian at frogcircus.org>
+Bug-Debian: http://bugs.debian.org/365910
 
 Index: awstats/wwwroot/cgi-bin/awstats.pl
 ===================================================================
diff --git a/debian/patches/1003_redirect_to_STDERR.patch b/debian/patches/1003_redirect_to_STDERR.patch
index b136944..3054de5 100644
--- a/debian/patches/1003_redirect_to_STDERR.patch
+++ b/debian/patches/1003_redirect_to_STDERR.patch
@@ -1,5 +1,6 @@
-Description: Redirect errors of offline scripts to STDERR (Closes: #296435).
+Description: Redirect errors of offline scripts to STDERR.
 Author: Charles Fry <debian at frogcircus.org>
+Bug-Debian: http://bugs.debian.org/296435
 
 Index: awstats/tools/awstats_buildstaticpages.pl
 ===================================================================
diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index 4a06ecb..3dc1b7f 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -1,5 +1,8 @@
-Description: Disable nested includes warnings for Perl < 5.6 (Closes: #432096, #440035, #519319).
+Description: Disable nested includes warnings for Perl < 5.6.
 Author: Nick Leverton <nick at leverton.org>
+Bug-Debian: http://bugs.debian.org/432096
+Bug-Debian: http://bugs.debian.org/440035
+Bug-Debian: http://bugs.debian.org/519319
 
 Index: awstats/wwwroot/cgi-bin/awstats.pl
 ===================================================================
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index 94b68af..793b920 100644
--- a/debian/patches/1008_extrasections_with_top.patch
+++ b/debian/patches/1008_extrasections_with_top.patch
@@ -1,10 +1,11 @@
-Description: Include the words (Top XXX) in the ExtraSection headings (upstream bug 1844793).
+Description: Include the words (Top XXX) in the ExtraSection headings.
 Author: Patrick Collins <pcollins1 at users.sourceforge.net>
+Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=13764&atid=313764
 
 Index: awstats/wwwroot/cgi-bin/awstats.pl
 ===================================================================
---- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-08 01:41:33.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-08 01:41:41.000000000 +0300
+--- awstats.orig/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:43:57.000000000 +0300
++++ awstats/wwwroot/cgi-bin/awstats.pl	2009-11-11 16:43:59.000000000 +0300
 @@ -15765,7 +15765,7 @@
  				if ($Debug) { debug( "ExtraName$extranum", 2 ); }
  				print "$Center<a name=\"extra$extranum\">&nbsp;</a><br />";
diff --git a/debian/patches/1009_hurd_url.patch b/debian/patches/1009_hurd_url.patch
index 7fe68ed..a182211 100644
--- a/debian/patches/1009_hurd_url.patch
+++ b/debian/patches/1009_hurd_url.patch
@@ -1,5 +1,6 @@
-Description: Correct link to the GNU Hurd homepage (Closes: #408086).
+Description: Correct link to the GNU Hurd homepage.
 Author: Sylvain Rochet <gradator at gradator.net>
+Bug-Debian: http://bugs.debian.org/408086
 
 Index: awstats/wwwroot/cgi-bin/lib/operating_systems.pm
 ===================================================================
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index 715bad0..f22e4e6 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -1,5 +1,6 @@
-Description: Set $DirData permissions to 0755 (Closes: #299148).
+Description: Set $DirData permissions to 0755.
 Author: Charles Fry <debian at frogcircus.org>
+Bug-Debian: http://bugs.debian.org/299148
 
 Index: awstats/wwwroot/cgi-bin/awstats.pl
 ===================================================================
diff --git a/debian/patches/1012_ipv6_strip_trailing_dot.patch b/debian/patches/1012_ipv6_strip_trailing_dot.patch
index 17a667b..f2e4cfd 100644
--- a/debian/patches/1012_ipv6_strip_trailing_dot.patch
+++ b/debian/patches/1012_ipv6_strip_trailing_dot.patch
@@ -1,5 +1,6 @@
-Description: Strip the trailing dot when making a reverse on ipv6 addresses (Closes: #397544).
+Description: Strip the trailing dot when making a reverse on IPv6 addresses.
 Author: Laurent Bigonville <bigon at debian.org>
+Bug-Debian: http://bugs.debian.org/397544
 
 Index: awstats/wwwroot/cgi-bin/plugins/ipv6.pm
 ===================================================================
diff --git a/debian/patches/1013_yahoo_search.patch b/debian/patches/1013_yahoo_search.patch
index 012a981..5ae9b4c 100644
--- a/debian/patches/1013_yahoo_search.patch
+++ b/debian/patches/1013_yahoo_search.patch
@@ -1,5 +1,6 @@
-Description: Fix wrong search engine logging from yahoo sites (Closes: #347426).
+Description: Fix wrong search engine logging from yahoo sites.
 Author: <azhrarn at underhanded.org>
+Bug-Debian: http://bugs.debian.org/347426
 
 Index: awstats/wwwroot/cgi-bin/lib/search_engines.pm
 ===================================================================
diff --git a/debian/patches/1014_websec_robot.patch b/debian/patches/1014_websec_robot.patch
index 42a400d..79c8ff9 100644
--- a/debian/patches/1014_websec_robot.patch
+++ b/debian/patches/1014_websec_robot.patch
@@ -1,5 +1,6 @@
-Description: Add WebSec to robots list (Closes: #284149).
+Description: Add WebSec to robots list.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
+Bug-Debian: http://bugs.debian.org/284149
 
 Index: awstats/wwwroot/cgi-bin/lib/browsers.pm
 ===================================================================
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index 2b2cc44..cb78eab 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -1,4 +1,4 @@
-Description: Modify default path to awstats.pl in tools/
+Description: Modify default path to awstats.pl in tools/.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
 Index: awstats/tools/awstats_buildstaticpages.pl

-- 
awstats Debian packaging

More information about the Pkg-awstats-commits mailing list