fixed dependency to gpg

6 years ago · 2a49be4a99
parent 39b2103b89
commit 2a49be4a99
5 changed files with 48 additions and 24 deletions
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@ -218,8 +218,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
  AX_SUBST(AUTHOR_URL)
  AX_SUBST(AUTHOR_MAIL)
  AX_SUBST(PACKAGER)
-  #PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
-  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
+  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
+  for path in . .. ../.. ../../..; do
+    if test -d ${path}/.svn; then
+      PROJECT_URL="$(LANG= svn info | sed -n 's,^Repository Root: ,,p')"
+      break
+    elif test -d ${path}/.git; then
+      PROJECT_URL="$(git remote get-url origin)"
+      break
+    fi
+  done
+  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${PROJECT_URL}}"
  AX_SUBST(PROJECT_URL)
  AX_SUBST(SOURCE_DOWNLOAD)
  VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
--- a/bootstrap.sh
+++ b/bootstrap.sh
@ -1352,7 +1352,7 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 LDADD = -l${PACKAGE_NAME#lib}

-exampledir = ${docdir}/examples
+exampledir = \${docdir}/examples
 example_DATA = 

 MAINTAINERCLEANFILES = makefile.in
@ -1605,13 +1605,13 @@ if testtag AX_USE_DEBIAN_PACKAGING; then

 -- @PACKAGER@  @BUILD_DATE@
 EOF
-    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)"
-    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; fi)"
+    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, libltdl-dev, autotools-dev, pandoc, lsb-release$(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev | qt4-dev,"; fi)"
    to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @PACKAGER@
-Build-Depends: ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
+Build-Depends: gpg, gpg-agent, ${BUILD_DEPENDS}${RUN_DEPENDS} @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@

 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; else echo "@DEB_SECTION@"; fi)
@ -1646,6 +1646,9 @@ usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
 usr/share/doc/${PACKAGE_NAME}/html
+$(if testtag AX_BUILD_EXAMPLES; then
+  echo usr/share/doc/${PACKAGE_NAME}/examples
+fi)
 EOF
    to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF
 ${HEADER}%:
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@ -6,7 +6,7 @@ myarch=$(dpkg --print-architecture)
 if test "${arch}" = "amd64"; then
    myarch="amd64|i386"
 fi
-mode="deb"
+mode=
 img="mwaeckerlin/ubuntu:latest"
 repos=()
 keys=()
@ -241,25 +241,38 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
 docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
-case $mode in
+if test -z "$mode"; then
+    case "$targets" in
+        (*deb*) mode=deb;;
+        (*rpm*) mode=rpm;;
+        (*) case "$img" in
+                (*ubuntu*|*debian*|*mint*) mode=deb;;
+                (*fedora*|*centos*|*mageia*) mode=rpm;;
+                (*mingw*|*win*) mode=win;;
+                (*) mode=deb;;
+            esac;;
+    esac
+fi
+case "$mode" in
    (deb|apt|win)
+        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
+        PREVENT='libpam-systemd policykit.* colord dconf-service'
+        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
+        docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
+        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
        if [[ "${img}" =~ "ubuntu" ]]; then
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} locales
            docker exec ${DOCKER_ID} locale-gen ${LANG}
            docker exec ${DOCKER_ID} update-locale LANG=${LANG}
        fi
-        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
-        PREVENT='libpam-systemd policykit.* colord dconf-service'
        for f in ${PREVENT}; do
            docker exec ${DOCKER_ID} bash -c "echo 'Package: ${f}' >> /etc/apt/preferences"
            docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
            docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
        done
-        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-mark hold ${PREVENT}
-        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- software-properties-common apt-transport-https dpkg-dev lsb-release wget || \
-            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} ${PREVENT// /- }- python-software-properties apt-transport-https dpkg-dev lsb-release wget;
        for key in "${keys[@]}"; do
            wget -O- "$key" \
                | docker exec -i ${DOCKER_ID} apt-key add -
@ -281,7 +294,7 @@ case $mode in
        ;;
    (rpm|yum|dnf|zypper|urpmi)
        if [[ "$img" =~ "centos" ]]; then
-            docker exec ${DOCKER_ID} yum install -y redhat-lsb
+            docker exec ${DOCKER_ID} yum install -y redhat-lsb epel-release
            docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
 [WandiscoSVN]
 name=Wandisco SVN Repo
--- a/debian/control.in
+++ b/debian/control.in
@ -1,7 +1,7 @@
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @PACKAGER@
-Build-Depends: debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@
+Build-Depends: gnupg, debhelper, fakeroot, svn2cl, subversion, subversion-tools, pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, doxygen, graphviz, mscgen, default-jre-headless|default-jre, qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools @DEB_BUILD_DEPEND@ @DEB_DEPEND_IFEXISTS@

 Package: @PACKAGE_NAME@
 Section: libs
--- a/mac-create-app-bundle.sh
+++ b/mac-create-app-bundle.sh
@ -86,20 +86,19 @@ if test -n "${QTDIR}"; then
    fi
 fi

-# Step 5: copy or create info.plist
-infoplist=$(find ${apptarget}/Contents/Resources -name Info.plist)
-if test -f "${infoplist}"; then
-    cp -a "${infoplist}" ${apptarget}/Contents/Info.plist
+# Step 5: copy local or create new info.plist
+if test -f Info.plist; then
+    cp -a Info.plist ${apptarget}/Contents/Info.plist
 else
    cat > ${apptarget}/Contents/Info.plist <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-  <dict>
+  <qdict>
    <key>CFBundleIdentifier</key>
    <string>${project}</string>
    <key>CFBundleExecutable</key>
-    <string>${executablefile##/}</string>
+    <string>${executablefile##*/}</string>
  </dict>
 </plist>
 EOF