From bdf96008d23a1ca00439c62e27cc20cd89f90abd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Sun, 1 Nov 2015 23:53:19 +0000 Subject: [PATCH] new author url --- AUTHORS | 2 +- ChangeLog | 80 +++++++++++++++++++++++++++++++++++++ ax_init_standard_project.m4 | 32 ++++++++++----- bootstrap.sh | 7 ++-- resolve-debbuilddeps.sh | 3 ++ 5 files changed, 111 insertions(+), 13 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 Wäckerlin (https://marc.wäckerlin.ch) diff --git a/ChangeLog b/ChangeLog index 437f185..0c0914a 100644 --- a/ChangeLog +++ b/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 diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index b255993..b49e82e 100644 --- a/ax_init_standard_project.m4 +++ b/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" && \ - AM_CPPFLAGS="${AM_CPPFLAGS} -DDEBUG" && \ - AM_CXXFLAGS="${AM_CXXFLAGS:-} -ggdb3 -O0" && \ - AM_LDFLAGS="${AM_LDFLAGS} -ggdb3 -O0"]) + [have_debug="$enableval"], [have_debug="no"]) 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 < 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}')