r37274 - in /trunk/eekboek: debian/changelog debian/control debian/copyright lib/EB/Booking/BKM.pm lib/EB/Main.pm lib/EB/Shell.pm lib/EB/Tools/Einde.pm lib/EB/examples/Userdefs.pm

nhandler-guest at users.alioth.debian.org nhandler-guest at users.alioth.debian.org
Tue Jun 2 02:18:00 UTC 2009


Author: nhandler-guest
Date: Tue Jun  2 02:17:54 2009
New Revision: 37274

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=37274
Log:
* New upstream release
* debian/control:
  - Bump Standards-Version to 3.8.1 (No changes)
  - Add myself to list of uploaders
  - Drop Depends on libipc-run3-perl and libmodule-build-perl, which are only
    needed for building (closes: #497794)
  - Have eekboek-db-postgresql depend on eekboek (= ${source:Version}) instead
    of just eekboek
  - Change Priority to optional
* debian/copyright:
  - Switch to new format

Modified:
    trunk/eekboek/debian/changelog
    trunk/eekboek/debian/control
    trunk/eekboek/debian/copyright
    trunk/eekboek/lib/EB/Booking/BKM.pm
    trunk/eekboek/lib/EB/Main.pm
    trunk/eekboek/lib/EB/Shell.pm
    trunk/eekboek/lib/EB/Tools/Einde.pm
    trunk/eekboek/lib/EB/examples/Userdefs.pm

Modified: trunk/eekboek/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/changelog?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/debian/changelog (original)
+++ trunk/eekboek/debian/changelog Tue Jun  2 02:17:54 2009
@@ -1,8 +1,18 @@
-eekboek (1.04.02-2) UNRELEASED; urgency=low
+eekboek (1.04.03-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release
+  * debian/control:
+    - Bump Standards-Version to 3.8.1 (No changes)
+    - Add myself to list of uploaders
+    - Drop Depends on libipc-run3-perl and libmodule-build-perl, which are only
+      needed for building (closes: #497794)
+    - Have eekboek-db-postgresql depend on eekboek (= ${source:Version}) instead
+      of just eekboek
+    - Change Priority to optional
+  * debian/copyright:
+    - Switch to new format
 
- -- Joost van Baal <joostvb at mdcc.cx>  Tue, 27 Jan 2009 05:35:02 +0100
+ -- Nathan Handler <nhandler at ubuntu.com>  Tue, 02 Jun 2009 01:55:00 +0000
 
 eekboek (1.04.02-1) unstable; urgency=low
 

Modified: trunk/eekboek/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/control?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/debian/control (original)
+++ trunk/eekboek/debian/control Tue Jun  2 02:17:54 2009
@@ -1,12 +1,12 @@
 Source: eekboek
 Section: perl
-Priority: extra
+Priority: optional
 Build-Depends: cdbs, debhelper (>= 5.0.0), libipc-run3-perl (>= 0.034),
  libmodule-build-perl (>= 0.26), libdbi-perl (>= 1.40)
 Build-Depends-Indep: perl (>= 5.8.8-7etch1)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Joost van Baal <joostvb at debian.org>
-Standards-Version: 3.8.0
+Uploaders: Joost van Baal <joostvb at debian.org>, Nathan Handler <nhandler at ubuntu.com>
+Standards-Version: 3.8.1
 Homepage: http://www.eekboek.nl/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/eekboek/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/eekboek/
@@ -14,7 +14,6 @@
 Package: eekboek
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, libterm-readline-gnu-perl,
- libipc-run3-perl (>= 0.034), libmodule-build-perl (>= 0.26),
  libdbi-perl (>= 1.40), libdbd-sqlite3-perl (>= 1.13), libarchive-zip-perl
 Suggests: eekboek-db-postgresql
 Description: Bookkeeping software for small and medium-size businesses
@@ -37,7 +36,7 @@
 
 Package: eekboek-db-postgresql
 Architecture: all
-Depends: eekboek, libdbd-pg-perl (>= 1.41)
+Depends: eekboek (= ${source:Version}), libdbd-pg-perl (>= 1.41)
 Suggests: postgresql
 Description: PostgreSQL database driver for EekBoek
  This package includes EB::DB::Postgres, the PostgreSQL database driver for

Modified: trunk/eekboek/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/copyright?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/debian/copyright (original)
+++ trunk/eekboek/debian/copyright Tue Jun  2 02:17:54 2009
@@ -1,29 +1,30 @@
-This package was debianized by Joost van Baal <joostvb at debian.org> on
-Sat, 19 Jul 2008 09:26:46 +0200, using previous work from Johan Vromans.
+Format-Specification:
+    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: Johan Vromans (jvromans at squirrel.nl)
+Upstream-Source: http://search.cpan.org/dist/EekBoek/
+Upstream-Name: EekBoek
 
-Is was downloaded from http://www.eekboek.nl/dl/.
+Files: *
+Copyright: Squirrel Consultancy
+License-Alias: Perl
+License: Artistic | GPL-1+
 
-Upstream Author: Johan Vromans <jvromans.squirrel.nl>
+Files: debian/*
+Copyright: 2008-2009, Johan Vromans <jvromans.squirrel.nl>
+License: Artistic | GPL-1+
+It is assumed that the debian/* files are released under the same license as
+the upstream source
 
-Copyright:
+License: Artistic
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the Artistic License, which comes with Perl.
+    On Debian GNU/Linux systems, the complete text of the Artistic License
+    can be found in /usr/share/common-licenses/Artistic
 
-This program is Copyright 2005-2008 by Squirrel Consultancy. All
-rights reserved.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: a) the GNU General Public License as
- published by the Free Software Foundation; either version 1, or (at
- your option) any later version, or b) the "Artistic License" which
- comes with Perl.
-
- This program 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 either the
- GNU General Public License or the Artistic License for more details.
-
-On Debian GNU/Linux systems, the complete text of both the GNU General Public
-License (versions 2 and 3) and the Artistic License can be found below
-/usr/share/common-licenses/ .
-
-# $Id$
-# $URL$
+License: GPL-1+
+    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 1, 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'

Modified: trunk/eekboek/lib/EB/Booking/BKM.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Booking/BKM.pm?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Booking/BKM.pm (original)
+++ trunk/eekboek/lib/EB/Booking/BKM.pm Tue Jun  2 02:17:54 2009
@@ -7,12 +7,12 @@
 
 package EB::Booking::BKM;
 
-# RCS Id	  : $Id: BKM.pm,v 1.71 2008/11/11 14:06:59 jv Exp $
+# RCS Id	  : $Id: BKM.pm,v 1.72 2009/04/03 10:10:11 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Thu Jul  7 14:50:41 2005
 # Last Modified By: Johan Vromans
-# Last Modified On: Tue Nov 11 14:03:22 2008
-# Update Count    : 518
+# Last Modified On: Fri Apr  3 12:09:00 2009
+# Update Count    : 527
 # Status          : Unknown, Use with caution!
 
 ################ Common stuff ################
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.71 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.72 $ =~ /(\d+)/g;
 
 # Dagboek type 3: Bank
 # Dagboek type 4: Kas
@@ -344,6 +344,10 @@
 		$rel = $rr->[0];
 
 		# Zoek open posten.
+		my $ddd;
+		my $delta = $cfg->val(qw(strategy bkm_multi_delta), 0);
+		$delta = undef;	# disable for now.
+		$ddd = parse_date($dd, substr($begin, 0, 4), $delta) if $delta;
 		$sql = "SELECT bsk_open, bsk_nr, bsk_id, dbk_id, dbk_acc_id, bsk_desc, bsk_amount ".
 		  " FROM Boekstukken, Boekstukregels, Dagboeken" .
 		    " WHERE bsk_open != 0".
@@ -352,8 +356,10 @@
 			    "  AND bsr_bsk_id = bsk_id".
 			      "  AND bsr_rel_code = ?".
 				" AND bsr_nr = 1".
-				  " ORDER BY bsk_id";
-		@sql_args = ( $debcrd ? DBKTYPE_VERKOOP : DBKTYPE_INKOOP, $rel);
+				  ( $delta ? " AND bsr_date <= ?" : "" ).
+				    " ORDER BY bsk_id";
+		@sql_args = ( $debcrd ? DBKTYPE_VERKOOP : DBKTYPE_INKOOP,
+			      $rel, $delta ? $ddd : () );
 
 		# Resultset of candidates.
 		my $res = [];

Modified: trunk/eekboek/lib/EB/Main.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Main.pm?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Main.pm (original)
+++ trunk/eekboek/lib/EB/Main.pm Tue Jun  2 02:17:54 2009
@@ -1,6 +1,6 @@
 #! perl
 
-# RCS Id          : $Id: Main.pm,v 1.2 2008/02/07 14:36:17 jv Exp $
+# RCS Id          : $Id: Main.pm,v 1.3 2009/04/03 09:45:08 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Thu Jul  7 15:53:48 2005
 # Last Modified By: Johan Vromans
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.2 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.3 $ =~ /(\d+)/g;
 
 use EekBoek;
 

Modified: trunk/eekboek/lib/EB/Shell.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Shell.pm?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Shell.pm (original)
+++ trunk/eekboek/lib/EB/Shell.pm Tue Jun  2 02:17:54 2009
@@ -10,7 +10,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.109 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.110 $ =~ /(\d+)/g;
 
 use EB;
 

Modified: trunk/eekboek/lib/EB/Tools/Einde.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Tools/Einde.pm?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Tools/Einde.pm (original)
+++ trunk/eekboek/lib/EB/Tools/Einde.pm Tue Jun  2 02:17:54 2009
@@ -1,7 +1,7 @@
 #! perl
 
 # Einde.pm -- Eindejaarsverwerking
-# RCS Info        : $Id: Einde.pm,v 1.16 2008/02/07 12:30:04 jv Exp $
+# RCS Info        : $Id: Einde.pm,v 1.17 2009/04/03 09:46:26 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Sun Oct 16 21:27:40 2005
 # Last Modified By: Johan Vromans
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.16 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.17 $ =~ /(\d+)/g;
 
 use EB;
 use EB::Format;

Modified: trunk/eekboek/lib/EB/examples/Userdefs.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/examples/Userdefs.pm?rev=37274&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/examples/Userdefs.pm (original)
+++ trunk/eekboek/lib/EB/examples/Userdefs.pm Tue Jun  2 02:17:54 2009
@@ -1,7 +1,7 @@
 #! perl
 
 # Userdefs.pm -- User definable stuff
-# RCS Info        : $Id: Userdefs.pm,v 1.3 2008/02/07 13:46:14 jv Exp $
+# RCS Info        : $Id: Userdefs.pm,v 1.4 2009/04/03 09:46:57 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Thu Feb  7 14:28:50 2008
 # Last Modified By: Johan Vromans
@@ -14,7 +14,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.3 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.4 $ =~ /(\d+)/g;
 
 use EB;
 




More information about the Pkg-perl-cvs-commits mailing list