Freeze exception for awffull/3.10.2-2
Dear release team,
I ask for a freeze exception for awffull version 3.10.2-2.
I have prepared few QA uploads. But unfortunately not all of them were
sponsored before freeze [1].
This update of the package does not fix any RC bug, but it fixes important,
normal, minor and wishlist bugs. Also the quality of package was improved
in common.
File in attachment was produced using command:
$ debdiff awffull_3.10.2-1.dsc awffull_3.10.2-2.dsc > awffull_3.10.2-1:3.10.2-2.diff
It would be nice to see this updated package in Wheezy.
Best regards,
Boris
[1] http://bugs.debian.org/cgi-bin/pkgreport.cgi?include=subject%3A[QA];package=sponsorship-requests
diff -Nru awffull-3.10.2/debian/awffull.cron.daily awffull-3.10.2/debian/awffull.cron.daily
--- awffull-3.10.2/debian/awffull.cron.daily 2012-01-01 10:53:48.000000000 +0200
+++ awffull-3.10.2/debian/awffull.cron.daily 2012-06-29 23:45:51.000000000 +0300
@@ -12,8 +12,6 @@
[ -d ${AWFFULL_CONFDIR} ] || exit 0;
for i in ${AWFFULL_CONFDIR}/*.conf; do
- echo "Running: ${i} file."
-
# run agains a rotated or normal logfile
LOGFILE=`awk '$1 ~ /^LogFile$/ {print $2}' $i`;
@@ -41,9 +39,9 @@
# check current log, if last log is a rotated logfile
if [ "${LOGFILE}" != "${NLOGFILE}" ]; then
# empty ?
- [ -s "${NLOGFILE}" ] || { echo "ERROR: Rotated LogFile not found: ${NLOGFILE}"; continue; };
+ [ -s "${NLOGFILE}" ] || { echo "INFO: Non-rotated LogFile empty or missing: ${NLOGFILE}"; continue; };
# readable ?
- [ -r "${NLOGFILE}" ] || { echo "ERROR: Rotated LogFile is not readable: ${NLOGFILE}"; continue; };
+ [ -r "${NLOGFILE}" ] || { echo "WARNING: Non-rotated LogFile is not readable: ${NLOGFILE}"; continue; };
${AWFFULL} -c ${i} -Q ${NLOGFILE};
RET=$?;
diff -Nru awffull-3.10.2/debian/awffull.lintian-overrides awffull-3.10.2/debian/awffull.lintian-overrides
--- awffull-3.10.2/debian/awffull.lintian-overrides 1970-01-01 03:00:00.000000000 +0300
+++ awffull-3.10.2/debian/awffull.lintian-overrides 2012-06-29 23:45:51.000000000 +0300
@@ -0,0 +1,2 @@
+# False positive.
+awffull: possible-bashism-in-maintainer-script postinst:56 '${HOSTNAME'
diff -Nru awffull-3.10.2/debian/changelog awffull-3.10.2/debian/changelog
--- awffull-3.10.2/debian/changelog 2012-01-01 11:16:10.000000000 +0200
+++ awffull-3.10.2/debian/changelog 2012-06-29 23:45:51.000000000 +0300
@@ -1,3 +1,47 @@
+awffull (3.10.2-2) unstable; urgency=low
+
+ * QA upload.
+ * Bumped Standards-Version to 3.9.3 (was 3.7.3).
+ * Bumped debhelper version to 9 (was 8); updated debian/compat.
+ * Added file debian/patches/fix-GeoIP-default-path.patch:
+ fixed default path to GeoIP database. (Closes: #458647)
+ * Added file debian/patches/fix-quietly-run-of-cron-job.patch:
+ disables useless output messages when job is run without any verbose
+ options. (Closes: #665680)
+ * Added file debian/patches/fix-font-in-use.patch:
+ - now recommended font ttf-dejavu is used instead of bitstream-vera
+ font which is going to be removed from the repository
+ - fixed path to used font (Closes: #458647)
+ * Updated debian/templates: switched from apache to apache2.
+ (Closes: #467641)
+ * Updated debian/awffull.cron.daily:
+ - deleted useless output message when cron job runs without errors
+ (Closes: #482168)
+ - updated notifications for more correct messages
+ (Closes: #565813)
+ * Updated debian/control:
+ - awffull now suggests ttf-dejavu
+ - changed build dependency from libpng12-dev to libpng-dev
+ (Closes: #662274)
+ * Rewritten debian/rules:
+ - now dh is used instead of direct dh_* commands
+ - added --as-needed option to LDFLAGS
+ - added section get-orig-source (uscan is used)
+ - fixed FTBFS because of outdated config.{sub,guess}:
+ used symlinks to files from autotools-dev package
+ (Closes: #536835)
+ - fixed lintian warnings:
+ + hardening-no-relro
+ + hardening-no-fortify-functions
+ * Added file debian/awffull.lintian-overrides:
+ possible-bashism-in-maintainer-script warning is false positive.
+ * Added file debian/patches/fix-hyphen-used-as-minus-sign.patch.
+ * File debian/copyright was rewritten in according to Copyright format 1.0.
+ Added missed licenses and copyright holders. Fixed lintian note:
+ copyright-refers-to-symlink-license usr/share/common-licenses/GPL.
+
+ -- Boris Pek <tehnick-8@mail.ru> Fri, 29 Jun 2012 23:38:12 +0300
+
awffull (3.10.2-1) unstable; urgency=low
* QA upload
diff -Nru awffull-3.10.2/debian/compat awffull-3.10.2/debian/compat
--- awffull-3.10.2/debian/compat 2012-01-01 10:55:54.000000000 +0200
+++ awffull-3.10.2/debian/compat 2012-06-29 23:45:51.000000000 +0300
@@ -1 +1 @@
-8
+9
diff -Nru awffull-3.10.2/debian/control awffull-3.10.2/debian/control
--- awffull-3.10.2/debian/control 2012-01-01 11:01:18.000000000 +0200
+++ awffull-3.10.2/debian/control 2012-06-29 23:45:51.000000000 +0300
@@ -2,13 +2,16 @@
Section: web
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>=8), autotools-dev, zlib1g-dev, gettext, libpcre3-dev, libgeoip-dev, libfreetype6, libfreetype6-dev, po-debconf, help2man, libpng12-dev, libgd2-noxpm-dev | libgd2-xpm-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>=9), autotools-dev,
+ zlib1g-dev, gettext, libpcre3-dev, libgeoip-dev, libfreetype6,
+ libfreetype6-dev, po-debconf, help2man, libpng-dev,
+ libgd2-xpm-dev | libgd2-noxpm-dev
Homepage: http://www.stedee.id.au/awffull/
+Standards-Version: 3.9.3
Package: awffull
Architecture: any
-Suggests: httpd, dnshistory
+Suggests: httpd, dnshistory, ttf-dejavu
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: debconf (>= 1.4.58) | debconf-2.0
Description: web server log analysis program
diff -Nru awffull-3.10.2/debian/copyright awffull-3.10.2/debian/copyright
--- awffull-3.10.2/debian/copyright 2012-01-01 10:53:48.000000000 +0200
+++ awffull-3.10.2/debian/copyright 2012-06-29 23:45:51.000000000 +0300
@@ -1,32 +1,78 @@
-This package was debianized by Jose Carlos Medeiros <debian@psabs.com.br> on
-Tue, 6 Jun 2006 20:47:34 -0300.
-
-It was downloaded from http://www.stedee.id.au/awffull/
-
-Copyright Holder: Stephen McInerney (spm@stedee.id.au)
-
-License:
- Copyright (C) 1997-2001 Bradford L. Barrett (brad@mrunix.net)
- Copyright 2002, 2004 by Stanislaw Yurievich Pusep
- Copyright (C) 2004, 2005, 2006 by Stephen McInerney (spm@stedee.id.au)
- Copyright (C) 2006 by Alexander Lazic (al-awffull@none.at)
- Copyright (C) 2006 by Benoit Rouits (brouits@free.fr)
-
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Debianized-By: Jose Carlos Medeiros <debian@psabs.com.br>
+Debianized-Date: Tue, 6 Jun 2006 20:47:34 -0300
+Upstream-Name: awffull
+Upstream-Contact: Stephen McInerney <spm@stedee.id.au>
+Source: http://www.stedee.id.au/awffull/
+
+Files: *
+Copyright:
+ 1997-2001 Bradford L. Barrett <brad@mrunix.net>
+ 2002-2004 Stanislaw Yurievich Pusep
+ 2004-2008 Stephen McInerney <spm@stedee.id.au>
+ 2006 Alexander Lazic <al-awffull@none.at>
+ 2006 Benoit Rouits <brouits@free.fr>
+ 2006 John Heaton <john@manchester.ac.uk>
+ 2007 Benoît Dejean <benoit@placenet.org>
+ 2007 Andreas Schoenberg <asg@ftpproxy.org>
+ 2004-2008 Steve McInerney
+License: GPL-3+
+
+Files: src/strlcpy.c
+Copyright: 1998, Todd C. Miller <Todd.Miller@courtesan.com>
+License: ISC
+
+Files: src/gettext.h
+Copyright: 1995-2006 Free Software Foundation Inc
+License: LGPL-2+
+
+Files: debian/*
+Copyright: 2006-2007 Jose Carlos Medeiros <debian@psabs.com.br>
+ 2012 Boris Pek <tehnick-8@mail.ru>
+License: GPL-3+
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: LGPL-2+
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation, either version 2 of the License, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2'.
+
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff -Nru awffull-3.10.2/debian/patches/fix-font-in-use.patch awffull-3.10.2/debian/patches/fix-font-in-use.patch
--- awffull-3.10.2/debian/patches/fix-font-in-use.patch 1970-01-01 03:00:00.000000000 +0300
+++ awffull-3.10.2/debian/patches/fix-font-in-use.patch 2012-06-29 23:45:51.000000000 +0300
@@ -0,0 +1,25 @@
+Description: Fix path to used font
+ Also now recommended font ttf-dejavu is used instead of bitstream-vera font
+ which is going to be removed from the repository.
+Bug-Debian: http://bugs.debian.org/515071
+Author: Boris Pek <tehnick-8@mail.ru>
+Last-Update: 2012-06-29
+
+--- a/src/graphs.h
++++ b/src/graphs.h
+@@ -63,13 +63,13 @@
+ #define GRAPH_FONT_LABEL "sans" /* Default True Type Font to use */
+
+ #ifndef FONTDEFAULT
+-#define GRAPH_FONT_FULLPATH_DEFAULT "/usr/share/fonts/bitstream-vera/VeraBd.ttf" /* When all else fails... */
++#define GRAPH_FONT_FULLPATH_DEFAULT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" /* When all else fails... */
+ #else
+ #define GRAPH_FONT_FULLPATH_DEFAULT FONTDEFAULT
+ #endif
+
+ #ifndef FONTLABEL
+-#define GRAPH_FONT_FULLPATH_LABEL "/usr/share/fonts/bitstream-vera/Vera.ttf" /* When all else fails... */
++#define GRAPH_FONT_FULLPATH_LABEL "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" /* When all else fails... */
+ #else
+ #define GRAPH_FONT_FULLPATH_LABEL FONTLABEL
+ #endif
diff -Nru awffull-3.10.2/debian/patches/fix-GeoIP-default-path.patch awffull-3.10.2/debian/patches/fix-GeoIP-default-path.patch
--- awffull-3.10.2/debian/patches/fix-GeoIP-default-path.patch 1970-01-01 03:00:00.000000000 +0300
+++ awffull-3.10.2/debian/patches/fix-GeoIP-default-path.patch 2012-06-29 23:45:51.000000000 +0300
@@ -0,0 +1,27 @@
+Description: Fix GeoIP default path
+Bug-Debian: http://bugs.debian.org/458647
+Author: Boris Pek <tehnick-8@mail.ru>
+Last-Update: 2012-06-29
+
+--- a/doc/awffull.conf.5
++++ b/doc/awffull.conf.5
+@@ -100,7 +100,7 @@
+ GeoIPDatabase
+ GeoIPDatabase is the location of the
+ GeoIP database file. Default is
+-\*(T<\fI/usr/local/share/GeoIP/GeoIP.dat\fR\*(T>, which is
++\*(T<\fI/usr/share/GeoIP/GeoIP.dat\fR\*(T>, which is
+ where a default GeoIP install will put
+ it. Note that the database is updated monthly. For the details see:
+ \(lahttp://www.maxmind.com/app/geoip_country\(ra
+--- a/src/awffull.h
++++ b/src/awffull.h
+@@ -43,7 +43,7 @@
+
+ #define SITE_ADDRESS "http://www.stedee.id.au/awffull/";
+
+-#define GEOIP_DATABASE "/usr/local/share/GeoIP/GeoIP.dat"
++#define GEOIP_DATABASE "/usr/share/GeoIP/GeoIP.dat"
+
+ #define DATE_TIME_FORMAT "%d/%b/%Y:%H:%M:%S" /* Default DATE_TIME format for input to strptime */
+ #define DATE_TIME_XFERLOG_FORMAT "%a %b %d %H:%M:%S %Y"
diff -Nru awffull-3.10.2/debian/patches/fix-hyphen-used-as-minus-sign.patch awffull-3.10.2/debian/patches/fix-hyphen-used-as-minus-sign.patch
--- awffull-3.10.2/debian/patches/fix-hyphen-used-as-minus-sign.patch 1970-01-01 03:00:00.000000000 +0300
+++ awffull-3.10.2/debian/patches/fix-hyphen-used-as-minus-sign.patch 2012-06-29 23:45:51.000000000 +0300
@@ -0,0 +1,240 @@
+Description: Fix hyphen used as minus sign
+Author: Boris Pek <tehnick-8@mail.ru>
+Last-Update: 2012-06-29
+
+--- a/doc/awffull.1
++++ b/doc/awffull.1
+@@ -342,46 +342,46 @@
+ \*(T<\fB\-V\fR\*(T>, \*(T<\fB\-\-version\fR\*(T>
+ Display program version and exit program
+ .TP
+--v --verbose
++\-v \-\-verbose
+ \*(T<\fBVerbosity\fR\*(T> Display debugging information for
+ errors and warnings. Multiple v's will increase the amount of
+ information displayed.
+ .TP
+---match_counts
++\-\-match_counts
+ Display optimisation useful information pertaining to the
+ number of matches against various Group, Hide and Ignore
+ options.
+ .TP
+--i --ignore_history
++\-i \-\-ignore_history
+ \*(T<\fBIgnoreHist\fR\*(T> Ignore history. USE WITH CAUTION.
+ This will cause AWFFull to ignore any
+ previous monthly history file only. Incremental data (if present) is
+ still processed.
+ .TP
+--p --preserve_state
++\-p \-\-preserve_state
+ \*(T<\fBIncremental\fR\*(T> Preserve internal data between
+ runs.
+ .TP
+--T --timing
++\-T \-\-timing
+ \*(T<\fBTimeMe\fR\*(T>. Force display of timing information
+ at end of processing.
+ .TP
+--c --config=FILE
++\-c \-\-config=FILE
+ Use configuration file FILE
+ .TP
+--n NAME
++\-n NAME
+ \*(T<\fBHostName\fR\*(T>. Use the hostname
+ NAME.
+ .TP
+--o --output=DIR
++\-o \-\-output=DIR
+ \*(T<\fBOutputDir\fR\*(T>. Use output directory
+ DIR.
+ .TP
+--t NAME
++\-t NAME
+ \*(T<\fBReportTitle\fR\*(T>. Use
+ NAME for report title.
+ .TP
+-F --logtype=TYPE
++F \-\-logtype=TYPE
+ \*(T<\fBLogType\fR\*(T>. Specify log type to be processed.
+ Value can be one of: auto,
+ clf, combined,
+@@ -392,76 +392,76 @@
+ value of \(oqauto\(cq states that the log format
+ automatically ascertained.
+ .TP
+--f --fold
++\-f \-\-fold
+ \*(T<\fBFoldSeqErr\fR\*(T>. Fold out of sequence log records
+ back into analysis, by treating as if they were the same date/time
+ as the last good record. Normally, out of sequence log records are
+ simply ignored.
+ .TP
+--Y
++\-Y
+ \*(T<\fBCountryGraph\fR\*(T>. Suppress country graph.
+ .TP
+--G
++\-G
+ \*(T<\fBHourlyGraph\fR\*(T>. Suppress hourly graph.
+ .TP
+--x NAME
++\-x NAME
+ \*(T<\fBHTMLExtension\fR\*(T>. Defines the HTML file
+ extension to use on the created report files. If not specified,
+ defaults to html. Do not include the
+ leading period.
+ .TP
+--H
++\-H
+ \*(T<\fBHourlyStats\fR\*(T>. Suppress hourly
+ statistics.
+ .TP
+--L
++\-L
+ \*(T<\fBGraphLegend\fR\*(T>. Suppress color coded graph
+ legends.
+ .TP
+--l NUM
++\-l NUM
+ \*(T<\fBGraphLines\fR\*(T>. Use background lines. The number
+ of lines and where to place are automatically calculated. For
+ backwards compatibility, any number > 0 enables. Use zero ('0')
+ to disable the lines.
+ .TP
+--P NAME"
++\-P NAME
+ \*(T<\fBPageType\fR\*(T>. Specify file extensions that are
+ considered pages. Sometimes referred to
+ as pageviews.
+ .TP
+--m NUM
++\-m NUM
+ \*(T<\fBVisitTimeout\fR\*(T>. Specify the Visit timeout
+ period. Specified in number of seconds. Default is 1800 seconds (30
+ minutes). Sometimes referred to as
+ sessions.
+ .TP
+--I NAME
++\-I NAME
+ \*(T<\fBIndexAlias\fR\*(T>. Use the filename
+ name as an additional alias for
+ index.
+ .TP
+--M NUM
++\-M NUM
+ \*(T<\fBMangleAgents\fR\*(T>. Mangle user agent names
+ according to the mangle level specified by
+ num.
+
+ Mangle levels are:
+
+-5 - Browser name and major version
++5 \- Browser name and major version
+
+-4 - Browser name, major and minor version
++4 \- Browser name, major and minor version
+
+-3 - Browser name, major version, minor version to two decimal
++3 \- Browser name, major version, minor version to two decimal
+ places
+
+-2 - Browser name, major and minor versions and
++2 \- Browser name, major and minor versions and
+ sub-version
+
+-1 - Browser name, version and machine type if possible
++1 \- Browser name, version and machine type if possible
+
+-0 - All information (left unchanged).
++0 \- All information (left unchanged).
+ .TP
+--g NUM
++\-g NUM
+ GroupDomains. Automatically group sites by domain. The
+ grouping level specified by num can be
+ thought of as 'the number of dots' to display in the grouping. The
+@@ -469,59 +469,59 @@
+ .PP
+ Hide Options
+ .TP
+--a NAME
++\-a NAME
+ \*(T<\fBHideAgent\fR\*(T>. Hide user agents matching
+ name.
+ .TP
+--r NAME
++\-r NAME
+ \*(T<\fBHideReferrer\fR\*(T>. Hide referrer matching
+ name.
+ .TP
+--s NAME
++\-s NAME
+ \*(T<\fBHideSite\fR\*(T>. Hide site matching
+ name.
+ .TP
+--X NAME
++\-X NAME
+ \*(T<\fBHideAllSites\fR\*(T>. Hide all individual sites (only
+ display groups).
+ .TP
+--u NAME
++\-u NAME
+ \*(T<\fBHideURL\fR\*(T>. Hide URL matching
+ name.
+ .PP
+ Table size options
+ .TP
+--A --top_agents=NUM
++\-A \-\-top_agents=NUM
+ \*(T<\fBTopAgents\fR\*(T>. Display the top
+ num user agents table.
+ .TP
+--R --top_refers=NUM
++\-R \-\-top_refers=NUM
+ \*(T<\fBTopReferrers\fR\*(T>. Display the top
+ num referrers table.
+ .TP
+--S --top_sites=NUM
++\-S \-\-top_sites=NUM
+ \*(T<\fBTopSites\fR\*(T>. Display the top
+ num sites table.
+ .TP
+--U --top_urls=NUM
++\-U \-\-top_urls=NUM
+ \*(T<\fBTopURLs\fR\*(T>. Display the top
+ num URL's table.
+ .TP
+--C --top_countries=NUM
++\-C \-\-top_countries=NUM
+ \*(T<\fBTopCountries\fR\*(T>. Display the top
+ num countries table.
+ .TP
+--e --top_entry=NUM
++\-e \-\-top_entry=NUM
+ \*(T<\fBTopEntry\fR\*(T>. Display the top
+ num entry pages table.
+ .TP
+--E --top_exit=NUM
++\-E \-\-top_exit=NUM
+ \*(T<\fBTopExit\fR\*(T>. Display the top
+ num exit pages table.
+ .PP
+ Other Options
+ .TP
+---use_geoip
++\-\-use_geoip
+ Enables the use of the Maxmind GeoIP capability for more
+ accurate detection of countries.
+
+@@ -530,7 +530,7 @@
+ Use either raw IP Addresses and GeoIP, or Names and disable GeoIP.
+ ie. Don't use GeoIP AND DNShistory.\fR
+ .TP
+---match_counts
++\-\-match_counts
+ Display the various Group/Hide etc Match Counts. This option
+ is ideal for optimisation of the awffull.conf file. Just be careful
+ with optimising Agents in particular, as the order is typically
diff -Nru awffull-3.10.2/debian/patches/fix-quietly-run-of-cron-job.patch awffull-3.10.2/debian/patches/fix-quietly-run-of-cron-job.patch
--- awffull-3.10.2/debian/patches/fix-quietly-run-of-cron-job.patch 1970-01-01 03:00:00.000000000 +0300
+++ awffull-3.10.2/debian/patches/fix-quietly-run-of-cron-job.patch 2012-06-29 23:45:51.000000000 +0300
@@ -0,0 +1,19 @@
+Description: Fix quietly run of cron job
+ awffull cron job does not run quietly because "-Q" option has been deprecated.
+ This patch disables useless output messages when job is run without any verbose
+ options.
+Bug-Debian: http://bugs.debian.org/665680
+Author: Taku YASUI <tach@debian.org>
+Last-Update: 2012-06-29
+
+--- a/src/output.c.orig
++++ b/src/output.c
+@@ -3386,7 +3386,7 @@
+ buffer, /* graph title */
+ index_start, g_settings.settings.history_index + 1);
+
+- ERRVPRINT(0, "Graph Done!\n");
++ ERRVPRINT(VERBOSE1, "Graph Done!\n");
+ /* now do html stuff... */
+ snprintf(index_fname, sizeof(index_fname), "index.%s", g_settings.settings.html_ext);
+
diff -Nru awffull-3.10.2/debian/patches/series awffull-3.10.2/debian/patches/series
--- awffull-3.10.2/debian/patches/series 2012-01-01 11:02:39.000000000 +0200
+++ awffull-3.10.2/debian/patches/series 2012-06-29 23:45:51.000000000 +0300
@@ -1 +1,5 @@
01-update_configdir_in_manpage.dpatch
+fix-GeoIP-default-path.patch
+fix-font-in-use.patch
+fix-quietly-run-of-cron-job.patch
+fix-hyphen-used-as-minus-sign.patch
diff -Nru awffull-3.10.2/debian/rules awffull-3.10.2/debian/rules
--- awffull-3.10.2/debian/rules 2012-01-01 11:02:23.000000000 +0200
+++ awffull-3.10.2/debian/rules 2012-06-29 23:45:51.000000000 +0300
@@ -1,95 +1,42 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-CFLAGS := -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-
-config.status: configure
- dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --with-etcdir=/etc/awffull
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) CFLAGS="$(CFLAGS)"
- touch build-stamp
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
+CFLAGS+=-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wl,-z,defs
+LDFLAGS+=-Wl,--as-needed
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f src/awffull_lang.h
- rm -f config.guess config.log config.status config.sub
- rm -f debian/awffull_history_regen.1
- dh_clean
+%:
+ dh $@ --parallel
-install: build
- dh_testdir
+override_dh_auto_configure:
+ [ -f config/config.guess.orig ] || mv -f config/config.guess config/config.guess.orig
+ [ -f config/config.sub.orig ] || mv -f config/config.sub config/config.sub.orig
+ ln -sf /usr/share/misc/config.guess config/config.guess
+ ln -sf /usr/share/misc/config.sub config/config.sub
+ dh_auto_configure -- --with-etcdir=/etc/awffull
+
+
+override_dh_auto_clean:
dh_testroot
- dh_prep
- dh_installdirs
+ rm -f build-stamp
+ rm -f src/awffull_lang.h
+ rm -f debian/awffull_history_regen.1
+ [ ! -f config/config.guess.orig ] || mv -f config/config.guess.orig config/config.guess
+ [ ! -f config/config.sub.orig ] || mv -f config/config.sub.orig config/config.sub
+ dh_auto_clean
- # Add here commands to install the package into debian/awffull.
+override_dh_auto_install:
$(MAKE) install DESTDIR=$(CURDIR)/debian/awffull
cp contrib/awffull_history_regen.pl $(CURDIR)/debian/awffull/usr/sbin/awffull_history_regen
help2man $(CURDIR)/debian/awffull/usr/sbin/awffull_history_regen \
-n awffull_history_regen -s 1 \
-o $(CURDIR)/debian/awffull_history_regen.1
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_installdebconf
- dh_installcron
+override_dh_installman:
dh_installman debian/awffull_history_regen.1
- dh_link
+
+.PHONY: override_dh_strip
+override_dh_strip:
dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+get-orig-source:
+ uscan --noconf --verbose --force-download --rename --download-current-version --destdir=..
+
diff -Nru awffull-3.10.2/debian/templates awffull-3.10.2/debian/templates
--- awffull-3.10.2/debian/templates 2012-01-01 10:53:48.000000000 +0200
+++ awffull-3.10.2/debian/templates 2012-06-29 23:45:51.000000000 +0300
@@ -5,5 +5,5 @@
Template: awffull/logfile
Type: string
-Default: /var/log/apache/access.log.1
+Default: /var/log/apache2/access.log.1
_Description: Webserver's rotated log filename:
Reply to: