Merge "Deb package: added requirements.txt"
diff --git a/.gitignore b/.gitignore
index 6672790..889a1b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,9 @@
sdnctrlhandler/migrations
authosm/migrations
userhandler/migrations
+
+#Deb package
+deb_dist/
+dists/
+debian/osm-lightui.install
+
diff --git a/build-debpkg.sh b/build-debpkg.sh
index b91cff9..6af77db 100755
--- a/build-debpkg.sh
+++ b/build-debpkg.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright 2018 Telefonica
# All Rights Reserved.
#
@@ -25,9 +25,9 @@
PKG_VERSION_PREFIX=$(echo $PKG_VERSION | sed -e 's/v//g')
PKG_VERSION_POST=$(git rev-list $PKG_VERSION..HEAD | wc -l)
if [ "$PKG_VERSION_POST" -eq 0 ]; then
- PKG_DIR="osm-${MDG_NAME}-${PKG_VERSION_PREFIX}"
+ PKG_DIR="deb_dist/osm-${MDG_NAME}-${PKG_VERSION_PREFIX}"
else
- PKG_DIR="osm-${MDG_NAME}-$PKG_VERSION_PREFIX.post${PKG_VERSION_POST}"
+ PKG_DIR="deb_dist/osm-${MDG_NAME}-$PKG_VERSION_PREFIX.post${PKG_VERSION_POST}"
fi
rm -rf $PKG_DIR
@@ -45,9 +45,11 @@
echo "$f usr/share/osm-$MDG_NAME" >> $DEB_INSTALL
done
cp -R debian $PKG_DIR/.
+cp requirements.txt $PKG_DIR
-cd $PKG_DIR
+pushd $PKG_DIR
dh_make -y --indep --createorig --a -c apache
dpkg-buildpackage -uc -us -tc -rfakeroot
-cd -
+popd
+
diff --git a/devops-stages/stage-archive.sh b/devops-stages/stage-archive.sh
index 3c47b96..e606ac4 100755
--- a/devops-stages/stage-archive.sh
+++ b/devops-stages/stage-archive.sh
@@ -18,7 +18,7 @@
rm -rf pool
rm -rf dists
mkdir -p pool/$MDG
-mv *.deb pool/$MDG/
+mv deb_dist/*.deb pool/$MDG/
mkdir -p dists/unstable/$MDG/binary-amd64/
apt-ftparchive packages pool/$MDG > dists/unstable/$MDG/binary-amd64/Packages