SF.net SVN: ledger-smb:[3780] trunk

[..hidden..]

Revision: 3780
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3780&view=rev
Author:   einhverfr
Date:     2011-09-30 18:44:18 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB.pm
    trunk/VERSION
    trunk/dists/rpm/ledgersmb.spec
    trunk/dists/source/build.sh

Added Paths:
-----------
    trunk/sql/upgrade/rc3-rc4.sql
    trunk/sql/upgrade/svn/3760-alter-asset_reports.sql
    trunk/sql/upgrade/svn/3764-control_code_index.sql

Removed Paths:
-------------
    trunk/sql/upgrade/3760-alter-asset_reports.sql
    trunk/sql/upgrade/3764-control_code_index.sql

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3775
   + /branches/1.3:3711-3779

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/LedgerSMB/Form.pm	2011-09-30 18:44:18 UTC (rev 3780)
@@ -150,7 +150,7 @@
     #menubar will be deprecated, replaced with below
     $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) );
 
-    $self->{version}   = "1.3.0 rc3";
+    $self->{version}   = "1.3.0 rc4";
     $self->{dbversion} = "1.3.0";
 
     bless $self, $type;

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/LedgerSMB.pm	2011-09-30 18:44:18 UTC (rev 3780)
@@ -220,7 +220,7 @@
 $CGI::Simple::POST_MAX = -1;
 
 package LedgerSMB;
-our $VERSION = '1.3.0 rc3';
+our $VERSION = '1.3.0 rc4';
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB');
 

Modified: trunk/VERSION
===================================================================
--- trunk/VERSION	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/VERSION	2011-09-30 18:44:18 UTC (rev 3780)
@@ -1 +1 @@
-1.3.0 rc3
+1.3.0 rc4

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/dists/rpm/ledgersmb.spec	2011-09-30 18:44:18 UTC (rev 3780)
@@ -1,13 +1,12 @@
 # RPM spec written for and tested on CentOS 4 and CentOS 5 
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
-Version: 1.3.0_rc3
+Version: 1.3.0_rc4
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/
 Group: Applications/Productivity
 Source0: %{name}-%{version}.tar.gz
-Source1: Config-Std-0.007.tar.gz
 Source2: Template-Plugin-Latex-3.02.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
@@ -19,7 +18,7 @@
 Requires: perl-File-MimeInfo, perl-IO-stringy
 Requires: perl-MIME-Lite, perl-Class-Std >= 0.0.8
 Requires: perl-Locale-Maketext-Lexicon >= 0.62
-Requires: perl-IO-String
+Requires: perl-IO-String perl-Config-Std >= 0.007
 Requires: perl-Math-BigInt-GMP
 Requires: perl-Log-Log4perl perl-DateTime
 BuildRequires: perl

Modified: trunk/dists/source/build.sh
===================================================================
--- trunk/dists/source/build.sh	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/dists/source/build.sh	2011-09-30 18:44:18 UTC (rev 3780)
@@ -2,7 +2,7 @@
 
 # Simple script to prepare for release
 
-version="1.3.0_rc3";
+version="1.3.0_rc4";
 build_d="../release";
 
 if test -d $build_d/ledgersmb; then

Deleted: trunk/sql/upgrade/3760-alter-asset_reports.sql
===================================================================
--- trunk/sql/upgrade/3760-alter-asset_reports.sql	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/sql/upgrade/3760-alter-asset_reports.sql	2011-09-30 18:44:18 UTC (rev 3780)
@@ -1,4 +0,0 @@
-alter table asset_report alter column entered_by 
-set default person__get_my_entity_id();
-
-DROP TYPE asset_nbv_line CASCADE;

Deleted: trunk/sql/upgrade/3764-control_code_index.sql
===================================================================
--- trunk/sql/upgrade/3764-control_code_index.sql	2011-09-30 18:41:06 UTC (rev 3779)
+++ trunk/sql/upgrade/3764-control_code_index.sql	2011-09-30 18:44:18 UTC (rev 3780)
@@ -1 +0,0 @@
-ALTER TABLE entity ADD UNIQUE (control_code);

Copied: trunk/sql/upgrade/rc3-rc4.sql (from rev 3779, branches/1.3/sql/upgrade/rc3-rc4.sql)
===================================================================
--- trunk/sql/upgrade/rc3-rc4.sql	                        (rev 0)
+++ trunk/sql/upgrade/rc3-rc4.sql	2011-09-30 18:44:18 UTC (rev 3780)
@@ -0,0 +1,5 @@
+alter table asset_report alter column entered_by 
+set default person__get_my_entity_id();
+
+DROP TYPE asset_nbv_line CASCADE;
+ALTER TABLE entity ADD UNIQUE (control_code);

Copied: trunk/sql/upgrade/svn/3760-alter-asset_reports.sql (from rev 3779, branches/1.3/sql/upgrade/svn/3760-alter-asset_reports.sql)
===================================================================
--- trunk/sql/upgrade/svn/3760-alter-asset_reports.sql	                        (rev 0)
+++ trunk/sql/upgrade/svn/3760-alter-asset_reports.sql	2011-09-30 18:44:18 UTC (rev 3780)
@@ -0,0 +1,4 @@
+alter table asset_report alter column entered_by 
+set default person__get_my_entity_id();
+
+DROP TYPE asset_nbv_line CASCADE;

Copied: trunk/sql/upgrade/svn/3764-control_code_index.sql (from rev 3779, branches/1.3/sql/upgrade/svn/3764-control_code_index.sql)
===================================================================
--- trunk/sql/upgrade/svn/3764-control_code_index.sql	                        (rev 0)
+++ trunk/sql/upgrade/svn/3764-control_code_index.sql	2011-09-30 18:44:18 UTC (rev 3780)
@@ -0,0 +1 @@
+ALTER TABLE entity ADD UNIQUE (control_code);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.