[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.5.dfsg-2-12-gcfe841d

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 051dacba2c26338cce2decef4b578783d6ed685f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed May 19 13:46:12 2010 +0200

    Drop (unapplied) patch 0011: applied upstream at some point in the past.

diff --git a/debian/patches/0011_geoipfree.patch b/debian/patches/0011_geoipfree.patch
deleted file mode 100644
index a02202d..0000000
--- a/debian/patches/0011_geoipfree.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-===================================================================
---- awstats.orig/wwwroot/cgi-bin/plugins/geoipfree.pm	2009-03-03 17:48:51.000000000 +0300
-+++ awstats/wwwroot/cgi-bin/plugins/geoipfree.pm	2009-03-03 17:49:11.000000000 +0300
-@@ -51,7 +51,7 @@
- 	# ENTER HERE CODE TO DO INIT PLUGIN ACTIONS
- 	debug(" Plugin geoipfree: InitParams=$InitParams",1);
- 	%TmpDomainLookup=();
--	$gi = Geo::IPfree::new();
-+	$gi = Geo::IPfree->new();
- #	$gi->Faster; 	# Do not enable Faster as the Memoize module is rarely available
- 	# ----->
- 
diff --git a/debian/patches/series b/debian/patches/series
index 26c95d5..472c668 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 #0006_more_xss.patch
 0007_russian_lang.patch
-#0011_geoipfree.patch
 1002_disable_configdir.patch
 1003_redirect_to_STDERR.patch
 1004_perl_version.patch

-- 
awstats Debian packaging