From 38980d9c2e1e9756e40518c194e60fd7782e76c1 Mon Sep 17 00:00:00 2001 From: octo Date: Sat, 23 Apr 2005 08:37:59 +0000 Subject: [PATCH] Fixes in the packaging stuff. --- CHANGELOG | 8 ++++-- contrib/systemwide-patch/systemwide-patch.diff | 39 +++++--------------------- debian/changelog | 9 +++++- debian/dirs | 1 - onis | 4 +-- onis.spec | 10 ++++++- 6 files changed, 32 insertions(+), 39 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e2e36f3..35d2276 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,11 +2,15 @@ ================== http://verplant.org/onis/ - 0.8.1 - - ========= + 0.8.1 - Bugfixing and other corrections + ========================================= - Ignoring users (using the special user-name ``ignore'') has been fixed. - A manpage for onis has been written. It can be generated out of the ``onis'' file using pod2man. + - All bars now use relative scaling, i.e. the stylesheets have more control + about their size. + - Packaging information for RPM-based distributions and Debian have been + added. diff --git a/contrib/systemwide-patch/systemwide-patch.diff b/contrib/systemwide-patch/systemwide-patch.diff index 31134e9..fa12929 100644 --- a/contrib/systemwide-patch/systemwide-patch.diff +++ b/contrib/systemwide-patch/systemwide-patch.diff @@ -1,30 +1,6 @@ -diff -ur trunk/lib/Onis/Data/Persistent/Dbm.pm systemwide-patch/lib/Onis/Data/Persistent/Dbm.pm ---- trunk/lib/Onis/Data/Persistent/Dbm.pm 2005-04-17 17:07:05.000000000 +0200 -+++ systemwide-patch/lib/Onis/Data/Persistent/Dbm.pm 2005-04-17 17:08:27.000000000 +0200 -@@ -35,7 +35,7 @@ - - =cut - --our $DBMDirectory = get_config ('storage_dir') || 'var'; -+our $DBMDirectory = get_config ('storage_dir') || '/var/lib/onis/'; - $DBMDirectory =~ s#/$##g; - - if (!$DBMDirectory or !-d $DBMDirectory) -diff -ur trunk/lib/Onis/Data/Persistent/Storable.pm systemwide-patch/lib/Onis/Data/Persistent/Storable.pm ---- trunk/lib/Onis/Data/Persistent/Storable.pm 2005-04-17 17:07:05.000000000 +0200 -+++ systemwide-patch/lib/Onis/Data/Persistent/Storable.pm 2005-04-17 17:08:16.000000000 +0200 -@@ -39,7 +39,7 @@ - =cut - - our $StorageFile = get_config ('storage_file') || 'storage.dat'; --our $StorageDir = get_config ('storage_dir') || 'var'; -+our $StorageDir = get_config ('storage_dir') || '/var/lib/onis/'; - - $StorageDir =~ s#/+$##; - diff -ur trunk/onis systemwide-patch/onis ---- trunk/onis 2005-04-17 17:07:05.000000000 +0200 -+++ systemwide-patch/onis 2005-04-17 17:07:29.000000000 +0200 +--- trunk/onis 2005-04-23 10:33:14.000000000 +0200 ++++ systemwide-patch/onis 2005-04-23 10:33:48.000000000 +0200 @@ -15,10 +15,6 @@ BEGIN @@ -36,8 +12,8 @@ diff -ur trunk/onis systemwide-patch/onis # 0x0010 Language (make not-translated lines red/yellow) # 0x0020 Parser (dropped lines) # 0x0040 Parser (time information) -@@ -54,13 +50,13 @@ - print STDERR $/, __FILE__, ': $Id: onis 88 2005-04-17 14:52:48Z octo $' if ($::DEBUG); +@@ -72,13 +68,13 @@ + print STDERR $/, __FILE__, ': $Id: onis 103 2005-04-23 08:17:50Z octo $' if ($::DEBUG); parse_argv (@ARGV); -read_config (get_config ('config') ? get_config ('config') : 'onis.conf'); @@ -53,14 +29,14 @@ diff -ur trunk/onis systemwide-patch/onis foreach ('Core', get_config ('plugin')) diff -ur trunk/onis.conf systemwide-patch/onis.conf ---- trunk/onis.conf 2005-04-17 17:07:05.000000000 +0200 -+++ systemwide-patch/onis.conf 2005-04-17 17:07:29.000000000 +0200 +--- trunk/onis.conf 2005-04-23 10:33:18.000000000 +0200 ++++ systemwide-patch/onis.conf 2005-04-23 10:35:16.000000000 +0200 @@ -158,7 +158,7 @@ # Sets the directory in which the storage file(s) should be kept. This is used # by ``Dbm'' and ``Storable''. -storage_dir: "var/"; -+storage_dir: "/var/lib/onis/"; ++storage_dir: "~/.onis/data"; # @@ -76,4 +52,3 @@ diff -ur trunk/onis.conf systemwide-patch/onis.conf # english.lang german.lang norwegian.lang spanish.lang swedish.lang -language_file: "lang/english.lang"; +language_file: "/usr/share/onis/lang/english.lang"; -Only in systemwide-patch: onis.orig diff --git a/debian/changelog b/debian/changelog index a8096e4..6995638 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ +onis (0.8.0-2) unstable; urgency=low + + * Added generation of manpage. + * Applying of patch now more intelligent. + + -- Florian Forster Thu, 23 Apr 2005 10:32:28 +0100 + onis (0.8.0-1) unstable; urgency=low - * New upstream version, + * New upstream version. -- Florian Forster Thu, 17 Apr 2005 15:03:36 +0100 diff --git a/debian/dirs b/debian/dirs index 4f4aadf..b038af8 100644 --- a/debian/dirs +++ b/debian/dirs @@ -2,4 +2,3 @@ etc/onis usr/bin usr/lib/perl5 usr/share/onis/lang -var/lib/onis diff --git a/onis b/onis index 2007435..9639e63 100755 --- a/onis +++ b/onis @@ -1,12 +1,12 @@ #!/usr/bin/perl ########################################################################## -# onis 0.8.0 2005-04-17 # +# onis 0.8.1 2005-04-23 # #---=============--------------------------------------------------------# # Language: Perl # # Purpose: Generating statistics # # Input: IRC-Logfiles # # Output: One HTML file # -# Version: 0.8.0 (unstable) # +# Version: 0.8.1 (unstable) # # License: GPL # # Homepage: http://verplant.org/onis/ # # Authors: Florian octo Forster # diff --git a/onis.spec b/onis.spec index e717b40..18f6846 100644 --- a/onis.spec +++ b/onis.spec @@ -27,6 +27,9 @@ logfiles. It also features a powerful translation infrastructure. %setup patch -p1 onis.1 + %install rm -fr $RPM_BUILD_ROOT @@ -41,11 +44,13 @@ cp onis.conf users.conf $RPM_BUILD_ROOT/etc/onis/ cp -r lib/Onis $RPM_BUILD_ROOT%{perllibdir}/ cp -r themes lang $RPM_BUILD_ROOT%{_datadir}/onis/ cp -r reports/*-theme $RPM_BUILD_ROOT%{_datadir}/onis/themes/ +cp onis.1 $RPM_BUILD_ROOT%{_mandir}/man1/ chmod 0755 $RPM_BUILD_ROOT%_bindir/onis chmod -R 0644 $RPM_BUILD_ROOT/etc/onis/* chmod -R a-w $RPM_BUILD_ROOT%{perllibdir}/Onis chmod -R a-w $RPM_BUILD_ROOT%{_datadir}/onis +chmod -R a-w $RPM_BUILD_ROOT%{_mandir}/man1/onis.1 %clean rm -fr $RPM_BUILD_ROOT @@ -57,8 +62,11 @@ rm -fr $RPM_BUILD_ROOT %{_bindir}/onis %{perllibdir}/Onis %{_datadir}/onis -%dir /var/lib/onis +%{_mandir}/man1/onis.1 %changelog +* Sat Apr 23 2005 Florian Forster +- Added generation of manpage. + * Mon Apr 18 2005 Florian Forster - Initial build. -- 2.11.0