epic-ts

diff --git a/debian/mkivitendo.changelog b/debian/mkivitendo.changelog
index 861b6cc..d84e814 100644 (file)
--- a/debian/mkivitendo.changelog
+++ b/debian/mkivitendo.changelog
@@ -1,4 +1,4 @@
-kivitendo-erp (3.5.8.1-%BUILD%) unstable; urgency=medium
+kivitendo-erp (0.1-%BUILD%) unstable; urgency=medium
   * start of mebil mapping
  -- Michael Wagner <info@wagnertech.de>  Tue, 08 Feb 2022 20:03:04 +0100
 

diff --git a/debian/mkivitendo.control b/debian/mkivitendo.control
index c5b25cc..4b2e27d 100644 (file)
--- a/debian/mkivitendo.control
+++ b/debian/mkivitendo.control
@@ -8,23 +8,6 @@ Package: mkivitendo
 Section: main
 Priority: optional
 Architecture: all
-Depends: apache2, postgresql, libapache2-mod-fcgid, libarchive-zip-perl, libclone-perl,
-  libconfig-std-perl, libdatetime-perl, libdbd-pg-perl, libdbi-perl,
-  libemail-address-perl,  libemail-mime-perl, libfcgi-perl, libjson-perl,
-  liblist-moreutils-perl, libnet-smtp-ssl-perl, libnet-sslglue-perl,
-  libparams-validate-perl, libpdf-api2-perl, librose-db-object-perl,
-  librose-db-perl, librose-object-perl, libsort-naturally-perl,
-  libstring-shellquote-perl, libtemplate-perl, libtext-csv-xs-perl,
-  libtext-iconv-perl, liburi-perl, libxml-writer-perl, libyaml-perl,
-  libimage-info-perl, libgd-gd2-perl,
-  libfile-copy-recursive-perl, libalgorithm-checkdigits-perl,
-  libcrypt-pbkdf2-perl, libcgi-pm-perl, libtext-unidecode-perl, libwww-perl,
-  postgresql-contrib, aqbanking-tools, poppler-utils, libhtml-restrict-perl,
-  libdatetime-set-perl, libset-infinite-perl, liblist-utilsby-perl,
-  libdaemon-generic-perl, libfile-flock-perl, libfile-slurp-perl,
-  libfile-mimeinfo-perl, libpbkdf2-tiny-perl, libregexp-ipv6-perl,
-  libdatetime-event-cron-perl, libexception-class-perl,
-  libcam-pdf-perl, libmath-round-perl
-Replaces: kivitendo
+Depends: kivitendo
 Description: kivitendo-ERP
 

diff --git a/debian/mkivitendo.cp b/debian/mkivitendo.cp
index 907a480..7ee781c 100755 (executable)
--- a/debian/mkivitendo.cp
+++ b/debian/mkivitendo.cp
@@ -3,21 +3,14 @@ set -e
 
 # parameter: $1: base dir for copy (optional)
 
-mkdir -p $1/opt/kivitendo-erp
-rsync -a --exclude=".git" --exclude="debian" ./ $1/opt/kivitendo-erp/
+. debian/setenv.sh
+mkdir -p $1/opt/mkivitendo
 
-# provide WTG default config file
-cp Downloads/projects/kivitendo/kivitendo.conf.default $1/opt/kivitendo-erp/config/
-
-# postinst
-cp Downloads/projects/debian/kivitendo.postinst debian/tmp/DEBIAN/postinst
-
-# copyright
-cp doc/copyright debian/
-
-# apache files
-mkdir -p $1/etc/apache2/sites-available
-mkdir -p $1/etc/apache2/sites-enabled
-cp Downloads/projects/kivitendo/kivitendo.conf $1/etc/apache2/sites-available
-cd $1/etc/apache2/sites-enabled && ln -sf ../sites-available/kivitendo.conf .
+git diff --stat release-3.6.1 | grep -v debian |grep -v "files changed"| grep -v ".dummy" |sed "s/ //" | sed "s/ .*//" >git.diff
 
+while read line
+do
+       path=${line%.*}
+       mkdir -p $1/opt/mkivitendo/$path
+       cp $line $1/opt/mkivitendo/$path/
+done <git.diff

diff --git a/debian/mkivitendo.postinst b/debian/mkivitendo.postinst
new file mode 100755 (executable)
index 0000000..ecff89e
--- /dev/null
+++ b/debian/mkivitendo.postinst
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -ex
+
+rsync -av /opt/mkivitendo/ /opt/kivitendo-erp
+

diff --git a/debian/mkivitendo.prepare b/debian/mkivitendo.prepare
index f7f4357..4fcc49f 100755 (executable)
--- a/debian/mkivitendo.prepare
+++ b/debian/mkivitendo.prepare
@@ -1,16 +1,15 @@
 #!/bin/bash
 set -e
 
-mkdir -p Downloads
-pushd Downloads >/dev/null
+# bestimme Versionsnummer aus VERSION
+base_version=$(cat VERSION)
 
-if [ -d projects ]
-then
-       pushd projects >/dev/null
-       git fetch -t
-       popd >/dev/null
-else
-       git clone https://wagnertech.de/git/projects
-fi
+# Hänge Version aus changelog an
+vline=$(head -1 debian/$paket.changelog)
+vline=${vline%-*}
+cl_version=${vline#*(}
 
+echo "version=$base_version.$cl_version" >> debian/rules.pre
+echo "version=$base_version.$cl_version" >> debian/setenv.sh
+echo "base_version=$base_version" >> debian/setenv.sh