From bd57d61fa35a4929073f62a046274a171fbedef4 Mon Sep 17 00:00:00 2001 From: Antoine Jacquet Date: Mon, 7 Feb 2005 00:00:00 +0100 Subject: [PATCH] version 0.71 * back to a basic Makefile for clean packinging purposes --- CHANGELOG | 7 +++- Makefile | 22 +--------- README | 2 +- debian/changelog | 24 ----------- debian/compat | 1 - debian/control | 15 ------- debian/copyright | 16 -------- debian/docs | 1 - debian/rules | 99 --------------------------------------------- irssistats.c | 4 +- rpm/irssistats.spec | 31 -------------- 11 files changed, 9 insertions(+), 213 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100755 debian/rules delete mode 100644 rpm/irssistats.spec diff --git a/CHANGELOG b/CHANGELOG index 6a5c7ad..1267bfb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Change log file for irssistats -version 0.70 (2005-06-01) +version 0.71 (2005-02-07) + * back to a basic Makefile for clean packinging purposes + +version 0.70 (2005-02-06) * Makefile was improved to easily build packages * Windows binaries are now available * patch to make parsing more robust and dutch translation updated (thank you Wouter Horré) @@ -94,4 +97,4 @@ version 0.2 (2002-05-16) * maximum height for graph is now calculated version 0.1 (2002-05-01) - * initial release \ No newline at end of file + * initial release diff --git a/Makefile b/Makefile index e9e6f92..5251143 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ -VER = 0.70 PRE = /usr/local BIN = $(PRE)/bin DAT = $(PRE)/share/irssistats/data @@ -9,9 +8,7 @@ irssistats:irssistats.c gcc -O2 -o irssistats irssistats.c clean: - rm -f irssistats irssistats.exe - rm -f build-stamp configure-stamp debian/irssistats.substvars debian/files - rm -rf debian/irssistats rpm/BUILD rpm/SPECS rpm/SOURCES rpm/SRPMS rpm/RPMS + rm -f irssistats install:irssistats mkdir -p $(BIN) $(DAT) $(DOC) $(MAN) @@ -24,20 +21,3 @@ uninstall: rm -f $(BIN)/irssistats rm -rf $(DAT) $(DOC) rm -f $(MAN)/irssistats.1 - -tar: clean - cd .. && tar zcvf irssistats-$(VER).tar.gz irssistats-$(VER) - -rpm: tar - mkdir -p rpm/BUILD rpm/SPECS rpm/SOURCES rpm/SRPMS rpm/RPMS - rpm -ta ../irssistats-$(VER).tar.gz --define "_topdir `pwd`/rpm" - cp rpm/*/*.rpm rpm/*/*/*.rpm .. - -deb: clean - dpkg-buildpackage -us -uc -rfakeroot - -win: irssistats.c - i586-mingw32msvc-gcc -O2 -o irssistats.exe irssistats.c - cd .. && zip -r irssistats-$(VER).zip irssistats-$(VER)/{irssistats.exe,README,CHANGELOG,COPYING,irssistats.sgml,sample.configfile,sample.nickfile,data} - -dist: tar rpm deb win \ No newline at end of file diff --git a/README b/README index ec98bd5..0b38498 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -irssistats 0.70 +irssistats 0.71 site: http://royale.zerezo.com/irssistats/ mail: royale@zerezo.com diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 6183d33..0000000 --- a/debian/changelog +++ /dev/null @@ -1,24 +0,0 @@ -irssistats (0.70-1) unstable; urgency=low - - * New upstream version. - - -- Antoine Jacquet Sat, 5 Feb 2005 23:44:14 +0100 - -irssistats (0.62-1) unstable; urgency=low - - * New upstream version. - - -- Antoine Jacquet Wed, 3 May 2004 22:10:45 +0100 - -irssistats (0.61-1) unstable; urgency=low - - * New upstream version. - - -- Antoine Jacquet Wed, 5 Apr 2004 02:11:20 +0100 - -irssistats (0.6-1) unstable; urgency=low - - * Initial Release. - - -- Antoine Jacquet Wed, 24 Mar 2004 16:44:17 +0100 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/control b/debian/control deleted file mode 100644 index f0b9a7f..0000000 --- a/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: irssistats -Section: net -Priority: optional -Maintainer: Antoine Jacquet -Build-Depends: debhelper (>= 4.0.0) -Standards-Version: 3.6.1 - -Package: irssistats -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: irssi-text -Description: This tool generates HTML IRC stats based on irssi logs - irssistats is a tool that make HTML stats from irssi logfiles. - The statistics generated display many useful and funny informations about - the channel. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 83cb943..0000000 --- a/debian/copyright +++ /dev/null @@ -1,16 +0,0 @@ -This package was debianized by Antoine Jacquet on -Wed, 24 Mar 2004 16:44:17 +0100. - -It was downloaded from: http://royale.zerezo.com/irssistats/ - -Upstream Author: Antoine Jacquet - -Copyright (C) 2002-2004 Antoine Jacquet - -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 2 of the License, or -(at your option) any later version. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e6bf5c3..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README sample.nickfile sample.configfile diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 7b26878..0000000 --- a/debian/rules +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - - - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #/usr/bin/docbook-to-man debian/irssistats.sgml > irssistats.1 - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/irssistats. - $(MAKE) install PRE=$(CURDIR)/debian/irssistats/usr - rm $(CURDIR)/debian/irssistats/usr/share/doc/irssistats/COPYING - - -# 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_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/irssistats.c b/irssistats.c index 4e637a5..6547005 100644 --- a/irssistats.c +++ b/irssistats.c @@ -1,5 +1,5 @@ /* - * irssistats version 0.70 + * irssistats version 0.71 * * This tool generates IRC stats based on irssi logs. * Usage: irssistats [/path/to/file.conf] @@ -48,7 +48,7 @@ #define MINWORDLENGTH 5 /* irssistats */ -#define VERSION "0.70" +#define VERSION "0.71" #define URL "http://royale.zerezo.com/irssistats/" /* Counters */ diff --git a/rpm/irssistats.spec b/rpm/irssistats.spec deleted file mode 100644 index a5ab832..0000000 --- a/rpm/irssistats.spec +++ /dev/null @@ -1,31 +0,0 @@ -Name: irssistats -Summary: This tool generates HTML IRC stats based on irssi logs -Version: 0.70 -Release: 1 -Source: http://royale.zerezo.com/%{name}/%{name}-%{version}.tar.gz -Group: Applications/Multimedia -License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -irssistats is a tool that make HTML stats from irssi logfiles. -The statistics generated display many useful and funny informations about -the channel. - -%prep -%setup -q - -%build -make - -%install -make install PRE=$RPM_BUILD_ROOT/usr - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,0755) -%doc COPYING README -%{_bindir}/irssistats -%{_mandir}/man1/irssistats.1.gz -- 2.20.1