new author url

AUTHORS

@@ -1 +1 @@
-Marc Wäckerlin (http://marc.waeckerlin.org) <marc@waeckerlin.org>
+Marc Wäckerlin (https://marc.wäckerlin.ch) <marc@waeckerlin.org>

ChangeLog

@@ -1,3 +1,83 @@
+2015-09-22 11:36  marc
+
+	* ax_init_standard_project.m4: fixed little type in build that
+	  affected only mac osx build
+
+2015-09-22 11:12  marc
+
+	* ax_init_standard_project.m4: fixed little type in build that
+	  affected only mac osx build - strange
+
+2015-09-22 07:42  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, configure.ac,
+	  src/cryptoki.cxx, src/cryptoki.hxx, src/pcsc.hxx: don't throw
+	  exception in destructur when card has been removed
+
+2015-09-14 09:01  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  build-resource-file.sh, debian/control.in,
+	  debian/libpcscxx-dev.install, resolve-debbuilddeps.sh,
+	  resolve-rpmbuilddeps.sh: added resolve-rpmbuilddeps.sh
+
+2015-09-01 12:28  marc
+
+	* debian/control.in: install qtX-default so that it fits for all
+	  distributions
+
+2015-09-01 12:26  marc
+
+	* debian/control.in: don't install qtX-default
+
+2015-09-01 12:18  marc
+
+	* debian/control.in: install qtX-default
+
+2015-09-01 12:14  marc
+
+	* resolve-debbuilddeps.sh: new script to resolve debian build
+	  dependencies
+
+2015-09-01 12:13  marc
+
+	* resolve-debbuilddeps.sh: new script to resolve debian build
+	  dependencies
+
+2015-09-01 12:00  marc
+
+	* ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh,
+	  resolve-debbuilddeps.sh: new script to resolve debian build
+	  dependencies
+
+2015-08-17 14:52  marc
+
+	* src/cryptaux.hxx: fix ambiguity
+
+2015-08-17 14:47  marc
+
+	* src/cryptaux.hxx: fix ambiguity
+
+2015-08-17 14:02  marc
+
+	* ax_init_standard_project.m4, bootstrap.sh: Debian sid is more
+	  restrictive in time format
+
+2015-07-31 14:18  marc
+
+	* libpcscxx.spec.in: stupid fedora/centos does not handle
+	  /path/to/dir correctly
+
+2015-07-31 11:47  marc
+
+	* libpcscxx.spec.in: graphviz must not be used in fedora-20,
+	  otherise it never terminates
+
+2015-07-31 10:44  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  configure.ac: fixed version number
+
 2015-07-30 14:13  marc
 
 	* ax_check_qt.m4: qt4 in centos

ax_init_standard_project.m4

@@ -12,7 +12,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p')
+      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
       break;
     fi
   done
@@ -21,7 +21,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p')
+      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
       break;
     fi
   done
@@ -35,7 +35,7 @@ m4_define(x_minor_diff, mrw_esyscmd_s([
   SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/^Revision: //p')
+      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
       break;
     fi;
   done
@@ -151,6 +151,15 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([AUTHOR])
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
+  DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null)
+  case "${DISTRIBUTOR// /-}" in
+    (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);;
+    (Debian) DEBIAN=1; AX_SUBST(DEBIAN);;
+    (SUSE-LINUX) SUSE=1; AX_SUBST(SUSE);;
+    (Fedora) FEDORA=1; AX_SUBST(FEDORA);;
+    (Centos) CENTOS=1; AX_SUBST(CENTOS);;
+  esac
+  AX_SUBST(DISTRIBUTOR)
   BUILD_NUMBER=${BUILD_NUMBER:-1}
   AX_SUBST(BUILD_NUMBER)
   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
@@ -181,13 +190,15 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AC_ARG_ENABLE(debug,
     [AS_HELP_STRING([--enable-debug],
                     [compile for debugger])],
-    [have_debug="$enableval"; test "$enableval" = "yes" &&  \
+    [have_debug="$enableval"], [have_debug="no"])
-       AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG" && \
-       AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0" && \
-       AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"])
   AM_CONDITIONAL(DEBUG, test "$enableval" = "yes")
   if test "$have_debug" == "yes"; then
     AC_MSG_NOTICE([Debug compile mode enabled]);
+    AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG"
+    AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0"
+    AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"
+  else
+    AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
   fi
 
   AC_CONFIG_FILES([makefile])
@@ -196,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

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

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}')