webservices/safechat
1
0
Fork 0
Code Issues Pull Requests Releases Activity

moveed dependencies from build-in-docker.conf to debian/control.in

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-01-18 14:03:13 +00:00
parent 8f77d7b508
commit 5a5d4a3044
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build-in-docker.conf
View File

@@ -3,8 +3,6 @@
if test -n "${ANDROID_HOME}"; then if test -n "${ANDROID_HOME}"; then
# all this is needed for android through cordova (phonegap) only # all this is needed for android through cordova (phonegap) only
packages+=("wheezy:::curl:::npm") packages+=("wheezy:::curl:::npm")
packages+=("amd64:::libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
packages+=("git nodejs default-jdk")
repos+=("Debian|Ubuntu-precise::::::universe") repos+=("Debian|Ubuntu-precise::::::universe")
repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'") repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'") repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'")
@@ -23,5 +21,4 @@ if test -n "${ANDROID_HOME}"; then
envs+=("-e ANDROID_SDK_HOME=/workdir") envs+=("-e ANDROID_SDK_HOME=/workdir")
dirs+=("-v ${ANDROID_HOME}:${ANDROID_HOME}:ro") dirs+=("-v ${ANDROID_HOME}:${ANDROID_HOME}:ro")
dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro") dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
#dirs+=("-v ${HOME}/.android:${HOME}/.android")
fi fi

5
debian/control.in vendored
View File

@@ -1,12 +1,11 @@
Source: @PACKAGE_NAME@ Source: @PACKAGE_NAME@
Priority: extra Priority: extra
Maintainer: @AUTHOR@ Maintainer: @AUTHOR@
Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, git, nodejs, default-jdk, libc6-i386, lib32stdc++6, lib32gcc1, lib32ncurses5, lib32z1
Package: @PACKAGE_NAME@ Package: @PACKAGE_NAME@
Section: web Section: web
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, nodejs
Description: @DESCRIPTION@ Description: @DESCRIPTION@
@README_DEB@ @README_DEB@