r30147 - in /branches/upstream/eekboek/current: ./ inc/ lib/ lib/EB/ lib/EB/Booking/ lib/EB/Report/Reporter/ lib/EB/Tools/ lib/EB/css/ lib/EB/examples/
joostvb at users.alioth.debian.org
joostvb at users.alioth.debian.org
Tue Jan 27 04:16:07 UTC 2009
Author: joostvb
Date: Tue Jan 27 04:16:03 2009
New Revision: 30147
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=30147
Log:
[svn-upgrade] Integrating new upstream version, eekboek (1.04.02)
Added:
branches/upstream/eekboek/current/lib/EB/examples/Kasverkoop.pm
Removed:
branches/upstream/eekboek/current/QUICKSTART
Modified:
branches/upstream/eekboek/current/Build.PL
branches/upstream/eekboek/current/CHANGES
branches/upstream/eekboek/current/EekBoek.spec
branches/upstream/eekboek/current/INSTALL
branches/upstream/eekboek/current/MANIFEST
branches/upstream/eekboek/current/META.yml
branches/upstream/eekboek/current/Makefile.PL
branches/upstream/eekboek/current/inc/build_common.pl
branches/upstream/eekboek/current/lib/EB.pm
branches/upstream/eekboek/current/lib/EB/Booking/BKM.pm
branches/upstream/eekboek/current/lib/EB/Main.pm
branches/upstream/eekboek/current/lib/EB/Report/Reporter/Csv.pm
branches/upstream/eekboek/current/lib/EB/Shell.pm
branches/upstream/eekboek/current/lib/EB/Tools/Einde.pm
branches/upstream/eekboek/current/lib/EB/css/journaal.css
branches/upstream/eekboek/current/lib/EB/examples/Userdefs.pm
branches/upstream/eekboek/current/lib/EB/examples/eekboek.conf
branches/upstream/eekboek/current/lib/EekBoek.pm
Modified: branches/upstream/eekboek/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/Build.PL?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/Build.PL (original)
+++ branches/upstream/eekboek/current/Build.PL Tue Jan 27 04:16:03 2009
@@ -2,8 +2,8 @@
# Author : Johan Vromans
# Created On : Thu Sep 1 17:28:26 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Sun Apr 27 11:54:40 2008
-# Update Count : 102
+# Last Modified On: Tue Sep 23 19:51:22 2008
+# Update Count : 115
# Status : Experimental
# Ease the life of the CPAN testers.
@@ -46,23 +46,64 @@
dist_abstract => $data->{abstract},
license => $data->{license},
requires => $data->{prereq_pm},
+ build_requires => $data->{buildreq_pm},
recommends => $data->{recomm_pm},
script_files => $data->{script_files},
pm_files => filelist("lib"),
get_options => { skipdbtests => { } },
- add_to_cleanup => [ 'pod2htm*',
- map { +"t/ivp/*.$_" }
- qw(sql log txt html csv)
- ],
+ add_to_cleanup =>
+ [ 'pod2htm*',
+ map { +"t/ivp/*.$_" } qw(sql log txt html csv)
+ ],
meta_merge =>
{ resources =>
- {
- homepage => 'http://www.eekboek.nl',
- MailingList => 'http://lists.sourceforge.net/lists/listinfo/eekboek',
- }
+ { homepage => 'http://www.eekboek.nl',
+ MailingList => 'http://lists.sourceforge.net/lists/listinfo/eekboek',
+ }
},
meta_add => {
- no_index => { directory => [ qw(inc) ] },
+ no_index => { directory => [ qw(inc lib) ] },
+ provides => {
+ 'EekBoek' =>
+ { file => "lib/EekBoek.pm",
+ version => "1.04.00_01",
+ },
+ },
+ },
+ );
+
+# Rerun to get the version right for provides => EeoBoek.
+$build = $class->new
+ (
+ module_name => $data->{distname},
+ dist_name => $data->{distname},
+ dist_author => $data->{author},
+ dist_abstract => $data->{abstract},
+ license => $data->{license},
+ requires => $data->{prereq_pm},
+ build_requires => $data->{buildreq_pm},
+ recommends => $data->{recomm_pm},
+ script_files => $data->{script_files},
+ pm_files => filelist("lib"),
+ get_options => { skipdbtests => { } },
+ add_to_cleanup =>
+ [ 'pod2htm*',
+ map { +"t/ivp/*.$_" } qw(sql log txt html csv)
+ ],
+ meta_merge =>
+ { resources =>
+ { homepage => 'http://www.eekboek.nl',
+ MailingList => 'http://lists.sourceforge.net/lists/listinfo/eekboek',
+ }
+ },
+ meta_add => {
+ no_index => { directory => [ qw(inc lib) ] },
+ provides => {
+ 'EekBoek' =>
+ { file => "lib/EekBoek.pm",
+ version => $build->dist_version,
+ },
+ },
},
);
Modified: branches/upstream/eekboek/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/CHANGES?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/CHANGES (original)
+++ branches/upstream/eekboek/current/CHANGES Tue Jan 27 04:16:03 2009
@@ -1,3 +1,17 @@
+??????
+
+ * Nieuwe voorbeeldmodule voor userdefs: examples/Kasveroop.pm .
+
+ * bkm_multi: Fix probleem dat de intern aangemaakte boekingen
+ worden geformatteerd volgens thousandsep, wat ongeldige
+ invoer kan opleveren.
+
+ * Fix bug 2172095.
+
+1.04.01 2008-09-04
+
+ * Fix probleem met Windows Vista.
+
1.04 2008-08-30
* Versienummer aangepast.
Modified: branches/upstream/eekboek/current/EekBoek.spec
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/EekBoek.spec?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/EekBoek.spec (original)
+++ branches/upstream/eekboek/current/EekBoek.spec Tue Jan 27 04:16:03 2009
@@ -5,9 +5,9 @@
# Package name, lowcase (eekboek)
%define lcname eekboek
# Package version
-%define pkgversion 1.04
+%define pkgversion 1.04.02
# Suffix (-unstable, or empty)
-%define pkgsuffix
+%define pkgsuffix %nil
################ Build Options ################
%define gui 0
@@ -139,7 +139,7 @@
cat <<EOD > .files
%defattr(-,root,root)
-%doc CHANGES README INSTALL QUICKSTART examples doc/html TODO
+%doc CHANGES README INSTALL examples doc/html TODO
%dir %{_sysconfdir}/%{lcname}
%config(noreplace) %{_sysconfdir}/%{lcname}/%{lcname}.conf
%dir %{ebshare}
@@ -196,6 +196,8 @@
%post
%changelog
+* Sun Jan 26 2009 Johan Vromans <jvromans at squirrel.nl> - 1.04.02
+- Remove QUICKSTART.
* Sat Jul 19 2008 Johan Vromans <jvromans at squirrel.nl> - 1.03.90
- Remove debian stuff
- Don't use unstable.
Modified: branches/upstream/eekboek/current/INSTALL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/INSTALL?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/INSTALL (original)
+++ branches/upstream/eekboek/current/INSTALL Tue Jan 27 04:16:03 2009
@@ -1,158 +1,9 @@
Installatie Eekboek Boekhoudpakket (command line versie)
========================================================
-Let op: Dit document gebruikt de ISO-8859.1 (Latin1) tekenset.
-Niet-ASCII tekens worden alleen juist getoond indien je programma op
-deze tekenset is ingesteld.
+U vindt de installatie-instructies op de web site:
-DIT DOCUMENT IS INDICATIEF. DE ACTUELE INFORMATIE VINDT U OP
-http://www.eekboek.nl/docs/ .
-
-Benodigdheden
--------------
-
-Perl5.8.x met DBI (zit standaard in Perl)
-
-Eén van:
- PostgreSQL (zit standaard in de meeste Linux systemen)
- SQLite (zit standaard in de meeste Linux systemen)
-
-Perl modules (zelf te installeren):
- DBD::Pg 1.41 of later
- DBD::SQLite 1.13 of later
-
-De volgende Perl modules zijn optioneel, maar worden sterk aangeraden
-vanwege de extra functionaliteit:
-
- Term::ReadLine::Gnu
- Archive::Zip
- HTML::Entities 1.32 of later
-
-Installeren (RPM systemen)
---------------------------
-
-Installeer, indien nodig, de GPG key:
-
- $ sudo rpm --import http://www.eekboek.nl/fedora/RPM-PGP-KEY-EekBoek
-
-Download de EekBoek-x.yy-z.noarch.rpm.
-Verifieer de kit:
-
- $ rpm -K EekBoek-x.yy-z.noarch.rpm
-
-Let op dat alle verificaties, inclusief gpg, OK zijn.
-Installeer:
-
- $ sudo rpm -Uvh EekBoek-x.yy-z.noarch.rpm
-
-Installeren (Debian systemen)
------------------------------
-
-Download de EekBoek-x.yy-z.noarch.rpm.
-
-Installeer alien, indien nodig:
-
- $ sudo apt-get install alien
-
-Dan:
-
- $ sudo alien -di EekBoek-x.yy-z.noarch.rpm
-
-De -d staat voor "maak een deb aan".
-De -i staat voor "installeer hem en verwijder de deb".
-
-Installeren (Windows systemen)
-------------------------------
-
-Zie README.WINDOWS.
-
-Bouwen, verifiëren en installeren vanaf source
-----------------------------------------------
-
-Voor het bouwen en installeren wordt gebruik gemaakt van het
-Module::Build framework. Deze wordt vooralsnog met de kit meegeleverd
-en hoeft niet afzonderlijk te worden geïnstalleerd.
-BOUW NOOIT ALS ROOT!
-
-Pak de kit uit en cd naar de uitpakdirectory.
-
- $ tar -zxf EekBoek-x.yy.tar.gz
- $ cd EekBoek-x.yy
- $ perl Build.PL
- $ ./Build
-
-Het verifiëren vereist generieke toegang tot een draaiende PostgreSQL
-database server, alsmede de mogelijkheid om een database met de naam
-'eekboek_sample' aan te maken of te gebruiken. Indien nodig kunnen
-daartoe de environment variabelen PGHOST PGPORT en PGUSER worden
-toegepast; zie de PostgreSQL documentatie.
-
- $ ./Build test
-
-Als het niet mogelijk is de database server te benaderen, gebruik dan
-
- $ ./Build test --skipdbtests
-
-Zonder een succesvolle afronding van de testprocedure inclusief
-database tests heeft het echter weinig zin om verder te gaan.
-Raadpleeg in dat geval de .log files en eventueel de mailing list (zie
-verderop).
-
-Het is niet nodig om EekBoek te installeren om het te kunnen
-gebruiken. Het is dan wel noodzakelijk om de environment variabelen
-PERL5LIB en PATH op de juiste wijze op te zetten:
-
- $ PERL5LIB=<eekboekdir>/blib/lib:$PERL5LIB; export PERL5LIB
- $ PATH=<eekboekdir>/blib/script:$PATH; export PATH
-
-Hierin is <eekboekdir> de plaats waar eerder de make all en make test
-is uitgevoerd.
-
-Wil je installeren:
-
- $ sudo perl Build install
-
-Installatie verwijderen:
-
- Zoek uit waar de spullen zijn neergezet onder /usr/lib/perl5.
- De gehele directory EB kun je weghalen, evenals EekBoek.pm, EB.pm
- en het programma /usr/bin/ebshell.
-
-Aantekeningen
--------------
-
-* Liefhebbers van RPM kunnen de meeegeleverde EekBoek.spec file
- gebruiken, of een .src.rpm downloaden van de SourceForge site,
- http://sourceforge.net/project/showfiles.php?group_id=154512 .
-
- Bij het bouwen vanuit de RPM worden de database tests standaard niet
- uitgevoerd. Om ze toch uit te voeren, gebruik
-
- $ rpmbuild ... --with dbtests ...
-
-* Om EekBoek te kunnen gebruiken met PostgreSQL moet je de beschikking
- hebben over een operationele PostgreSQL database server en een
- database. EekBoek kan deze database voor je aanmaken, maar dan moet
- je daartoe bevoegd zijn. Dat kun je bereiken met (veronderstel dat
- je user 'piet' bent):
-
- $ su
- # su - postgres
- # createuser -d piet
- # exit
- $ exit
-
- Raadpleeg anders je systeembeheerder.
-
- Als je die bevoegdheid niet hebt, vraag dan de systeembeheerder om
- een database voor je aan te maken. De naam van de database moet
- beginnen met "eekboek_", bv. "eekboek_myadmin".
-
-* Voor het uitwisselen van ervaringen, vragen om ondersteuning en zo:
- gebruik de mailing list
- http://lists.sourceforge.net/lists/listinfo/eekboek-users .
-
-ZIE OOK DE ON-LINE DOCUMENTATIE http://www.eekboek.nl/docs/ .
+ http://www.eekboek.nl/docs/install/index.html
----------------------------------------------------------------------------
Johan Vromans jvromans at squirrel.nl
Modified: branches/upstream/eekboek/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/MANIFEST?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/MANIFEST (original)
+++ branches/upstream/eekboek/current/MANIFEST Tue Jan 27 04:16:03 2009
@@ -6,7 +6,6 @@
MANIFEST
META.yml
Makefile.PL
-QUICKSTART
README
TODO
contrib/afschr.pl
@@ -163,6 +162,7 @@
lib/EB/css/proef.css
lib/EB/css/result.css
lib/EB/examples/README
+lib/EB/examples/Kasverkoop.pm
lib/EB/examples/Userdefs.pm
lib/EB/examples/bvnv.dat
lib/EB/examples/eekboek.conf
Modified: branches/upstream/eekboek/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/META.yml?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/META.yml (original)
+++ branches/upstream/eekboek/current/META.yml Tue Jan 27 04:16:03 2009
@@ -1,6 +1,6 @@
---
name: EekBoek
-version: 1.04
+version: 1.04.02
author:
- Johan Vromans (jvromans at squirrel.nl)
abstract: Elementary Bookkeeping (for the Dutch/European market)
@@ -12,10 +12,11 @@
requires:
DBI: 1.40
Getopt::Long: 2.13
+ Term::ReadLine: 0
+ Term::ReadLine::Gnu: 0
+build_requires:
IPC::Run3: 0.034
Module::Build: 0.26
- Term::ReadLine: 0
- Term::ReadLine::Gnu: 0
recommends:
Archive::Zip: 1.16
DBD::Pg: 1.41
@@ -23,205 +24,9 @@
Getopt::Long: 2.32
HTML::Entities: 1.35
provides:
- EB:
- file: lib/EB.pm
- version: 1.086
- EB::Assert:
- file: lib/EB/Assert.pm
- version: 0.20
- EB::Booking:
- file: lib/EB/Booking.pm
- version: 1.021
- EB::Booking::BKM:
- file: lib/EB/Booking/BKM.pm
- version: 1.070
- EB::Booking::Decode:
- file: lib/EB/Booking/Decode.pm
- version: 1.025
- EB::Booking::Delete:
- file: lib/EB/Booking/Delete.pm
- version: 1.013
- EB::Booking::IV:
- file: lib/EB/Booking/IV.pm
- version: 1.054
- EB::Config:
- file: lib/EB/Config.pm
- version: 1.017
- EB::Config::IniFiles:
- file: lib/EB/Config/IniFiles.pm
- version: 2.38
- EB::Config::IniFiles::Wrapper:
- file: lib/EB/Config.pm
- EB::DB:
- file: lib/EB/DB.pm
- version: 1.059
- EB::DB::Postgres:
- file: lib/EB/DB/Postgres.pm
- version: 1.025
- EB::DB::Sqlite:
- file: lib/EB/DB/Sqlite.pm
- version: 1.008
- EB::DatabaseMigrator:
- file: lib/EB/migrate/001000008001000009.pl
- EB::Export:
- file: lib/EB/Export.pm
- version: 1.029
- EB::Export::XAF:
- file: lib/EB/Export/XAF.pm
- version: 1.002
- EB::Expression:
- file: lib/EB/Expression.pm
- EB::Format:
- file: lib/EB/Format.pm
- version: 1.037
- EB::Globals:
- file: lib/EB/Globals.pm
- version: 1.030
- EB::Import:
- file: lib/EB/Import.pm
- version: 1.010
- EB::Locale:
- file: lib/EB/Locale.pm
- version: 1.012
- EB::Main:
- file: lib/EB/Main.pm
- version: 1.002
- EB::Relation:
- file: lib/EB/Relation.pm
- version: 1.019
- EB::Report:
- file: lib/EB/Report.pm
- version: 1.007
- EB::Report::BTWAangifte:
- file: lib/EB/Report/BTWAangifte.pm
- version: 1.048
- EB::Report::BTWAangifte::Csv:
- file: lib/EB/Report/BTWAangifte.pm
- EB::Report::BTWAangifte::Html:
- file: lib/EB/Report/BTWAangifte.pm
- EB::Report::BTWAangifte::Text:
- file: lib/EB/Report/BTWAangifte.pm
- EB::Report::BTWAangifte::Wxhtml:
- file: lib/EB/Report/BTWAangifte/Wxhtml.pm
- version: 1.003
- EB::Report::Balres:
- file: lib/EB/Report/Balres.pm
- version: 1.026
- EB::Report::Balres::Csv:
- file: lib/EB/Report/Balres.pm
- EB::Report::Balres::Html:
- file: lib/EB/Report/Balres.pm
- EB::Report::Balres::Text:
- file: lib/EB/Report/Balres.pm
- EB::Report::Balres::Wxhtml:
- file: lib/EB/Report/Balres/Wxhtml.pm
- version: 1.003
- EB::Report::Debcrd:
- file: lib/EB/Report/Debcrd.pm
- version: 1.017
- EB::Report::Debcrd::Csv:
- file: lib/EB/Report/Debcrd.pm
- EB::Report::Debcrd::Html:
- file: lib/EB/Report/Debcrd.pm
- EB::Report::Debcrd::Text:
- file: lib/EB/Report/Debcrd.pm
- EB::Report::Debcrd::Wxhtml:
- file: lib/EB/Report/Debcrd/Wxhtml.pm
- version: 1.003
- EB::Report::GenBase:
- file: lib/EB/Report/GenBase.pm
- version: 1.028
- EB::Report::Grootboek:
- file: lib/EB/Report/Grootboek.pm
- version: 1.033
- EB::Report::Grootboek::Csv:
- file: lib/EB/Report/Grootboek.pm
- EB::Report::Grootboek::Html:
- file: lib/EB/Report/Grootboek.pm
- EB::Report::Grootboek::Text:
- file: lib/EB/Report/Grootboek.pm
- EB::Report::Grootboek::Wxhtml:
- file: lib/EB/Report/Grootboek/Wxhtml.pm
- EB::Report::Journal:
- file: lib/EB/Report/Journal.pm
- version: 1.038
- EB::Report::Journal::Csv:
- file: lib/EB/Report/Journal.pm
- EB::Report::Journal::Html:
- file: lib/EB/Report/Journal.pm
- EB::Report::Journal::Text:
- file: lib/EB/Report/Journal.pm
- EB::Report::Journal::Wxhtml:
- file: lib/EB/Report/Journal/Wxhtml.pm
- version: 1.003
- EB::Report::Open:
- file: lib/EB/Report/Open.pm
- version: 1.021
- EB::Report::Open::Csv:
- file: lib/EB/Report/Open.pm
- EB::Report::Open::Html:
- file: lib/EB/Report/Open.pm
- EB::Report::Open::Text:
- file: lib/EB/Report/Open.pm
- EB::Report::Open::Wxhtml:
- file: lib/EB/Report/Open/Wxhtml.pm
- EB::Report::Proof:
- file: lib/EB/Report/Proof.pm
- version: 1.019
- EB::Report::Proof::Csv:
- file: lib/EB/Report/Proof.pm
- EB::Report::Proof::Html:
- file: lib/EB/Report/Proof.pm
- EB::Report::Proof::Text:
- file: lib/EB/Report/Proof.pm
- EB::Report::Proof::Wxhtml:
- file: lib/EB/Report/Proof/Wxhtml.pm
- version: 1.003
- EB::Report::Reporter:
- file: lib/EB/Report/Reporter.pm
- version: 1.016
- EB::Report::Reporter::Csv:
- file: lib/EB/Report/Reporter/Csv.pm
- version: 1.006
- EB::Report::Reporter::Html:
- file: lib/EB/Report/Reporter/Html.pm
- version: 1.017
- EB::Report::Reporter::Text:
- file: lib/EB/Report/Reporter/Text.pm
- version: 1.008
- EB::Report::Reporter::WxHtml:
- file: lib/EB/Report/Reporter/WxHtml.pm
- version: 1.008
- EB::Shell:
- file: lib/EB/Shell.pm
- version: 1.109
- EB::Shell::Base:
- file: lib/EB/Shell/Base.pm
- version: 1.021
- EB::Shell::DeLuxe:
- file: lib/EB/Shell/DeLuxe.pm
- version: 1.019
- EB::Shell::Userdefs:
- file: lib/EB/examples/Userdefs.pm
- version: 1.003
- EB::Tools::Einde:
- file: lib/EB/Tools/Einde.pm
- version: 1.016
- EB::Tools::Opening:
- file: lib/EB/Tools/Opening.pm
- version: 1.041
- EB::Tools::SQLEngine:
- file: lib/EB/Tools/SQLEngine.pm
- version: 1.009
- EB::Tools::Schema:
- file: lib/EB/Tools/Schema.pm
- version: 1.057
- EB::Utils:
- file: lib/EB/Utils.pm
- version: 1.008
EekBoek:
file: lib/EekBoek.pm
- version: 1.04
+ version: 1.04.02
generated_by: Module::Build version 0.28
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
@@ -229,3 +34,4 @@
no_index:
directory:
- inc
+ - lib
Modified: branches/upstream/eekboek/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/Makefile.PL?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/Makefile.PL (original)
+++ branches/upstream/eekboek/current/Makefile.PL Tue Jan 27 04:16:03 2009
@@ -3,8 +3,8 @@
# Author : Johan Vromans
# Created On : Fri Sep 2 14:25:11 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Sun Apr 27 11:54:15 2008
-# Update Count : 100
+# Last Modified On: Tue Sep 9 15:23:47 2008
+# Update Count : 102
# Status : Unknown, Use with caution!
# Ease the life of the CPAN testers.
@@ -40,7 +40,7 @@
EXE_FILES => $data->{script_files},
VERSION_FROM => "lib/EekBoek.pm",
PREREQ_PM => { %{$data->{prereq_pm}},
- 'IPC::Run3' => 0,
+ %{$data->{buildreq_pm}},
},
PM => filelist("lib", '$(INST_LIBDIR)/'),
);
Modified: branches/upstream/eekboek/current/inc/build_common.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/inc/build_common.pl?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/inc/build_common.pl (original)
+++ branches/upstream/eekboek/current/inc/build_common.pl Tue Jan 27 04:16:03 2009
@@ -1,10 +1,10 @@
# build_common.inc -- Build file common info -*- perl -*-
-# RCS Info : $Id: build_common.pl,v 1.19 2008/07/19 16:28:17 jv Exp $
+# RCS Info : $Id: build_common.pl,v 1.20 2008/09/09 19:11:32 jv Exp $
# Author : Johan Vromans
# Created On : Thu Sep 1 17:28:26 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Sat Jul 19 18:27:56 2008
-# Update Count : 91
+# Last Modified On: Sun Jan 25 21:02:53 2009
+# Update Count : 93
# Status : Unknown, Use with caution!
use strict;
@@ -29,11 +29,9 @@
'Term::ReadLine' => 0,
$^O eq "linux" ? ('Term::ReadLine::Gnu' => 0) : (),
'DBI' => '1.40',
-# 'Config::IniFiles' => '2.38',
-# 'Text::CSV_XS' => 0,
-# 'Locale::gettext' => '1.05',
- #
- # These are required for the build/test, and will be included.
+ },
+ buildreq_pm =>
+ { # These are required for the build/test, and will be included.
'Module::Build' => '0.26',
'IPC::Run3' => '0.034',
},
@@ -111,7 +109,7 @@
( PkgName => $name,
pkgname => lc($name),
version => $version,
- stable => $mv % 2 ? "-unstable" : "",
+ stable => $mv % 2 ? "-unstable" : "\%nil",
stability => $mv % 2 ? "unstable" : "stable",
);
Modified: branches/upstream/eekboek/current/lib/EB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB.pm (original)
+++ branches/upstream/eekboek/current/lib/EB.pm Tue Jan 27 04:16:03 2009
@@ -5,8 +5,8 @@
# Author : Johan Vromans
# Created On : Fri Sep 16 18:38:45 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Sat Mar 22 16:45:55 2008
-# Update Count : 219
+# Last Modified On: Mon Oct 6 14:50:32 2008
+# Update Count : 221
# Status : Unknown, Use with caution!
package main;
@@ -109,7 +109,9 @@
my ($id, $major) = @a[4,1];
die unless defined $id;
warn(_T("EekBoek is VRIJE software, ontwikkeld om vrij over uw eigen gegevens te kunnen beschikken.")."\n");
- if ( $id <= 1 || ( $id == 2 && $major <= 5) || $id >= 3 ) {
+ if ( $cfg->val(qw(security override_security_for_vista), 0)
+ or
+ ( $id <= 1 || ( $id == 2 && $major <= 5) || $id >= 3 ) ) {
warn(_T("Met uw keuze voor het Microsoft Windows besturingssysteem geeft u echter alle vrijheden weer uit handen. Dat is erg triest.")."\n");
}
else {
Modified: branches/upstream/eekboek/current/lib/EB/Booking/BKM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Booking/BKM.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Booking/BKM.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Booking/BKM.pm Tue Jan 27 04:16:03 2009
@@ -7,12 +7,12 @@
package EB::Booking::BKM;
-# RCS Id : $Id: BKM.pm,v 1.70 2008/04/09 21:01:26 jv Exp $
+# RCS Id : $Id: BKM.pm,v 1.71 2008/11/11 14:06:59 jv Exp $
# Author : Johan Vromans
# Created On : Thu Jul 7 14:50:41 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Thu Apr 3 21:36:33 2008
-# Update Count : 517
+# Last Modified On: Tue Nov 11 14:03:22 2008
+# Update Count : 518
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -20,7 +20,7 @@
use strict;
use warnings;
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.70 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.71 $ =~ /(\d+)/g;
# Dagboek type 3: Bank
# Dagboek type 4: Kas
@@ -391,7 +391,7 @@
foreach ( @{$k[0]} ) {
push(@t, numfmt($amts[$_]));
# Push back the data in the input queue.
- unshift(@$args, $type, $dd, $rel, $t[-1]);
+ unshift(@$args, $type, $dd, $rel, numfmt_plain($amts[$_]));
}
# Inform the user.
my $t = shift(@t);
Modified: branches/upstream/eekboek/current/lib/EB/Main.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Main.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Main.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Main.pm Tue Jan 27 04:16:03 2009
@@ -4,8 +4,8 @@
# Author : Johan Vromans
# Created On : Thu Jul 7 15:53:48 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Thu Feb 7 14:59:14 2008
-# Update Count : 898
+# Last Modified On: Tue Dec 30 19:30:06 2008
+# Update Count : 905
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -38,6 +38,7 @@
my $dataset;
my $createdb; # create database
my $createsampledb; # create demo database
+my $createsampleconfig; # create config
my $schema; # initialise w/ schema
my $confirm = 0;
my $journal;
@@ -120,6 +121,31 @@
push(@ARGV, "--file", $inex_file) if defined $inex_file;
push(@ARGV, "--dir", $inex_dir) if defined $inex_dir;
}
+ }
+
+ if ( $createsampleconfig ) {
+ $command = 1;
+ my $cfg = ".".lc($EekBoek::PACKAGE).".conf";
+ if ( -f $cfg ) {
+ die("?".__x("Opdracht geweigerd, {conf} bestaat reeds",
+ conf => $cfg)."\n");
+ }
+ my $file = findlib("schema/sample.conf");
+ die("?".__x("Geen voorbeeldgegevens: {conf}",
+ conf => "schema/sample.conf")."\n") unless $file;
+ open(my $f, '<', $file)
+ or die("?".__x("Fout bij openen {file}: {err}",
+ file => $file, err => "$!")."\n");
+ my @data = map { s/[\n\r]+\Z//; $_ } <$f>;
+ close($f);
+ $f = undef;
+ open($f, '>', $cfg)
+ or die("?".__x("Fout bij openen {file}: {err}",
+ file => $cfg, err => "$!")."\n");
+ print { $f } "$_\n" foreach @data;
+ close($f)
+ or die("?".__x("Fout bij afsluiten {file}: {err}",
+ file => $cfg, err => "$!")."\n");
}
if ( $createsampledb ) {
@@ -224,6 +250,7 @@
},
'createdb' => \$createdb,
'createsampledb' => \$createsampledb,
+ 'createsampleconfig' => \$createsampleconfig,
'define|D=s%' => sub {
die(__x("Ongeldige aanduiding voor config setting: {arg}",
arg => $_[1])."\n");
Modified: branches/upstream/eekboek/current/lib/EB/Report/Reporter/Csv.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Report/Reporter/Csv.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Report/Reporter/Csv.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Report/Reporter/Csv.pm Tue Jan 27 04:16:03 2009
@@ -1,12 +1,12 @@
#! perl
# Csv.pm -- Reporter backend for CSV reports.
-# RCS Info : $Id: Csv.pm,v 1.6 2008/03/06 12:58:06 jv Exp $
+# RCS Info : $Id: Csv.pm,v 1.7 2009/01/22 21:30:05 jv Exp $
# Author : Johan Vromans
# Created On : Thu Jan 5 18:47:37 2006
# Last Modified By: Johan Vromans
-# Last Modified On: Thu Mar 6 13:52:34 2008
-# Update Count : 14
+# Last Modified On: Thu Jan 22 22:28:51 2009
+# Update Count : 15
# Status : Unknown, Use with caution!
package main;
@@ -19,7 +19,7 @@
use strict;
use warnings;
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.6 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.7 $ =~ /(\d+)/g;
use EB;
@@ -84,7 +84,7 @@
$value =~ s/"/""/g;
# Quote if anything non-simple.
$value = '"' . $value . '"'
- if $value =~ /\s|$sep|"/
+ if $value =~ /\s|\Q$sep\E|"/
|| $value !~ /^[+-]?\d+([.,]\d+)?/;
return $value;
Modified: branches/upstream/eekboek/current/lib/EB/Shell.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Shell.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Shell.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Shell.pm Tue Jan 27 04:16:03 2009
@@ -746,6 +746,7 @@
--noreport Geen rapportage. Dit is enkel zinvol samen
met --definitief om de afgesloten BTW periode
aan te passen.
+ --noround Alle bedragen zonder af te ronden.
Zie verder "help rapporten" voor algemene informatie over aan te maken
rapporten.
Modified: branches/upstream/eekboek/current/lib/EB/Tools/Einde.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Tools/Einde.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Tools/Einde.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Tools/Einde.pm Tue Jan 27 04:16:03 2009
@@ -5,8 +5,8 @@
# Author : Johan Vromans
# Created On : Sun Oct 16 21:27:40 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Thu Feb 7 13:30:02 2008
-# Update Count : 224
+# Last Modified On: Fri Oct 17 00:03:36 2008
+# Update Count : 225
# Status : Unknown, Use with caution!
package main;
@@ -54,7 +54,11 @@
my $def = $opts->{definitief};
my $eb;
if ( $opts->{eb} ) {
- open($eb, '>', $opts->{eb});
+ unless ( open($eb, '>', $opts->{eb}) ) {
+ warn("?", __x("Fout tijdens het aanmaken van bestand {file}: {err}",
+ file => $opts->{eb}, err => $!."")."\n");
+ return;
+ }
$opts->{eb_handle} = $eb;
}
Modified: branches/upstream/eekboek/current/lib/EB/css/journaal.css
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/css/journaal.css?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/css/journaal.css (original)
+++ branches/upstream/eekboek/current/lib/EB/css/journaal.css Tue Jan 27 04:16:03 2009
@@ -46,6 +46,14 @@
tr { vertical-align: top }
.r_head {
+ color: #0000FF;
+ border-top: thin solid #000000;
+}
+.r_chead {
+ color: #0000FF;
+ border-top: thin solid #000000;
+}
+.r_dhead {
color: #0000FF;
border-top: thin solid #000000;
}
Added: branches/upstream/eekboek/current/lib/EB/examples/Kasverkoop.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/examples/Kasverkoop.pm?rev=30147&op=file
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/examples/Kasverkoop.pm (added)
+++ branches/upstream/eekboek/current/lib/EB/examples/Kasverkoop.pm Tue Jan 27 04:16:03 2009
@@ -1,0 +1,105 @@
+#! perl
+
+# RCS Info : $Id: Kasverkoop.pm,v 1.1 2008/12/30 11:56:14 jv Exp $
+# Author : Johan Vromans
+# Created On : Tue Dec 30 11:56:22 2008
+# Last Modified By: Johan Vromans
+# Last Modified On: Tue Dec 30 15:57:06 2008
+# Update Count : 23
+# Status : Unknown, Use with caution!
+
+# Om deze module te gebruiken dient deze te worden geplaatst in de
+# werk-directory. Vervolgens moet aan .eekboek.conf de volgende sectie
+# worden toegevoegd:
+#
+# [shell]
+# userdefs = Kasverkoop
+#
+# De naam achter userdefs moet uiteraard dezelfde zijn als die
+# waaronder de module is opgeslagen, zonder de ".pm" extensie.
+
+package EB::Shell::Kasverkoop;
+
+use strict;
+use warnings;
+
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.3 $ =~ /(\d+)/g;
+
+use EB;
+
+# Implementatie opdracht "kasverkoop".
+#
+# kasverkoop datum debiteur omschrijving bedrag
+#
+# Dit wordt omgezet in twee opdrachten:
+#
+# verkoop datum Kasboeking debiteur omschrijving bedrag
+# kas datum omschrijving deb debiteur bedrag
+
+sub EB::Shell::do_kasverkoop {
+ my ($self, @args) = @_;
+
+ # Controleer argumenten. "--nr=.." is een intern doorgegeven
+ # argument wanneer de vorm "kasverkoop:boekstuknummer" wordt
+ # gebruikt.
+ my $bsknr;
+ if ( @args && $args[0] =~ /^--?nr=(.+)/ ) {
+ $bsknr = $1;
+ shift(@args);
+ }
+
+ my $datum;
+ if ( @args && $args[0] =~/^\d+-\d+(-\d+)?$/ ) {
+ $datum = shift(@args);
+ }
+ else {
+ $datum = iso8601date();
+ }
+
+ # Nu moeten nog drie argumenten overblijven.
+ die("Onvoldoende argumenten. Nodig: [ datum ] debiteur omschrijving bedrag\n")
+ unless @args == 3;
+
+ # Opmaken verkoopboeking.
+ my @cmd1 = qw(verkoop);
+ push(@cmd1, $datum, $args[1], $args[0], $args[1], $args[2]);
+
+ # Opmaken kasboeking.
+ my @cmd2 = qw(kas);
+ push(@cmd2, "--nr=$bsknr") if $bsknr;
+ push(@cmd2, $datum, $args[1], "deb", $args[0], $args[2]);
+
+ for my $command ( \@cmd1, \@cmd2 ) {
+ warn("+ @$command\n") if $self->{echo};
+ my $cmd = shift(@$command);
+ my $m = $self->can("do_$cmd");
+ die("Onbekende opdracht: $cmd (eigen schuld)") unless $m;
+ my $output = $self->$m(@$command);
+ $self->print("$output\n") if $output;
+ }
+
+ return;
+}
+
+# En uiteraard, de hulpboodschap.
+
+sub EB::Shell::help_kasverkoop {
+ return <<EOD;
+Eenvoudige manier om een kasverkoop te boeken.
+
+ kasverkoop <datum> <debiteur> <omschrijving> <bedrag>
+
+Bijvoorbeeld:
+
+ kasverkoop 28-01 PIETJE "Dansles" 25,00
+
+Dit wordt omgezet in de opdrachten:
+
+ verkoop 28-01 "Kasverkoop" PIETJE "Dansles" 25,00
+ kas 28-01 "Kasverkoop" deb PIETJE 25,00
+EOD
+}
+
+# Package ends here.
+
+1;
Modified: branches/upstream/eekboek/current/lib/EB/examples/Userdefs.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/examples/Userdefs.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/examples/Userdefs.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/examples/Userdefs.pm Tue Jan 27 04:16:03 2009
@@ -5,8 +5,8 @@
# Author : Johan Vromans
# Created On : Thu Feb 7 14:28:50 2008
# Last Modified By: Johan Vromans
-# Last Modified On: Thu Feb 7 14:46:05 2008
-# Update Count : 3
+# Last Modified On: Tue Dec 30 12:22:37 2008
+# Update Count : 4
# Status : Unknown, Use with caution!
package EB::Shell::Userdefs;
@@ -28,7 +28,7 @@
sub EB::Shell::pp_kasverkoop {
my ($self, $cmd, @args) = @_;
- # Kontroleer argumenten. "--nr=.." is een intern doorgegeven
+ # Controleer argumenten. "--nr=.." is een intern doorgegeven
# argument wanneer de vorm "kasverkoop:boekstuknummer" wordt
# gebruikt.
@@ -38,7 +38,7 @@
# Nieuwe opdracht.
$cmd = "kas";
- # Opbouwen niewe lijst argumenten.
+ # Opbouwen nieuwe lijst argumenten.
my @a;
if ( $args[0] =~ /^--?nr=(.+)/ ) {
push(@a, shift(@args)); # boekstuknummer
Modified: branches/upstream/eekboek/current/lib/EB/examples/eekboek.conf
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/examples/eekboek.conf?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/examples/eekboek.conf (original)
+++ branches/upstream/eekboek/current/lib/EB/examples/eekboek.conf Tue Jan 27 04:16:03 2009
@@ -1,40 +1,118 @@
-; Sample EekBoek config file
+; Example EekBoek config file.
+;
+; This file will be placed in your current directory when you execute
+; the command:
+;
+; $ ebshell --createsampleconfig
+;
+; Change as needed. See http://www.eekboek.nl/docs/config.html
+; for details.
+;
+; NOTE THAT FOR MOST PURPOSES, ONLY THE DATABASE NAME AND DRIVER NEED
+; TO BE SPECIFIED. ALL OTHER SETTINGS MAY REMAIN AS THEY ARE.
+
+[database]
+
+; Name of the database to use. This is the name EekBoek uses to
+; identify the database. Note that the actual name as used by the
+; database system may be different.
+
+name = sample
+
+; The database driver (postgres or sqlite).
+
+driver = sqlite
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; NOTE THAT FOR MOST PURPOSES, ALL OTHER SETTINGS MAY REMAIN AS THEY
+; ARE.
+
+; THESE ARE EXAMPLES. See http://www.eekboek.nl/docs/config.html
+; for details.
[general]
+
; There are currently no General config variables.
[locale]
-; Language (for international version only).
+
+; Language selection (for international version only).
+; Default value depends on the locale.
;lang = nl_NL
-; Decimal point.
+
+; Force unicode, if necessary. Default depends on the locale.
+;unicode = 1
+
+; Decimal point. Defaults depend on the locale.
;decimalpt = ,
;thousandsep = .
+[preferences]
+
+; Show journal after each booking.
+;journal = 1
+
[database]
-; Name of the database to use. Note that "eekboek_" will be prefixed.
+
+; Name of the database to use. This is the name EekBoek uses to
+; identify the database. Note that the actual name as used by the
+; database system may be different.
;name = sample
+
+; The database driver (postgres or sqlite).
+;driver = sqlite
+
; Name of the system that runs the database, if not local.
;host = dbhost.example.com
+
; Access port for the database, if not local.
;port = 5432
+
; User to access the database, if not current.
;user = eekboek
+
; Password for database access, if needed.
;password = secret
+[strategy]
+
+; Method for rounding numbers (ieee, posix, bankers).
+;round = ieee
+
+; Combine bookings to match a payment.
+;bkm_multi = 1
+
+; Do not try an alternative calculation if BTW does not match.
+;iv_vc = 0
+
+[shell]
+
+; Private module with EekBoek extensions.
+;userdefs = Userdefs
+
[format]
+
+; Date format (YYYY-MM-DD, DD-MM-YYY, DD-MM).
;date = DD-MM-YYYY
-[strategy]
-; method for rounding numbers.
-;round = ieee
-;round = posix
+[text]
+
+; Column width for amounts in textual reports.
+;numwidth = 9
[html]
+
; Where to find stylesheets. If omitted, default styles will be included.
+; See the docs.
;cssdir = css
[csv]
+
; Field separator for generated CSV files.
;separator = ,
+[security]
+
+; Microsoft Vista users may need to set this.
+;override_security_for_vista = 1
Modified: branches/upstream/eekboek/current/lib/EekBoek.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EekBoek.pm?rev=30147&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EekBoek.pm (original)
+++ branches/upstream/eekboek/current/lib/EekBoek.pm Tue Jan 27 04:16:03 2009
@@ -9,9 +9,9 @@
# Minimal version to prevent many Unicode bugs.
use 5.008003;
-my $RCS_Id = '$Id: EekBoek.pm,v 1.69 2008/08/30 08:49:14 jv Exp $ ';
+my $RCS_Id = '$Id: EekBoek.pm,v 1.71 2009/01/25 19:39:22 jv Exp $ ';
our $PACKAGE = 'EekBoek';
-our $VERSION = '1.04';
+our $VERSION = '1.04.02';
=head1 NAME
@@ -62,4 +62,4 @@
1;
-# $Id: EekBoek.pm,v 1.69 2008/08/30 08:49:14 jv Exp $
+# $Id: EekBoek.pm,v 1.71 2009/01/25 19:39:22 jv Exp $
More information about the Pkg-perl-cvs-commits
mailing list