pinentry-x2go.git - build-main (branch) updated: 0.7.5.5-3-g1f0101b - x2go-commits

20 Aug 2012

The branch, build-main has been updated
       via  1f0101b57c9c648fcb3178253e54220f3089edfe (commit)
       via  fd1376d46c31fe6fd1e6737d782787731802ae30 (commit)
       via  d7d308014a508135248d347b4b48b377833a994d (commit)
       via  dfa5d88aeca83fb98260daebcff062b093a3543e (commit)
       via  247e2c24785293a2e3c0e6345a299fb941cd8078 (commit)
       via  b422ed7810160933b76b905c9761ae3cf804852d (commit)
       via  4e6007e6652da2c6eb7805b684be8c834a35ae66 (commit)
       via  c5e7945cc237ce357427d642c877351358812dee (commit)
       via  cdf1e7a55fcc1096f0cb2b274ff9e76a73c83777 (commit)
       via  b7cf404cff4fac37045ed5fea4d57dabb774d9e9 (commit)
      from  9768f37b24724bb02bcc53e08d01231950685746 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 NEWS                      |    8 ++++++++
 VERSION                   |    2 +-
 configure.ac              |   14 ++++++++++----
 debian/changelog          |   27 +++++++++++++++++++++++++++
 debian/control            |    6 +++++-
 debian/pinentry-x2go.info |    1 -
 doc/stamp-vti             |    8 ++++----
 doc/version.texi          |    8 ++++----
 8 files changed, 59 insertions(+), 15 deletions(-)
 delete mode 100644 debian/pinentry-x2go.info

The diff of changes is:

diff --git a/NEWS b/NEWS
index eeb3560..2f4b993 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,21 @@
+Noteworthy changes in version 0.7.5.5 (2012-06-21)
+------------------------------------------------
+
+ * Continue development...
+
+
 Noteworthy changes in version 0.7.5.4 (2012-06-14)
 ------------------------------------------------
 
  * Drop more build cruft from /doc folder.
 
+
 Noteworthy changes in version 0.7.5.3 (2012-06-13)
 ------------------------------------------------
 
  * Update of copyright headers in pinentry-x2go folder.
 
+
 Noteworthy changes in version 0.7.5.2 (2012-06-13)
 ------------------------------------------------
 
diff --git a/VERSION b/VERSION
index 8840cbf..8708313 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-0.7.5.4
+0.7.5.5
 
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@lists.berlios.de])
+AC_INIT(pinentry-x2go, 0.7.5.5, [x2go-dev@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 af8b543..e2b8dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+pinentry-x2go (0.7.5.5-0~x2go2) UNRELEASED; urgency=low
+
+  * Do not install the pinentry.info file anymore, it conflicts with the info
+    file from the default/original pinentry package.
+  * Add Conflicts/Replaces entries for pinentry-x2go-gtk.
+  * Bump Standards to 3.9.3.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Mon, 20 Aug 2012 09:36:13 +0200
+
+pinentry-x2go (0.7.5.5-0~x2go1) unstable; urgency=low
+
+  [ 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@das-netzwerkteam.de>  Sun, 15 Jul 2012 09:52:18 +0200
+
 pinentry-x2go (0.7.5.4-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.7.5.4):
diff --git a/debian/control b/debian/control
index bd84839..a7a5b6d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
 Uploaders:
  Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libqt4-gui, libcap-dev, libglib2.0-dev (>= 2.15.5), m4, qt4-qmake, libqt4-dev, dh-autoreconf
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://code.x2go.org/releases/source/pinentry-x2go
 Vcs-Git: git://code.x2go.org/pinentry-x2go.git
 Vcs-Browser: http://code.x2go.org/gitweb?p=pinentry-x2go.git;a=summary
@@ -13,6 +13,10 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=pinentry-x2go.git;a=summary
 Package: pinentry-x2go
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui
+Conflicts:
+ pinentry-x2go-gtk
+Replaces:
+ pinentry-x2go-gtk
 Description: Qt4-based PIN or pass-phrase entry dialog for x2goclient
  This package contains a program that allows for entry of PINs or
  pass phrases.
diff --git a/debian/pinentry-x2go.info b/debian/pinentry-x2go.info
deleted file mode 100644
index 0ce3840..0000000
--- a/debian/pinentry-x2go.info
+++ /dev/null
@@ -1 +0,0 @@
-doc/pinentry.info
diff --git a/doc/stamp-vti b/doc/stamp-vti
index b12cdf8..6a6ba4a 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 13 Octobre 2011
-@set UPDATED-MONTH Octobre 2011
-@set EDITION 0.7.5.2
-@set VERSION 0.7.5.2
+@set UPDATED 21 June 2012
+@set UPDATED-MONTH 21 June 2012
+@set EDITION 0.7.5.5
+@set VERSION 0.7.5.5
diff --git a/doc/version.texi b/doc/version.texi
index 1ee1518..70aa033 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 13 Octobre 2011
-@set UPDATED-MONTH Octobre 2011
-@set EDITION 0.7.5.4
-@set VERSION 0.7.5.4
+@set UPDATED 21 June 2012 
+@set UPDATED-MONTH June 2012
+@set EDITION 0.7.5.5
+@set VERSION 0.7.5.5


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).

    