summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xLedgerSMB/Form.pm2
-rw-r--r--VERSION2
-rw-r--r--dists/rpm/ledgersmb.spec2
-rw-r--r--dists/source/build.sh2
-rw-r--r--ledgersmb.conf21
5 files changed, 4 insertions, 25 deletions
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index ac3121ae..86ecad77 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -79,7 +79,7 @@ sub new {
#menubar will be deprecated, replaced with below
$self->{lynx} = 1 if $self->{path} =~ /lynx/i;
- $self->{version} = "1.2.0 Release Candidate 4";
+ $self->{version} = "1.2.0 Release Candidate 5";
$self->{dbversion} = "1.2.0";
diff --git a/VERSION b/VERSION
index d869c87e..d80b5401 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0 Release Candidate 4
+1.2.0 Release Candidate 5
diff --git a/dists/rpm/ledgersmb.spec b/dists/rpm/ledgersmb.spec
index 4030d5d7..564804c0 100644
--- a/dists/rpm/ledgersmb.spec
+++ b/dists/rpm/ledgersmb.spec
@@ -1,7 +1,7 @@
# RPM spec written for and tested on Fedora Core 6
Summary: LedgerSMB - Open Source accounting software
Name: ledger-smb
-Version: 1.2.0rc4
+Version: 1.2.0-rc5
Release: 1
License: GPL
URL: http://www.ledgersmb.org/
diff --git a/dists/source/build.sh b/dists/source/build.sh
index ac9036fa..67d2bcca 100644
--- a/dists/source/build.sh
+++ b/dists/source/build.sh
@@ -9,7 +9,7 @@ else
$pgdoc = "true";
fi
-version="1.2.0rc4";
+version="1.2.0-rc5";
build_d="../release";
if test -d blib; then
diff --git a/ledgersmb.conf b/ledgersmb.conf
deleted file mode 100644
index 6d5b2cef..00000000
--- a/ledgersmb.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[environment]
-# if the server can't find gzip, latex, dvips or pdflatex, append the path
-PATH: /usr/local/bin
-PATH: /usr/local/pgsql/bin
-
-# on mac os X using Fink's Perl libs, add the path
-#PERL5LIB: /sw/lib/perl5
-
-#################################
-# Global database parameters
-#################################
-# These parameters *must* be set correctly for LedgerSMB >= 1.2 to work
-#
-[globaldb]
-##uncomment below and set to correct values
-DBConnect: dbi:Pg:dbname=metatron_ledger;host=localhost;port=5432
-DBname = metatron_ledger
-DBhost = localhost
-DBport = 5432
-DBUserName = ledgersmb
-DBPassword: test