fixed new build environment

build-in-docker.conf

@@ -1,23 +1,19 @@
-# if you have android, we need cordova plus more dependencies
+## @id $Id$
-# so we can build an android app
+##
-if test -n "${ANDROID_HOME}"; then
+## This file has been added:
-    # all this is needed for android through cordova (phonegap) only
+##  - by bootstrap.sh
-    packages+=("wheezy:::curl:::npm")
+##  -  on Thu, 31 May 2018 15:01:34 +0200
-    packages+=("amd64:::libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1")
+## Feel free to change it or even remove and rebuild it, up to your needs
-    packages+=("git nodejs default-jdk")
+##
-    repos+=("Debian|Ubuntu-precise::::::universe")
+##       1         2         3         4         5         6         7         8
-    repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
-    repos+=("wheezy:::'deb http://ftp.is.debian.org/debian wheezy-backports main'")
+
-    commands+=("update-alternatives --install /usr/bin/node nodejs /usr/bin/nodejs 100")
+# Use Ubuntu Universe Repository
-    commands+=("wheezy:::curl https://www.npmjs.com/install.sh | sh")
+repos+=("ubuntu:::universe")
-    commands+=("npm install -g cordova")
+
-    commands+=("chown $(id -u) ${HOME}")
+# Use Marc Wäckerlin's Repository, see https://repository.mrw.sh
-    commands+=("chown -R $(id -u) ${HOME}/.npm")
+repos+=("debian|ubuntu:::https://repository.mrw.sh:::https://repository.mrw.sh/@DISTRIBUTOR@/marc-waeckerlin.repo")
-    commands+=("useradd -d ${HOME} -u $(id -u) $(id -un)")
+keys+=("https://repository.mrw.sh/PublicKey")
-    envs+=("-e ANDROID_HOME=${ANDROID_HOME}")
+
-    envs+=("-e HOME=${HOME}")
+# centos requires epel-release for some packages, such as Qt WebKit
-    envs+=("-e TERM=xterm")
+packages+=("centos:::epel-release")
-    dirs+=("-v ${ANDROID_HOME}:${ANDROID_HOME}:ro")
-    dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")
-    dirs+=("-v ${HOME}/.android:${HOME}/.android:ro")
-fi

configure.ac

@@ -26,6 +26,8 @@ AX_USE_RPM_PACKAGING
 AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
 
+AX_DEB_SECTION(web)
+
 # qt features, uncomment, what you need:
 #AX_CHECK_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets])
 #AX_QT_NO_KEYWORDS
@@ -48,4 +50,4 @@ AC_CONFIG_FILES([cordova/makefile])
 AC_CONFIG_FILES([cordova/config.xml])
 
 # create output
-AC_OUTPUT
+AX_OUTPUT

debian/changelog.in

@@ -1,5 +1,5 @@
 @PACKAGE@ (@PACKAGE_VERSION@~@DISTRO@.@BUILD_NUMBER@) @DISTRO@; urgency=low
 
-  * Please see ChangeLog of @PACKAGE@
+@DEB_CHANGELOG@
 
- -- @AUTHOR@  @BUILD_DATE@
+ -- @PACKAGER@  @BUILD_DATE@

debian/control.in

@@ -1,12 +1,12 @@
 Source: @PACKAGE_NAME@
 Priority: extra
-Maintainer: @AUTHOR@
+Maintainer: @PACKAGER@
-Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen
+Build-Depends: debhelper, fakeroot, git2cl, git, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
 
 Package: @PACKAGE_NAME@
-Section: web
+Section: @DEB_SECTION@
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends} @DEB_DEPEND@
 Description: @DESCRIPTION@
 @README_DEB@
 

debian/rules

@@ -1,8 +1,10 @@
 ## @id $Id$
-#
+##
-# This file has been added by bootstrap.sh on Sun, 28 June 2015 22:06:16 +0200
+## This file has been added:
-# Feel free to change it or even remove and rebuild it, up to your needs
+##  - by bootstrap.sh
-#
+##  -  on Thu, 31 May 2018 15:12:09 +0200
+## Feel free to change it or even remove and rebuild it, up to your needs
+##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 

makefile.am

@@ -1,18 +1,26 @@
 ## @id $Id$
-#
+##
-# This file has been added by bootstrap.sh on Sun, 11 October 2015 13:20:54 +0200
+## This file has been added:
-# Feel free to change it or even remove and rebuild it, up to your needs
+##  - by bootstrap.sh
-#
+##  -  on Thu, 31 May 2018 20:53:49 +0200
+## Feel free to change it or even remove and rebuild it, up to your needs
+##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-SUBDIRS = scripts doc html cordova test
+SUBDIRS = test scripts doc html cordova
 
-EXTRA_DIST = build-in-docker.conf
+desktopdir = ${datadir}/applications
-
+desktop_DATA = @PACKAGE_DESKTOP@
-doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+dist_pkgdata_DATA = @PACKAGE_ICON@
-
+dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\
-maintainer-clean-local:
+                   resolve-rpmbuilddeps.sh autogen.sh			\
-	-rm -rf node_modules
+                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\
+                    build-resource-file.sh				\
+                    ax_init_standard_project.m4				\
+                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \
+                    dependency-graph.sh template.sh                     \
+                    sql-to-dot.sed
+dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in