diff -Nru wwwstat-2.0/debian/changelog wwwstat-2.0/debian/changelog --- wwwstat-2.0/debian/changelog 2010-08-06 14:58:51.000000000 +0000 +++ wwwstat-2.0/debian/changelog 2012-03-02 23:48:27.000000000 +0000 @@ -1,3 +1,20 @@ +wwwstat (2.0-7) unstable; urgency=low + + * Update the copyright file: + - add a dot to fix the formatting + - update to the latest DEP 5 candidate format + - change "Artistic (old)" to "Artistic-1.0" + - bump the year on my copyright notice + * Convert the packaging to Git and change the Vcs-* URLs to Gitorious. + * Add the 09-getopt patch to use Getopt::Std instead of the Perl 4 + getopt library. Closes: #659433 + * Bump Standards-Version to 3.9.3 with no changes. + * Bump the debhelper compatibility level to 9 with no changes. + * Add Multi-Arch: foreign to the binary package just in case. + * Drop the version from the dependency on perl. + + -- Peter Pentchev Sat, 03 Mar 2012 01:48:24 +0200 + wwwstat (2.0-6) unstable; urgency=low * Convert to the 3.0 (quilt) source format: diff -Nru wwwstat-2.0/debian/compat wwwstat-2.0/debian/compat --- wwwstat-2.0/debian/compat 2009-04-05 22:05:41.000000000 +0000 +++ wwwstat-2.0/debian/compat 2012-03-02 23:35:37.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru wwwstat-2.0/debian/control wwwstat-2.0/debian/control --- wwwstat-2.0/debian/control 2010-08-08 12:50:18.000000000 +0000 +++ wwwstat-2.0/debian/control 2012-03-02 23:46:47.000000000 +0000 @@ -3,16 +3,17 @@ Priority: optional Maintainer: Peter Pentchev DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7) -Build-Depends-Indep: perl (>= 5.6.0-16) -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 9) +Build-Depends-Indep: perl +Standards-Version: 3.9.3 Homepage: http://ftp.ics.uci.edu/pub/websoft/wwwstat/ -Vcs-Svn: http://svn.ringlet.net/svn/ringlet/www/wwwstat/trunk/wwwstat-pkg/debian/ -Vcs-Browser: http://svn.ringlet.net/v/ringlet/www/wwwstat/trunk/wwwstat-pkg/debian/ +Vcs-Git: git://gitorious.org/wwwstat/wwwstat-pkg.git +Vcs-Browser: http://gitorious.org/wwwstat/wwwstat-pkg Package: wwwstat Architecture: all Depends: ${perl:Depends}, ${misc:Depends} +Multi-Arch: foreign Description: httpd logfile analysis package wwwstat processes a sequence of httpd Common Logfile Format access_log files and prior summary outputs, and then outputs a summary of diff -Nru wwwstat-2.0/debian/copyright wwwstat-2.0/debian/copyright --- wwwstat-2.0/debian/copyright 2010-08-02 12:26:11.000000000 +0000 +++ wwwstat-2.0/debian/copyright 2012-03-02 17:06:26.000000000 +0000 @@ -1,11 +1,11 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: wwwstat -Maintainer: Roy Fielding +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: wwwstat +Upstream-Contact: Roy Fielding Source: http://ftp.ics.uci.edu/pub/websoft/wwwstat/ Files: * Copyright: Copyright (c) 1994, 1996 Regents of the University of California. -License: Artistic (old) +License: Artistic-1.0 This is a verbatim copy of the package's LICENSE file: . Licensing and Distribution Information: @@ -38,7 +38,7 @@ IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - + . IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION @@ -159,7 +159,7 @@ Files: debian/* Copyright: Copyright (c) 2004, 2005 Tim Peeler - Copyright (c) 2009, 2010 Peter Pentchev + Copyright (c) 2009, 2010, 2012 Peter Pentchev License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License; either version 2 of the License, @@ -170,5 +170,5 @@ Files: debian/*.8 Copyright: Copyright (c) 2004 Tim Peeler -License: Artistic (old) +License: Artistic-1.0 See the "Files: *" clause above for the full license information. diff -Nru wwwstat-2.0/debian/patches/09-getopts.patch wwwstat-2.0/debian/patches/09-getopts.patch --- wwwstat-2.0/debian/patches/09-getopts.patch 1970-01-01 00:00:00.000000000 +0000 +++ wwwstat-2.0/debian/patches/09-getopts.patch 2012-03-02 16:45:47.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Use Getopt::Std instead of the Perl 4 getopt library. +Forwarded: no +Bug-Debian: http://bugs.debian.org/659433 +Author: Peter Pentchev +Last-Update: 2012-03-02 + +--- a/oldlog2new.pl ++++ b/oldlog2new.pl +@@ -75,8 +75,10 @@ + # ========================================================================== + # Get the command-line options + +-require "getopts.pl"; +-&Getopts('hezf:s:'); ++use Getopt::Std; ++ ++our ($opt_h, $opt_e, $opt_z, $opt_f, $opt_s); ++getopts('hezf:s:'); + if ($@ || $opt_h) { &usage; } + + if ($opt_e) { $PrintInvalids = 1; } diff -Nru wwwstat-2.0/debian/patches/series wwwstat-2.0/debian/patches/series --- wwwstat-2.0/debian/patches/series 2010-08-06 14:34:08.000000000 +0000 +++ wwwstat-2.0/debian/patches/series 2012-03-02 15:51:56.000000000 +0000 @@ -3,3 +3,4 @@ 03-config-files.patch 07-optimize.patch 08-wwwstat-2.01.patch +09-getopts.patch