epic-ts

diff --git a/VERSION b/VERSION
index 8ab2db9acce31ffb5ba37fee5ac554d52ce8c760..9575d51bad249b78b01fa517932882eb917cb750 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1 @@
 3.6.1
 3.6.1

-

diff --git a/build/kivitendo-mebil.co b/build/kivitendo-mebil.co
deleted file mode 100755 (executable)
index da0def4..0000000
--- a/build/kivitendo-mebil.co
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-./kivitendo.co $*
-

diff --git a/build/kivitendo-steckbrief.co b/build/kivitendo-steckbrief.co
deleted file mode 100755 (executable)
index c53d61c..0000000
--- a/build/kivitendo-steckbrief.co
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-set -e
-
-# parameter: $1: git tag to build
-
-if [ "$1" == "TOP" ]; then
-       mkdir kivitendo-erp/
-       ln -s ../../../doc/ kivitendo-erp/
-       ln -s ../../../image/ kivitendo-erp/
-else
-       ../kivitendo.co $*
-fi
-
-if [ -d GF ]
-then
-       pushd GF >/dev/null
-               svn up
-       popd >/dev/null
-else
-       svn co https://wagnertech.de/svn/verwaltung/GF
-fi
-
-pushd .. >/dev/null
-       ln -sf src/kivitendo-erp/doc/Steckbrief.tex .
-       ln -sf src/GF/wagner_tech_briefbogen_blau_fs1.pdf .
-       ln -sf projects/tools/tex/wallpaper.sty .
-       ln -sf src/kivitendo-erp/image/Bildschirmfoto-kivitendo-steigmann-3.3.0-MozillaFirefox.png Bildschirmfoto.png
-       echo "COMPILE_TARGET = Steckbrief.pdf" >make.pre
-popd >/dev/null

diff --git a/build/kivitendo.co b/build/kivitendo.co
deleted file mode 100755 (executable)
index d3d0f47..0000000
--- a/build/kivitendo.co
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-set -e
-
-# parameter: $1: git tag to build
-# options: -g <alternative repository>
-
-#repos="https://github.com/wagner-tech"
-#if getopts "g:" opt; then
-#      repos=$OPTARG
-#      shift 2
-#fi
-#
-#if [ -e kivitendo-erp ]
-#then
-#      pushd kivitendo-erp >/dev/null
-       #branch=$(git rev-parse --abbrev-ref HEAD)
-       #git pull origin $branch
-#else
-#      git clone $repos/kivitendo-erp
-#      pushd kivitendo-erp >/dev/null
-#fi
-#      git checkout $1
-#popd >/dev/null
-
-# alternativer Versuch: Es wird das lokale Repository geklont:
-
-cwd=$(pwd)
-git clone ${cwd%/build/src}
-pushd kivitendo-erp >/dev/null
-       git checkout $1
-popd >/dev/null
-

diff --git a/build/start-build b/build/start-build
deleted file mode 100755 (executable)
index 23256ac..0000000
--- a/build/start-build
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-set -e
-
-# checkout build utilities
-if [ -d projects ]; then
-       pushd projects >/dev/null
-               git pull origin master
-       popd >/dev/null
-else
-       git clone https://github.com/wagner-tech/projects/
-fi
-
-ln -sf projects/tools/make/configure .
-
-echo "Next step: call 'configure <project> <tag>'"
-echo "Available are:"
-ls *.co

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 5c2e613544265ecaf9fde590203c64048e5d0b93..07ae59d56528679fd53b25bf167248ded5c72a87 100644 (file)
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -38,8 +38,8 @@ failed_login_penalty = 5
 host     = localhost
 port     = 5432
 db       = kivitendo_auth
 host     = localhost
 port     = 5432
 db       = kivitendo_auth

-user     = kivitendo
-password = kivitendo
+user     = postgres
+password =

 
 [authentication/ldap]
 # This section is only relevant if 'module' is set to 'LDAP'. It names
 
 [authentication/ldap]
 # This section is only relevant if 'module' is set to 'LDAP'. It names

diff --git a/debian/kivitendo-mebil.cp b/debian/kivitendo-mebil.cp
index 79b4f84964e80935cf690833c04d23534424046d..7b5e37db696c75cc17e5d4c814650d9cf113cb67 100755 (executable)
--- a/debian/kivitendo-mebil.cp
+++ b/debian/kivitendo-mebil.cp
@@ -10,7 +10,7 @@ ov=$(head -1 VERSION)
 
 # test release tag for original version
 git diff --name-only release-$ov >git.tmp
 
 # test release tag for original version
 git diff --name-only release-$ov >git.tmp

-cat git.tmp |grep -v debian |grep -v ".dummy" >git.diff
+cat git.tmp |grep -v debian |grep -v "^Test" |grep -v ".dummy" >git.diff

 
 while read line
 do
 
 while read line
 do

diff --git a/image/Bildschirmfoto-kivitendo-steigmann-3.3.0-MozillaFirefox.png b/image/Bildschirmfoto-kivitendo-steigmann-3.3.0-MozillaFirefox.png
deleted file mode 100644 (file)
index 1c13c50..0000000
Binary files a/image/Bildschirmfoto-kivitendo-steigmann-3.3.0-MozillaFirefox.png and /dev/null differ