[Pkg-awstats-commits] r40 - in awstats/trunk/debian: . patches
Jonas Smedegaard
js at costa.debian.org
Sun Jan 15 21:15:57 UTC 2006
Author: js
Date: 2006-01-15 21:15:57 +0000 (Sun, 15 Jan 2006)
New Revision: 40
Added:
awstats/trunk/debian/patches/1001_sanitize_more.patch
awstats/trunk/debian/patches/1002_redirect_to_STDERR.patch
awstats/trunk/debian/patches/README
awstats/trunk/debian/patches/series
Removed:
awstats/trunk/debian/patches/01_sanitize_more.patch
awstats/trunk/debian/patches/02_redirect_to_STDERR.patch
Modified:
awstats/trunk/debian/control
awstats/trunk/debian/rules
Log:
Renumber patches and document numbering scheme. Switch to using quilt.
Modified: awstats/trunk/debian/control
===================================================================
--- awstats/trunk/debian/control 2006-01-15 21:12:26 UTC (rev 39)
+++ awstats/trunk/debian/control 2006-01-15 21:15:57 UTC (rev 40)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Jonas Smedegaard <dr at jones.dk>
Uploaders: Charles Fry <debian at frogcircus.org>
-Build-Depends-Indep: cdbs (>= 0.4.23-1.1), , debhelper (>= 4.1.0), patchutils (>= 0.2.25), dh-buildinfo
+Build-Depends-Indep: cdbs (>= 0.4.23-1.1), , debhelper (>= 4.1.0), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), dh-buildinfo
Standards-Version: 3.6.2
Package: awstats
Deleted: awstats/trunk/debian/patches/01_sanitize_more.patch
===================================================================
--- awstats/trunk/debian/patches/01_sanitize_more.patch 2006-01-15 21:12:26 UTC (rev 39)
+++ awstats/trunk/debian/patches/01_sanitize_more.patch 2006-01-15 21:15:57 UTC (rev 40)
@@ -1,21 +0,0 @@
-diff -urNad awstats~/wwwroot/cgi-bin/awstats.pl awstats/wwwroot/cgi-bin/awstats.pl
---- awstats~/wwwroot/cgi-bin/awstats.pl 2005-11-24 15:11:19.000000000 -0500
-+++ awstats/wwwroot/cgi-bin/awstats.pl 2006-01-04 00:41:10.957371836 -0500
-@@ -5542,7 +5542,7 @@
- # No update but report by default when run from a browser
- $UpdateStats=($QueryString=~/update=1/i?1:0);
-
-- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&DecodeEncodedString("$1"); }
-+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize(&DecodeEncodedString("$1")); }
- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons=&DecodeEncodedString("$1"); }
- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize(&DecodeEncodedString("$1"),1); }
- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize(&DecodeEncodedString("$1")); }
-@@ -5591,7 +5591,7 @@
- # Update with no report by default when run from command line
- $UpdateStats=1;
-
-- if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig="$1"; }
-+ if ($QueryString =~ /config=([^&]+)/i) { $SiteConfig=&Sanitize("$1"); }
- if ($QueryString =~ /diricons=([^&]+)/i) { $DirIcons="$1"; }
- if ($QueryString =~ /pluginmode=([^&]+)/i) { $PluginMode=&Sanitize("$1",1); }
- if ($QueryString =~ /configdir=([^&]+)/i) { $DirConfig=&Sanitize("$1"); }
Deleted: awstats/trunk/debian/patches/02_redirect_to_STDERR.patch
===================================================================
--- awstats/trunk/debian/patches/02_redirect_to_STDERR.patch 2006-01-15 21:12:26 UTC (rev 39)
+++ awstats/trunk/debian/patches/02_redirect_to_STDERR.patch 2006-01-15 21:15:57 UTC (rev 40)
@@ -1,92 +0,0 @@
-diff -urNad awstats~/tools/awstats_buildstaticpages.pl awstats/tools/awstats_buildstaticpages.pl
---- awstats~/tools/awstats_buildstaticpages.pl 2005-08-23 15:56:35.000000000 -0400
-+++ awstats/tools/awstats_buildstaticpages.pl 2006-01-04 00:58:20.490613529 -0500
-@@ -75,7 +75,7 @@
- # Return: None
- #------------------------------------------------------------------------------
- sub error {
-- print "Error: $_[0].\n";
-+ print STDERR "Error: $_[0].\n";
- exit 1;
- }
-
-@@ -95,7 +95,7 @@
- # print "$messagestring<br />\n";
- # }
- # else {
-- print "$messagestring\n";
-+ print STDERR "$messagestring\n";
- # }
- # }
- }
-diff -urNad awstats~/tools/awstats_configure.pl awstats/tools/awstats_configure.pl
---- awstats~/tools/awstats_configure.pl 2005-04-22 13:34:05.000000000 -0400
-+++ awstats/tools/awstats_configure.pl 2006-01-04 00:58:24.987002812 -0500
-@@ -87,7 +87,7 @@
- # error
- #-------------------------------------------------------
- sub error {
-- print "Error: $_[0].\n";
-+ print STDERR "Error: $_[0].\n";
- exit 1;
- }
-
-diff -urNad awstats~/tools/awstats_exportlib.pl awstats/tools/awstats_exportlib.pl
---- awstats~/tools/awstats_exportlib.pl 2003-12-05 18:53:38.000000000 -0500
-+++ awstats/tools/awstats_exportlib.pl 2006-01-04 00:58:30.769217454 -0500
-@@ -93,8 +93,8 @@
- my $thirdmessage=shift||"";
- my $donotshowsetupinfo=shift||0;
- if ($Debug) { debug("$message $secondmessage $thirdmessage",1); }
-- print "$message";
-- print "\n";
-+ print STDERR "$message";
-+ print STDERR "\n";
- exit 1;
- }
-
-diff -urNad awstats~/tools/awstats_updateall.pl awstats/tools/awstats_updateall.pl
---- awstats~/tools/awstats_updateall.pl 2005-04-22 13:34:05.000000000 -0400
-+++ awstats/tools/awstats_updateall.pl 2006-01-04 00:58:34.910654953 -0500
-@@ -36,7 +36,7 @@
- # Return: None
- #------------------------------------------------------------------------------
- sub error {
-- print "Error: $_[0].\n";
-+ print STDERR "Error: $_[0].\n";
- exit 1;
- }
-
-diff -urNad awstats~/tools/logresolvemerge.pl awstats/tools/logresolvemerge.pl
---- awstats~/tools/logresolvemerge.pl 2005-12-04 16:10:46.000000000 -0500
-+++ awstats/tools/logresolvemerge.pl 2006-01-04 00:58:38.552160356 -0500
-@@ -104,7 +104,7 @@
- # Return: None
- #------------------------------------------------------------------------------
- sub error {
-- print "Error: $_[0].\n";
-+ print STDERR "Error: $_[0].\n";
- exit 1;
- }
-
-@@ -133,7 +133,7 @@
- sub warning {
- my $messagestring=shift;
- if ($Debug) { debug("$messagestring",1); }
-- print "$messagestring\n";
-+ print STDERR "$messagestring\n";
- }
-
- #-----------------------------------------------------------------------------
-diff -urNad awstats~/tools/maillogconvert.pl awstats/tools/maillogconvert.pl
---- awstats~/tools/maillogconvert.pl 2005-04-22 13:34:05.000000000 -0400
-+++ awstats/tools/maillogconvert.pl 2006-01-04 00:58:42.465628823 -0500
-@@ -56,7 +56,7 @@
- #-------------------------------------------------------
-
- sub error {
-- print "Error: $_[0].\n";
-+ print STDERR "Error: $_[0].\n";
- exit 1;
- }
-
Copied: awstats/trunk/debian/patches/1001_sanitize_more.patch (from rev 31, awstats/trunk/debian/patches/01_sanitize_more.patch)
Copied: awstats/trunk/debian/patches/1002_redirect_to_STDERR.patch (from rev 31, awstats/trunk/debian/patches/02_redirect_to_STDERR.patch)
Added: awstats/trunk/debian/patches/README
===================================================================
--- awstats/trunk/debian/patches/README 2006-01-15 21:12:26 UTC (rev 39)
+++ awstats/trunk/debian/patches/README 2006-01-15 21:15:57 UTC (rev 40)
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
Added: awstats/trunk/debian/patches/series
===================================================================
--- awstats/trunk/debian/patches/series 2006-01-15 21:12:26 UTC (rev 39)
+++ awstats/trunk/debian/patches/series 2006-01-15 21:15:57 UTC (rev 40)
@@ -0,0 +1,2 @@
+1001_sanitize_more.patch
+1002_redirect_to_STDERR.patch
Modified: awstats/trunk/debian/rules
===================================================================
--- awstats/trunk/debian/rules 2006-01-15 21:12:26 UTC (rev 39)
+++ awstats/trunk/debian/rules 2006-01-15 21:15:57 UTC (rev 40)
@@ -4,7 +4,7 @@
include debian/cdbs/1/rules/auto-update.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include debian/cdbs/1/rules/buildinfo.mk
include debian/cdbs/1/rules/copyright-check.mk
More information about the Pkg-awstats-commits
mailing list