X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=DEBIAN%2Fmk_erp_deb.sh;h=b3d47bc77c8ee2aabe6eb5a03ea454c1ba12f87d;hb=4bcb450849ddc6e67f7c7181b20c5912b604cdd1;hp=6093fe0ae33281cb1390820b00ff196d175b2ccb;hpb=d0df67f1aa650fa3d5f3f69f3a52546fe0733b3a;p=kivitendo-erp.git

diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh
index 6093fe0ae..b3d47bc77 100755
--- a/DEBIAN/mk_erp_deb.sh
+++ b/DEBIAN/mk_erp_deb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #Jedes neue Paket der gleichen Version bekommt eine eigene Nummer
-NR="0"
+NR="${NR:-0}"
 
 #hier wurde das Git-Paket entpakt:
 SRC=/tmp/lx-office-erp
@@ -15,7 +15,7 @@ DST=/tmp/package
 ################################################
 
 VER=`cat VERSION`
-DEST=$DST/lx-office-erp_$VER-$NR-all
+DEST=$DST/lx-office-erp_$VER-$NR$1_all
 
 
 mkdir -p $DEST
@@ -26,7 +26,7 @@ cp -a $SRC/DEBIAN/DEBIAN .
 tar xzf $SRC/DEBIAN/struktur.tgz
 
 #Für Hardy + co Sonderbehandlung
-if [ "$1#" == "old#" ]; then
+if [ "$1#" == "-older#" ]; then
     mv DEBIAN/control.older DEBIAN/control
 else
     rm DEBIAN/control.older
@@ -44,23 +44,21 @@ cp -a $SRC/scripts usr/lib/lx-office-erp
 cp -a $SRC/sql usr/lib/lx-office-erp
 cp -a $SRC/t usr/lib/lx-office-erp
 cp -a $SRC/*.pl usr/lib/lx-office-erp
+cp -a $SRC/dispatcher.f* usr/lib/lx-office-erp
 cp $SRC/VERSION usr/lib/lx-office-erp
 cp $SRC/index.html usr/lib/lx-office-erp
-cp $SRC/config/lx-erp.conf  etc/lx-office-erp/lx-erp.conf.default
-cp $SRC/config/console.conf.default etc/lx-office-erp/
-cp $SRC/config/authentication.pl.default etc/lx-office-erp/
+cp $SRC/config/lx_office.conf.default etc/lx-office-erp/lx_office.conf.default
 cp $SRC/menu.ini usr/lib/lx-office-erp/menu.default
 cp -a $SRC/css var/lib/lx-office-erp
 cp -a $SRC/templates var/lib/lx-office-erp
 cp -a $SRC/users var/lib/lx-office-erp
-cp -a $SRC/xslt var/lib/lx-office-erp
 
 cp -a $SRC/doc/* usr/share/doc/lx-office-erp/
 cp -a $SRC/image/* usr/share/lx-office-erp/
 
-#Ist nicht im Repository. Bei Sven oder Holger erfragen.
-if [ "$1#" == "old#" ]; then
-    tar xzf $SRC/DEBIAN/missing_lib.tar.gz
+#Ist nicht im Repository. Liegt bei sf
+if [ "$1#" == "-older#" ]; then
+    tar xzf $SRC/DEBIAN/lx-erp-perl-libs-compat-v2.tar.gz
 fi
 
 #Git- und dummy-files löschen
@@ -78,17 +76,15 @@ find var/ -name "*" -type f -exec md5sum {} \; >> DEBIAN/md5sum
 find etc/ -name "*" -type f -exec md5sum {} \; >> DEBIAN/md5sum
 
 #Größe feststellen:
-SIZE=`du -scb . | grep insgesamt | cut -f1`
+SIZE=`du -scb . | tail -n 1 | cut -f1`
 
 #Controlfile updaten:
-cat DEBIAN/control | sed --expression "s/Installed-Size: 0/Installed-Size: $SIZE/g" > DEBIAN/1.tmp
-mv DEBIAN/1.tmp DEBIAN/control
-cat DEBIAN/control | sed --expression "s/Version: 0/Version: $VER-$NR/g" > DEBIAN/1.tmp
-mv DEBIAN/1.tmp DEBIAN/control
+sed --in-place --expression "s/Installed-Size: 0/Installed-Size: $SIZE/g" DEBIAN/control
+sed --in-place --expression "s/Version: 0/Version: $VER-$NR/g" DEBIAN/control
 #Revisionsnummer evtl. von Hand eintragen
 
 #Paket bauen:
 cd ..
-dpkg-deb --build lx-office-erp_$VER-$NR-all
+dpkg-deb --build lx-office-erp_$VER-$NR$1_all
 
 echo "Done"