cpp-d1064d

diff --git a/debian/eibd.changelog b/debian/eibd.changelog
deleted file mode 100644 (file)
index 61dc2559403761e2634ef9d7016452060616b194..0000000000000000000000000000000000000000
--- a/debian/eibd.changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-projects (0.14-%BUILD%) unstable; urgency=medium
-  * knxd
- -- Michael Wagner <michael@wagnertech.de>  Thu, 11 Feb 2021 10:00:00 +0100

diff --git a/debian/eibd.changelog b/debian/eibd.changelog
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..3f6a4095d7176069d2dbef5d47d705fb8a7abfa7
--- /dev/null
+++ b/debian/eibd.changelog
@@ -0,0 +1 @@
+projects.changelog
\ No newline at end of file

diff --git a/debian/eibd.control b/debian/eibd.control
index ccdb1e1..48faa91 100644 (file)
--- a/debian/eibd.control
+++ b/debian/eibd.control
@@ -1,4 +1,4 @@
-Source: projects
+Source: bcusdk
 Section: main
 Priority: optional
 Maintainer: Koegler

diff --git a/debian/eibd.cp b/debian/eibd.cp
index 822e00d..786b51e 100755 (executable)
--- a/debian/eibd.cp
+++ b/debian/eibd.cp
@@ -9,3 +9,7 @@ pushd ../build/pthsem-2.0.8 >/dev/null
        make install
 popd >/dev/null
 
+rsync -a ../build/debian/tmp/ debian/tmp/
+cp ../build/bcusdk-0.0.5/debian/changelog debian/
+cp ../build/bcusdk-0.0.5/debian/copyright debian/
+

diff --git a/debian/eibd.prebuild b/debian/eibd.prebuild
index 6cdc084..20b2ff2 100755 (executable)
--- a/debian/eibd.prebuild
+++ b/debian/eibd.prebuild
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -e
 
-# TODO: should be replaced by a mbuild environment variable
-project_dir="$HOME/projects"
-
 # Quelle: https://www.meintechblog.de/2014/06/knx-eib-gateway-in-fhem-einbinden/
 
 # $CONFIGURE_OPTS may be set by cross compile environment
@@ -13,18 +10,16 @@ then
        PTH_OPTS="--with-mctx-mth=sjlj --with-mctx-dsp=ssjlj --with-mctx-stk=sas"
 fi
 
-wget --no-check-certificate http://www.auto.tuwien.ac.at/~mkoegler/pth/pthsem_2.0.8.tar.gz
-tar xf pthsem_2.0.8.tar.gz
+tar xf Downloads/pthsem_2.0.8.tar.gz
 pushd pthsem-2.0.8 >/dev/null
-       ./configure --prefix=$project_dir/debian/tmp/usr $PTH_OPTS $CONFIGURE_OPTS
+       ./configure --prefix=$HOME/build/debian/tmp/usr $PTH_OPTS $CONFIGURE_OPTS
        make
 popd >/dev/null
 
-wget --no-check-certificate http://www.auto.tuwien.ac.at/~mkoegler/eib/bcusdk_0.0.5.tar.gz
-tar xf bcusdk_0.0.5.tar.gz
-cp ~/projects/eibd/configure bcusdk-0.0.5/
+tar xf Downloads/bcusdk_0.0.5.tar.gz
+cp eibd/configure bcusdk-0.0.5/
 pushd bcusdk-0.0.5
-       ./configure --with-pth=subdir:$HOME/build/pthsem-2.0.8 --without-pth-test --enable-onlyeibd --enable-eibnetip --enable-eibnetiptunnel --enable-eibnetipserver --enable-tpuarts --prefix=$project_dir/debian/tmp/usr $CONFIGURE_OPTS
+       ./configure --with-pth=subdir:$HOME/build/pthsem-2.0.8 --without-pth-test --enable-onlyeibd --enable-eibnetip --enable-eibnetiptunnel --enable-eibnetipserver --enable-tpuarts --prefix=$HOME/build/debian/tmp/usr $CONFIGURE_OPTS
 popd >/dev/null
 
 

diff --git a/debian/eibd.prepare b/debian/eibd.prepare
index 6fbcfe6..7ab662d 100755 (executable)
--- a/debian/eibd.prepare
+++ b/debian/eibd.prepare
@@ -4,3 +4,15 @@ set -e
 # override package version
 echo "version=0.0.5" >> debian/setenv.sh
 
+mkdir -p Downloads
+cd Downloads
+
+if [ ! -f pthsem_2.0.8.tar.gz ]
+then
+       wget --no-check-certificate http://www.auto.tuwien.ac.at/~mkoegler/pth/pthsem_2.0.8.tar.gz
+fi
+if [ ! -f bcusdk_0.0.5.tar.gz ]
+then
+       wget --no-check-certificate http://www.auto.tuwien.ac.at/~mkoegler/eib/bcusdk_0.0.5.tar.gz
+fi
+

diff --git a/debian/projects.changelog b/debian/projects.changelog
new file mode 100644 (file)
index 0000000..f0d5b26
--- /dev/null
+++ b/debian/projects.changelog
@@ -0,0 +1,3 @@
+projects (0.1-%BUILD%) unstable; urgency=medium
+  * projects
+ -- Michael Wagner <michael@wagnertech.de>  Thu, 11 Feb 2021 10:00:00 +0100