diff --git a/build-in-docker.conf b/build-in-docker.conf index 865e76f..ee7e83b 100644 --- a/build-in-docker.conf +++ b/build-in-docker.conf @@ -3,8 +3,6 @@ if test -n "${ANDROID_HOME}"; then # all this is needed for android through cordova (phonegap) only packages+=("wheezy:::curl:::npm") - packages+=("amd64:::libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1") - packages+=("git nodejs default-jdk") repos+=("Debian|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'") @@ -23,5 +21,4 @@ if test -n "${ANDROID_HOME}"; then envs+=("-e ANDROID_SDK_HOME=/workdir") dirs+=("-v ${ANDROID_HOME}:${ANDROID_HOME}:ro") dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro") - #dirs+=("-v ${HOME}/.android:${HOME}/.android") fi diff --git a/debian/control.in b/debian/control.in index b0376db..660389f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,12 +1,11 @@ Source: @PACKAGE_NAME@ Priority: extra 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@ Section: web Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, nodejs Description: @DESCRIPTION@ @README_DEB@ -