--- mergelog-4.5.1.orig/debian/control +++ mergelog-4.5.1/debian/control @@ -0,0 +1,19 @@ +Source: mergelog +Section: utils +Priority: optional +Maintainer: Ryan Niebur +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), zlib1g-dev, autotools-dev, autoconf, automake +Standards-Version: 3.8.3 +Homepage: http://mergelog.sourceforge.net/ +Vcs-Git: git://git.ryan52.info/git/mergelog +Vcs-Browser: http://git.ryan52.info/?p=mergelog;a=summary + +Package: mergelog +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: utility that merges httpd log files by date + A small and fast C program which merges and sorts http log files in + 'Common Log Format' from web servers behind round-robin DNS. It has + been designed to easily manage huge log files from highly stressed + servers. --- mergelog-4.5.1.orig/debian/clean +++ mergelog-4.5.1/debian/clean @@ -0,0 +1,8 @@ +config.sub +config.guess +depcomp +aclocal.m4 +Makefile.in +configure +man/Makefile.in +src/Makefile.in --- mergelog-4.5.1.orig/debian/docs +++ mergelog-4.5.1/debian/docs @@ -0,0 +1 @@ +README --- mergelog-4.5.1.orig/debian/copyright +++ mergelog-4.5.1/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Igor Genibel on +Mon, 22 Jan 2001 19:42:32 +0100. + +It was downloaded from http://download.sourceforge.net/mergelog/mergelog-4.2.tar.gz + +Upstream Author: Bertrand Demiddelaer + +Copyright: + Copyright (C) 2000-2001 LibertySurf Telecom, Bertrand Demiddelaer + +License: + 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; version 2 dated June, 1991. + + 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 Street, Fifth Floor, Boston, MA + 02110-1301 USA. + +The Debian packaging is: +Copyright (c) 2001-2003 Igor Genibel , +Copyright (c) 2003 Guido Trotter , +Copyright (c) 2004 Cyril Bouthors , +Copyright (c) 2009 Ryan Niebur +and is also released under the GNU GPL version 2. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License version 2 can be found in +`/usr/share/common-licenses/GPL-2'. --- mergelog-4.5.1.orig/debian/watch +++ mergelog-4.5.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/mergelog/mergelog-(.+)\.tar\.gz --- mergelog-4.5.1.orig/debian/compat +++ mergelog-4.5.1/debian/compat @@ -0,0 +1 @@ +7 --- mergelog-4.5.1.orig/debian/README.source +++ mergelog-4.5.1/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. --- mergelog-4.5.1.orig/debian/changelog +++ mergelog-4.5.1/debian/changelog @@ -0,0 +1,132 @@ +mergelog (4.5.1-9) unstable; urgency=low + + * set SCAN_OFFSET to 8 (Closes: #538859) + * add DMUA field + * set Standards-Version to 3.8.3 + * use quilt, make debian/rules smaller + + -- Ryan Niebur Mon, 07 Sep 2009 14:48:47 -0700 + +mergelog (4.5.1-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Tell autoreconf to install missing, yet required, files. + Fixes FTBFS due to missing depcomp (Closes: #543067) + + -- Stefano Zacchiroli Sun, 30 Aug 2009 10:19:11 +0200 + +mergelog (4.5.1-8) unstable; urgency=low + + * adopt package (Closes: #500354) + * redo debian/rules with dh7 (Closes: #395715) + * remove debian/dirs + * add homepage field + * bump dh compat to 7 + * add build dep on autotools-dev for copying config.{sub,guess} + * standards version 3.8.1 + * add debian/watch + * remove changes outside of the debian dir, as they are automatically + generated + * add copyright information to debian/copyright, and add + copyright/license information about the debian packaging + * add Vcs-{Browser,Git} fields in control file + * correct FSF address in copyright file + * add misc:Depends to depends + * fix build by manually adding a depcomp symlink and running + autoreconf + * clean files added/changed during the build process + * fix short description + + -- Ryan Niebur Sat, 14 Mar 2009 02:40:01 -0700 + +mergelog (4.5.1-7) unstable; urgency=low + + * New maintainer. + * debian/rules: define CFLAGS and LDFLAGS in order to support large + files (over 2GB) (closes: #251833). + * debian/rules: clean. + * debian/control: grammar. + * debian/copyright: clean, updated upstream email address. + + -- Cyril Bouthors Sun, 3 Oct 2004 12:42:29 +0200 + +mergelog (4.5.1-6) unstable; urgency=low + + * Bump Standards-Version to 3.6.1.0 + + -- Guido Trotter Fri, 29 Aug 2003 12:41:22 +0200 + +mergelog (4.5.1-5) unstable; urgency=low + + * Correction in debian/rules (call make distclean) + + -- Guido Trotter Sun, 6 Apr 2003 11:22:27 +0200 + +mergelog (4.5.1-4) unstable; urgency=low + + * New Maintainer (closes: #187270) + * Use debian/compat and bump compatibility to 4 + * Some changes to debian/rules + + -- Guido Trotter Fri, 4 Apr 2003 09:26:10 +0200 + +mergelog (4.5.1-3) unstable; urgency=low + + * Change Maintainer field in control :-/ + + -- Igor Genibel Thu, 3 Apr 2003 11:54:10 +0200 + +mergelog (4.5.1-2) unstable; urgency=low + + * Orphan + + -- Igor Genibel Wed, 2 Apr 2003 14:26:55 +0200 + +mergelog (4.5.1-1) unstable; urgency=low + + * new upstream release + + -- Igor Genibel Mon, 19 Nov 2001 17:56:58 +0100 + +mergelog (4.5-1) unstable; urgency=low + + * new upstream version + + -- Igor Genibel Thu, 12 Apr 2001 11:32:36 +0200 + +mergelog (4.4-1) unstable; urgency=low + + * new upstream version + + -- Igor Genibel Wed, 21 Mar 2001 18:50:24 +0100 + +mergelog (4.3-1) unstable; urgency=low + * new upstream version + + -- Igor Genibel Tue, 03 Mar 2001 12:07:58 +0100 + +mergelog (4.2-5) unstable; urgency=low + * missing build dependency bug fix (closes: #85071) + + -- Igor Genibel Tue, 20 Feb 2001 11:56:19 +0100 + +mergelog (4.2-4) unstable; urgency=low + * missing build dependency bug fix (closes: #84123) + + -- Igor Genibel Tue, 02 Feb 2001 14:58:05 +0100 + +mergelog (4.2-3) unstable; urgency=low + * missing build dependency bug fix (closes: #84123) + + -- Igor Genibel Tue, 30 Jan 2001 14:08:05 +0100 + +mergelog (4.2-2) unstable; urgency=low + * typo bug fix in changelog (closes: #83167, #83791) + + -- Igor Genibel Wed, 24 Jan 2001 09:23:28 +0100 + +mergelog (4.2-1) unstable; urgency=low + + * Initial Release. (close: Bug#83167) + + -- Igor Genibel Mon, 22 Jan 2001 19:42:32 +0100 --- mergelog-4.5.1.orig/debian/rules +++ mergelog-4.5.1/debian/rules @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +%: + dh --with quilt $@ + +override_dh_auto_configure: + cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.guess config.guess + autoreconf -i + dh_auto_configure --- mergelog-4.5.1.orig/debian/patches/series +++ mergelog-4.5.1/debian/patches/series @@ -0,0 +1 @@ +fix-SCAN_OFFSET.patch --- mergelog-4.5.1.orig/debian/patches/fix-SCAN_OFFSET.patch +++ mergelog-4.5.1/debian/patches/fix-SCAN_OFFSET.patch @@ -0,0 +1,21 @@ +commit 53c029127dfbbd5b389c97d1ca585b700aea7307 +Author: Ryan Niebur +Date: Mon Sep 7 14:40:23 2009 -0700 + + set SCAN_OFFSET to 8 (Closes: #538859) + +diff --git a/debian/changelog b/debian/changelog +index dc38406..0d46bbf 100644 +diff --git a/src/mergelog.c b/src/mergelog.c +index 9cdb0fa..0ec5f80 100644 +--- a/src/mergelog.c ++++ b/src/mergelog.c +@@ -32,7 +32,7 @@ + + #define BUFFER_SIZE 32768 + #define DATE_SIZE 14 +-#define SCAN_OFFSET 9 ++#define SCAN_OFFSET 8 + #define SCAN_SIZE 512 + +