[X2go-Commits] pinentry-x2go.git - master (branch) updated: 0.7.5.4-6-g247e2c2

[X2Go dev team]

The branch, master has been updated
       via  247e2c24785293a2e3c0e6345a299fb941cd8078 (commit)
       via  b422ed7810160933b76b905c9761ae3cf804852d (commit)
       via  4e6007e6652da2c6eb7805b684be8c834a35ae66 (commit)
       via  c5e7945cc237ce357427d642c877351358812dee (commit)
       via  cdf1e7a55fcc1096f0cb2b274ff9e76a73c83777 (commit)
      from  b7cf404cff4fac37045ed5fea4d57dabb774d9e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 247e2c24785293a2e3c0e6345a299fb941cd8078
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Jun 25 17:31:54 2012 +0200

    Provide CPPFLAGS for QMAKE_CFLAGS and QMAKE_CXXFLAGS. Provide CPPFLAGS first.

commit b422ed7810160933b76b905c9761ae3cf804852d
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Jun 25 17:26:48 2012 +0200

    Provide several names for qmake-qt4, become more cross-distro tolerant.

commit 4e6007e6652da2c6eb7805b684be8c834a35ae66
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Jun 25 17:24:59 2012 +0200

    Avoid warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body.

commit c5e7945cc237ce357427d642c877351358812dee
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Jun 25 17:23:21 2012 +0200

    The package does not use GNU mode. Mark it as such. Makefile.am: error: required file './ChangeLog' not found. Also replace the totally ancient AM_INIT_AUTOMAKE syntax.

commit cdf1e7a55fcc1096f0cb2b274ff9e76a73c83777
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jun 25 17:21:01 2012 +0200

    Set version and project name in configure.ac template.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac     |   14 ++++++++++----
 debian/changelog |   14 +++++++++++++-
 2 files changed, 23 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/configure.ac b/configure.ac
index f92dbf1..af69073 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,10 @@ min_automake_version="1.7.6"
 
 # Remember to remove the "-cvs" suffix *before* a release and to bump the
 # version number immediately *after* a release and to re-append the suffix.
-AC_INIT(pinentry, 0.7.5.2, [x2go-dev at lists.berlios.de])
+AC_INIT(pinentry-x2go, 0.7.5.5, [x2go-dev at lists.berlios.de])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(pinentry/pinentry.h)
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([foreign])
 
 AC_GNU_SOURCE
 
@@ -100,7 +100,7 @@ if test "$GCC" = yes; then
     AC_MSG_CHECKING([if gcc supports -Wno-pointer-sign])
     _gcc_cflags_save=$CFLAGS
     CFLAGS="-Wno-pointer-sign"
-    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]),_gcc_psign=yes,_gcc_psign=no)
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],_gcc_psign=yes,_gcc_psign=no)
     AC_MSG_RESULT($_gcc_psign)
     CFLAGS=$_gcc_cflags_save;
     if test x"$_gcc_psign" = xyes ; then
@@ -158,7 +158,13 @@ Makefile
 
 AC_OUTPUT
 
-cd pinentry-x2go && qmake-qt4 PREFIX="$prefix" QMAKE_CFLAGS="$CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS $CPPFLAGS"
+for qmake in $(which qmake-qt4 qmake 2>/dev/null); do
+  break;
+done;
+if test -z "$qmake"; then
+  AC_MSG_ERROR([qmake not found])
+fi;
+cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS"
 
 AC_MSG_NOTICE([
 	Pinentry-X2Go v${VERSION} has been configured.
diff --git a/debian/changelog b/debian/changelog
index 64ddbe3..4ce81ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
 pinentry-x2go (0.7.5.5-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  [ Mike Gabriel ]
+  * New upstream version (0.7.5.5):
+    - Set version and project name in configure.ac template.
+
+  [ Jan Engelhard ]
+  * New upstream version (0.7.5.5):
+    - The package does not use GNU mode. Mark it as such. Makefile.am: error:
+      required file './ChangeLog' not found. Also replace the totally ancient
+      AM_INIT_AUTOMAKE syntax.
+    - Avoid warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body.
+    - Provide several names for qmake-qt4, become more cross-distro tolerant.
+    - Provide CPPFLAGS for QMAKE_CFLAGS and QMAKE_CXXFLAGS. Provide CPPFLAGS
+      first.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 21 Jun 2012 11:28:55 +0200
 


hooks/post-receive
-- 
pinentry-x2go.git (PinEntry Dialog (Qt) for X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pinentry-x2go.git" (PinEntry Dialog (Qt) for X2Go Client).