[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-2-6-g98eed3a

Sergey B Kirpichev skirpichev at gmail.com
Sat Oct 29 11:45:48 UTC 2011


The following commit has been merged in the master branch:
commit 79c901bd10fdc1d2cba50d1865c7ac86c7aff894
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Sat Oct 29 14:45:14 2011 +0400

    Refresh patches with --no-index --no-timestamps -pab --diffstat

diff --git a/debian/patches/0007_russian_lang.patch b/debian/patches/0007_russian_lang.patch
index a2fcd01..5ad38e5 100644
--- a/debian/patches/0007_russian_lang.patch
+++ b/debian/patches/0007_russian_lang.patch
@@ -2,6 +2,10 @@ Description: Updated Russian translation.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3199735&group_id=13764&atid=113764
 
+---
+ wwwroot/cgi-bin/lang/awstats-ru.txt |   40 ++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 20 deletions(-)
+
 --- a/wwwroot/cgi-bin/lang/awstats-ru.txt
 +++ b/wwwroot/cgi-bin/lang/awstats-ru.txt
 @@ -1,5 +1,5 @@
diff --git a/debian/patches/1003_redirect_to_STDERR.patch b/debian/patches/1003_redirect_to_STDERR.patch
index 009dc71..2ed9cda 100644
--- a/debian/patches/1003_redirect_to_STDERR.patch
+++ b/debian/patches/1003_redirect_to_STDERR.patch
@@ -2,6 +2,15 @@ Description: Redirect errors of offline scripts to STDERR.
 Author: Charles Fry <debian at frogcircus.org>
 Bug-Debian: http://bugs.debian.org/296435
 
+---
+ tools/awstats_buildstaticpages.pl |    4 ++--
+ tools/awstats_configure.pl        |    2 +-
+ tools/awstats_exportlib.pl        |    4 ++--
+ tools/awstats_updateall.pl        |    2 +-
+ tools/logresolvemerge.pl          |    4 ++--
+ tools/maillogconvert.pl           |    2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
 @@ -80,7 +80,7 @@
diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index ae615b6..1a5bffa 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -4,6 +4,11 @@ Bug-Debian: http://bugs.debian.org/432096
 Bug-Debian: http://bugs.debian.org/440035
 Bug-Debian: http://bugs.debian.org/519319
 
+---
+ tools/awstats_buildstaticpages.pl |    2 +-
+ wwwroot/cgi-bin/awstats.pl        |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
 @@ -1852,7 +1852,7 @@
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index 20f04c4..6cf63f4 100644
--- a/debian/patches/1008_extrasections_with_top.patch
+++ b/debian/patches/1008_extrasections_with_top.patch
@@ -2,6 +2,10 @@ 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
 
+---
+ wwwroot/cgi-bin/awstats.pl |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
 @@ -11423,7 +11423,7 @@
diff --git a/debian/patches/1009_hurd_url.patch b/debian/patches/1009_hurd_url.patch
index 64a6d95..747ac86 100644
--- a/debian/patches/1009_hurd_url.patch
+++ b/debian/patches/1009_hurd_url.patch
@@ -2,6 +2,10 @@ Description: Correct link to the GNU Hurd homepage.
 Author: Sylvain Rochet <gradator at gradator.net>
 Bug-Debian: http://bugs.debian.org/408086
 
+---
+ wwwroot/cgi-bin/lib/operating_systems.pm |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/wwwroot/cgi-bin/lib/operating_systems.pm
 +++ b/wwwroot/cgi-bin/lib/operating_systems.pm
 @@ -253,7 +253,7 @@
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index 65de7f6..c93ce49 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -2,6 +2,10 @@ Description: Set $DirData permissions to 0755.
 Author: Charles Fry <debian at frogcircus.org>
 Bug-Debian: http://bugs.debian.org/299148
 
+---
+ wwwroot/cgi-bin/awstats.pl |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/wwwroot/cgi-bin/awstats.pl
 +++ b/wwwroot/cgi-bin/awstats.pl
 @@ -2972,7 +2972,7 @@
diff --git a/debian/patches/1012_ipv6_strip_trailing_dot.patch b/debian/patches/1012_ipv6_strip_trailing_dot.patch
index b7ccf93..8cb9764 100644
--- a/debian/patches/1012_ipv6_strip_trailing_dot.patch
+++ b/debian/patches/1012_ipv6_strip_trailing_dot.patch
@@ -2,6 +2,10 @@ 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
 
+---
+ wwwroot/cgi-bin/plugins/ipv6.pm |    1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/wwwroot/cgi-bin/plugins/ipv6.pm
 +++ b/wwwroot/cgi-bin/plugins/ipv6.pm
 @@ -64,6 +64,7 @@
diff --git a/debian/patches/1013_yahoo_search.patch b/debian/patches/1013_yahoo_search.patch
index bc57759..47ce7d3 100644
--- a/debian/patches/1013_yahoo_search.patch
+++ b/debian/patches/1013_yahoo_search.patch
@@ -2,6 +2,10 @@ Description: Fix wrong search engine logging from yahoo sites.
 Author: <azhrarn at underhanded.org>
 Bug-Debian: http://bugs.debian.org/347426
 
+---
+ wwwroot/cgi-bin/lib/search_engines.pm |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/wwwroot/cgi-bin/lib/search_engines.pm
 +++ b/wwwroot/cgi-bin/lib/search_engines.pm
 @@ -364,7 +364,7 @@
diff --git a/debian/patches/1014_websec_robot.patch b/debian/patches/1014_websec_robot.patch
index 0801039..5e4e072 100644
--- a/debian/patches/1014_websec_robot.patch
+++ b/debian/patches/1014_websec_robot.patch
@@ -2,6 +2,10 @@ Description: Add WebSec to robots list.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 Bug-Debian: http://bugs.debian.org/284149
 
+---
+ wwwroot/cgi-bin/lib/browsers.pm |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
 --- a/wwwroot/cgi-bin/lib/browsers.pm
 +++ b/wwwroot/cgi-bin/lib/browsers.pm
 @@ -253,7 +253,8 @@
diff --git a/debian/patches/1015_awstats-tt-bg.txt.patch b/debian/patches/1015_awstats-tt-bg.txt.patch
index 44264f1..22ec620 100644
--- a/debian/patches/1015_awstats-tt-bg.txt.patch
+++ b/debian/patches/1015_awstats-tt-bg.txt.patch
@@ -4,6 +4,10 @@ Author: Kamen Naydenov <pau4o at kamennn.eu>
 Bug-Debian: http://bugs.debian.org/610632
 Forwarded: https://sourceforge.net/tracker/?func=detail&atid=113764&aid=3199733&group_id=13764
 
+---
+ wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt |   81 ++++++++++------------
+ 1 file changed, 40 insertions(+), 41 deletions(-)
+
 --- a/wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
 +++ b/wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
 @@ -1,70 +1,69 @@
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index 41fc874..38443de 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -1,6 +1,10 @@
 Description: Modify default path to awstats.pl in tools/.
 Author: Sergey B Kirpichev <skirpichev at gmail.com>
 
+---
+ tools/awstats_buildstaticpages.pl |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- a/tools/awstats_buildstaticpages.pl
 +++ b/tools/awstats_buildstaticpages.pl
 @@ -307,8 +307,8 @@

-- 
awstats Debian packaging



More information about the Pkg-awstats-commits mailing list