X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=DEBIAN%2Fmk_erp_deb.sh;h=b3d47bc77c8ee2aabe6eb5a03ea454c1ba12f87d;hb=6b82c9aaedc7a84b5a9b01bbc8743d0bc671e631;hp=a7dcc9f9bad4b2ac12a5b24b2c3e83d2ecb291db;hpb=a99b261f6a4a4b1988ce2e0ad4c27ed579378cb9;p=kivitendo-erp.git

diff --git a/DEBIAN/mk_erp_deb.sh b/DEBIAN/mk_erp_deb.sh
index a7dcc9f9b..b3d47bc77 100755
--- a/DEBIAN/mk_erp_deb.sh
+++ b/DEBIAN/mk_erp_deb.sh
@@ -1,13 +1,13 @@
 #!/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/deb_test/unstable
+SRC=/tmp/lx-office-erp
 
 #hier wird das Debian-Paket gebaut:
-DST=/tmp/deb_test/package
+DST=/tmp/package
 
 
 ################################################
@@ -15,72 +15,22 @@ DST=/tmp/deb_test/package
 ################################################
 
 VER=`cat VERSION`
-DEST=$DST/lx-office-erp_$VER-$NR-all
-
-FILES='
-usr/lib/lx-office-erp/
-usr/share/lx-office-erp/
-usr/share/doc/lx-office-erp/
-var/lib/lx-office-erp/spool/
-var/lib/lx-office-erp/users/
-var/lib/lx-office-erp/css/
-var/lib/lx-office-erp/xslt/
-var/lib/lx-office-erp/templates/
-var/lib/lx-office-erp/webdav/lieferantenbestellungen/
-var/lib/lx-office-erp/webdav/anfragen/
-var/lib/lx-office-erp/webdav/gutschriften/
-var/lib/lx-office-erp/webdav/einkaufsrechnungen/
-var/lib/lx-office-erp/webdav/rechnungen/
-var/lib/lx-office-erp/webdav/bestellungen/
-var/lib/lx-office-erp/webdav/angebote/
-usr/lib/lx-office-erp/
-usr/share/lx-office-erp/
-usr/share/doc/lx-office-erp/
-usr/share/man/man1/:lx-office-erp.1.gz
-etc/lx-office-erp/:lx-office-erp.cherokee.handler
-etc/lx-office-erp/:lx-office-erp.apache2.conf
-etc/lx-office-erp/:lx-office-erp.cherokee
-usr/bin/:lx-office-erp
-'
-
-for filespec in $FILES; do
-  set - `echo $filespec | sed -e 's/:/ /g'`
-  dir=$1
-  file=$2
-  mkdir -p $SRC/DEBIAN/$dir
-  if [ -f $SRC/DEBIAN/files/$file ]; then
-    cp  $SRC/DEBIAN/files/$file $SRC/DEBIAN/$dir/$file
-  else
-    echo '1' > $SRC/DEBIAN/$dir/.dummy
-  fi
-done
-
-SYMLINKS='
-css:/var/lib/lx-office-erp/css
-doc:/usr/share/doc/lx-office-erp/
-image:/usr/share/lx-office-erp
-spool:/var/lib/lx-office-erp/spool
-templates:/var/lib/lx-office-erp/templates
-users:/var/lib/lx-office-erp/users/
-webdav:/var/lib/lx-office-erp/webdav
-xslt:/var/lib/lx-office-erp/xslt
-'
-
-for symspec in $SYMLINKS; do
-  set - `echo $symspec | sed -e 's/:/ /g'`
-  src=$1
-  tar=$2
-
-  ln -s $tar $SRC/DEBIAN/usr/lib/lx-office-erp/$src
-done
-#fertig
+DEST=$DST/lx-office-erp_$VER-$NR$1_all
+
 
 mkdir -p $DEST
 cd $DEST
 
 #Struktur anlegen:
-cp -a $SRC/DEBIAN/* .
-rm ./mk*.sh
+cp -a $SRC/DEBIAN/DEBIAN .
+tar xzf $SRC/DEBIAN/struktur.tgz
+
+#Für Hardy + co Sonderbehandlung
+if [ "$1#" == "-older#" ]; then
+    mv DEBIAN/control.older DEBIAN/control
+else
+    rm DEBIAN/control.older
+fi
 
 #Dateien kopieren:
 #aber keine fertigen Konfigurationen, nur *.default
@@ -94,19 +44,23 @@ 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_office.conf.default etc/lx-office-erp/lx_office.conf.default
-cp $SRC/config/authentication.pl.default etc/lx-office-erp/
 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. 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
 find . -name ".git*" -exec rm -rf {} \;
 find . -name ".dummy" -exec rm -rf {} \;
@@ -122,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"