From d3744a8c51a842ad833c3f69af5359122504b12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sun, 1 Nov 2015 23:59:27 +0000
Subject: [PATCH] new author url

---
 AUTHORS                     |  2 +-
 ChangeLog                   | 25 +++++++++++++++++++++++++
 ax_init_standard_project.m4 |  7 +++++--
 bootstrap.sh                |  7 ++++---
 debian/control.in           |  4 ++--
 resolve-debbuilddeps.sh     |  3 +++
 6 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index bd79912..86ccdef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1 @@
-Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>
+Marc Wäckerlin (https://marc.wäckerlin.ch) <marc@waeckerlin.org>
diff --git a/ChangeLog b/ChangeLog
index 3feb91e..38573c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2015-09-29 07:55  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  build-resource-file.sh, configure.ac, resolve-debbuilddeps.sh,
+	  resolve-rpmbuilddeps.sh, uninstall-64-and-32-bit-linux.sh: by
+	  default, disable qt debug output
+
+2015-09-04 09:27  marc
+
+	* bootstrap.sh, debian/control.in: updated build
+
+2015-09-04 09:06  marc
+
+	* debian/control.in: updated build
+
+2015-09-04 08:57  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  resolve-debbuilddeps.sh: updated build
+
+2015-08-28 12:58  marc
+
+	* debian/proxyface-dev.install: translationsdir added to debian
+	  installation
+
 2015-08-27 13:03  marc
 
 	* ChangeLog, src/proxyface.pc.in: translationsdir fixed
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 9f68063..5baecf4 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -207,13 +207,16 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-standard-project-targets], [makefile.in])
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
-EXTRA_DIST += bootstrap.sh
+EXTRA_DIST += bootstrap.sh ax_init_standard_project.m4 ax_cxx_compile_stdcxx_11.m4 \
+              ax_check_qt.m4 resolve-debbuilddeps.sh resolve-rpmbuilddeps.sh \
+              build-resource-file.sh mac-create-app-bundle.sh
+
 clean-standard-project-targets:
 	-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
 	-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz
 distclean-standard-project-targets:
 	-rm -r autom4te.cache
-	-rm aclocal.m4 config.guess config.sub configure depcomp compile install-sh ltmain.sh makefile missing mkinstalldirs
+	-rm aclocal.m4 config.guess config.sub configure depcomp compile install-sh ltmain.sh makefile missing mkinstalldirs test-driver
 maintainer-clean-standard-project-targets:
 	-rm makefile.in
 #### End: $0
diff --git a/bootstrap.sh b/bootstrap.sh
index 3154dba..d3e8653 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -672,7 +672,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyreplace INLINE_SOURCES YES
         doxyreplace GENERATE_TESTLIST YES
         doxyreplace GENERATE_TREEVIEW NO
-        doxyreplace SEARCHENGINE YES
+        doxyreplace SEARCHENGINE NO
         doxyreplace GENERATE_HTML YES
         doxyreplace GENERATE_LATEX NO
         doxyreplace LATEX_BATCHMODE YES
@@ -698,11 +698,12 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @BUILD_DATE@
 EOF
+    BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default | 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)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; 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 | qt4-default | 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)
+Build-Depends: ${BUILD-DEPENDS}
 
 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
@@ -716,7 +717,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version})
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
diff --git a/debian/control.in b/debian/control.in
index 2ecf2d7..b259bf2 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,7 +1,7 @@
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, mscgen, qt5-default | qt4-default | 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,
+Build-Depends: debhelper, pkg-config, autotools-dev, lsb-release, doxygen, graphviz, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools
 
 Package: @PACKAGE_NAME@
 Section: libs
@@ -13,6 +13,6 @@ Description: @DESCRIPTION@
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= ${binary:Version})
+Depends: @PACKAGE_NAME@ (= ${binary:Version}), debhelper, pkg-config, autotools-dev, lsb-release , doxygen, graphviz, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
diff --git a/resolve-debbuilddeps.sh b/resolve-debbuilddeps.sh
index 9da3c80..6ceef6b 100755
--- a/resolve-debbuilddeps.sh
+++ b/resolve-debbuilddeps.sh
@@ -15,8 +15,11 @@ SCHROOTNAME="$1"
 sed 's,@[^@]*@, dummytext,g' debian/control.in > debian/control
 
 if test -n "${SCHROOTNAME}"; then
+  schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get install -y dpkg-dev
   DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
 else
+  sudo apt-get install -y dpkg-dev
+  sudo apt-get update
   DEPS=$(dpkg-checkbuilddeps 2>&1 || true)
 fi
 DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')