x2go-commits August 2012

x2go-commits@lists.x2go.org

1 participants
46 discussions

x2goclient.git - master (branch) updated: 3.99.2.2-4-g9ff71ea
by git-admin＠x2go.org 20 Aug '12

20 Aug '12

The branch, master has been updated via 9ff71ea6c51434a08b405ffa8636ce41666a2d32 (commit) from c75080d0571c29aa8a75b52e02a7a90610144739 (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 9ff71ea6c51434a08b405ffa8636ce41666a2d32 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Aug 15 15:14:27 2012 +0200 Continue development... -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Aug 2012 15:14:05 +0200 ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 ++++++ desktop/x2goclient.desktop | 2 +- version.h | 2 +- x2goplugin.rc | 10 +++++----- 5 files changed, 14 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 04a87a5..7b9e24b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.2.2 +3.99.2.3 diff --git a/debian/changelog b/debian/changelog index 28dec6a..3616828 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (3.99.2.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Aug 2012 15:14:05 +0200 + x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low * Add Conflicts/Replaces for x2goclient-gtk. diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index 9b38db6..b54d1f8 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.99.2.2 +Version=3.99.2.3 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/version.h b/version.h index 98195c3..e160175 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define VERSION "3.99.2.2" +#define VERSION "3.99.2.3" diff --git a/x2goplugin.rc b/x2goplugin.rc index c9604a6..0dd82c7 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,2,2 - PRODUCTVERSION 3,99,2,2 + FILEVERSION 3,99,2,3 + PRODUCTVERSION 3,99,2,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 2 ,2\0" + VALUE "FileVersion", "3, 99, 2 ,3\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.2.2\0" - VALUE "ProductVersion", "3, 99, 2, 2\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.2.3\0" + VALUE "ProductVersion", "3, 99, 2, 3\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - build-main (branch) updated: 3.99.2.2-3-gc75080d
by git-admin＠x2go.org 20 Aug '12

20 Aug '12

The branch, build-main has been updated via c75080d0571c29aa8a75b52e02a7a90610144739 (commit) via 9435e0168786933381c4d805e7a1fff60ada5185 (commit) via 462dcfefe3013bdd4c10fd4614eb884e5017ee4a (commit) from a0461e289073d223db2f486fa171f7fbd3be7707 (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: debian/changelog | 6 ++++++ debian/control | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index deb8d65..28dec6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low + + * Add Conflicts/Replaces for x2goclient-gtk. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 20 Aug 2012 09:58:47 +0200 + x2goclient (3.99.2.2-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index e522b31..f58d02b 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,11 @@ Depends: Recommends: openssh-server Suggests: - pinentry-x2go + pinentry-x2go +Conflicts: + x2goclient-gtk +Replaces: + x2goclient-gtk Description: X2Go Client application (Qt4) X2Go is a serverbased computing environment with - session resuming hooks/post-receive -- x2goclient.git (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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 3.99.2.2-3-gc75080d
by git-admin＠x2go.org 20 Aug '12

20 Aug '12

The branch, master has been updated via c75080d0571c29aa8a75b52e02a7a90610144739 (commit) via 9435e0168786933381c4d805e7a1fff60ada5185 (commit) from 462dcfefe3013bdd4c10fd4614eb884e5017ee4a (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 c75080d0571c29aa8a75b52e02a7a90610144739 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 20 09:59:07 2012 +0200 release revision -0~x2go2 commit 9435e0168786933381c4d805e7a1fff60ada5185 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 20 09:58:16 2012 +0200 Revert "Continue development..." This reverts commit 462dcfefe3013bdd4c10fd4614eb884e5017ee4a. ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- debian/changelog | 6 +++--- debian/control | 6 +++++- desktop/x2goclient.desktop | 2 +- version.h | 2 +- x2goplugin.rc | 10 +++++----- 6 files changed, 16 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/VERSION b/VERSION index 7b9e24b..04a87a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.99.2.3 +3.99.2.2 diff --git a/debian/changelog b/debian/changelog index 56953cf..28dec6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -x2goclient (3.99.2.3-0~x2go1) UNRELEASED; urgency=low +x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low - * Continue development... + * Add Conflicts/Replaces for x2goclient-gtk. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 15 Aug 2012 15:14:05 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 20 Aug 2012 09:58:47 +0200 x2goclient (3.99.2.2-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index e522b31..f58d02b 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,11 @@ Depends: Recommends: openssh-server Suggests: - pinentry-x2go + pinentry-x2go +Conflicts: + x2goclient-gtk +Replaces: + x2goclient-gtk Description: X2Go Client application (Qt4) X2Go is a serverbased computing environment with - session resuming diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop index b54d1f8..9b38db6 100644 --- a/desktop/x2goclient.desktop +++ b/desktop/x2goclient.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=3.99.2.3 +Version=3.99.2.2 Type=Application Name=X2Go Client Exec=/usr/bin/x2goclient diff --git a/version.h b/version.h index e160175..98195c3 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define VERSION "3.99.2.3" +#define VERSION "3.99.2.2" diff --git a/x2goplugin.rc b/x2goplugin.rc index 0dd82c7..c9604a6 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,2,3 - PRODUCTVERSION 3,99,2,3 + FILEVERSION 3,99,2,2 + PRODUCTVERSION 3,99,2,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 2 ,3\0" + VALUE "FileVersion", "3, 99, 2 ,2\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2012 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.2.3\0" - VALUE "ProductVersion", "3, 99, 2, 3\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.2.2\0" + VALUE "ProductVersion", "3, 99, 2, 2\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (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 "x2goclient.git" (X2Go Client).

1 0

pinentry-x2go.git - build-main (branch) updated: 0.7.5.5-3-g1f0101b
by git-admin＠x2go.org 20 Aug '12

20 Aug '12

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(a)lists.berlios.de] +AC_INIT(pinentry-x2go, 0.7.5.5, [x2go-dev(a)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(a)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(a)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(a)obviously-nice.de> Uploaders: Mike Gabriel <mike.gabriel(a)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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.5-3-g1f0101b
by git-admin＠x2go.org 20 Aug '12

20 Aug '12

The branch, master has been updated via 1f0101b57c9c648fcb3178253e54220f3089edfe (commit) from fd1376d46c31fe6fd1e6737d782787731802ae30 (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 1f0101b57c9c648fcb3178253e54220f3089edfe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 20 09:40:06 2012 +0200 Bump Standards to 3.9.3. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 ++--- debian/control | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46f22ae..e2b8dab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -pinentry-x2go (0.7.5.6-0~x2go1) UNRELEASED; urgency=low +pinentry-x2go (0.7.5.5-0~x2go2) UNRELEASED; urgency=low - * New upstream version (0.7.5.6): - - Continue development... * 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(a)das-netzwerkteam.de> Mon, 20 Aug 2012 09:36:13 +0200 diff --git a/debian/control b/debian/control index 57b267f..a7a5b6d 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Uploaders: Mike Gabriel <mike.gabriel(a)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 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).

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.5-2-gfd1376d
by git-admin＠x2go.org 20 Aug '12

20 Aug '12

The branch, master has been updated via fd1376d46c31fe6fd1e6737d782787731802ae30 (commit) via d7d308014a508135248d347b4b48b377833a994d (commit) from dfa5d88aeca83fb98260daebcff062b093a3543e (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 fd1376d46c31fe6fd1e6737d782787731802ae30 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 20 09:38:51 2012 +0200 Add Conflicts/Replaces entries for pinentry-x2go-gtk. commit d7d308014a508135248d347b4b48b377833a994d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Aug 20 09:37:40 2012 +0200 Do not install the pinentry.info file anymore, it conflicts with the info file from the default/original pinentry package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 10 ++++++++++ debian/control | 4 ++++ debian/pinentry-x2go.info | 1 - 3 files changed, 14 insertions(+), 1 deletions(-) delete mode 100644 debian/pinentry-x2go.info The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a5ff29d..46f22ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +pinentry-x2go (0.7.5.6-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.7.5.6): + - Continue development... + * 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. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 20 Aug 2012 09:36:13 +0200 + pinentry-x2go (0.7.5.5-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/debian/control b/debian/control index bd84839..57b267f 100644 --- a/debian/control +++ b/debian/control @@ -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 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).

1 0

python-x2go.git - master (branch) updated: 0.2.0.9-5-g60d5a88
by git-admin＠x2go.org 17 Aug '12

17 Aug '12

The branch, master has been updated via 60d5a88d02fbf006f76219e8aae57e0d9a081eee (commit) from 187ce289743a817b1b11e1422e37a4b8968df03e (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 60d5a88d02fbf006f76219e8aae57e0d9a081eee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 17 16:29:23 2012 +0200 Continue development... Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ae02401..314e62f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 18:29:04 +0200 + python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low * Make sure we can build against python-gevent provided on diff --git a/x2go/__init__.py b/x2go/__init__.py index 11643bf..706d488 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.9' +__VERSION__ = '0.2.0.10' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - build-main (branch) updated: 0.2.0.9-4-g187ce28
by git-admin＠x2go.org 17 Aug '12

17 Aug '12

The branch, build-main has been updated via 187ce289743a817b1b11e1422e37a4b8968df03e (commit) via 8429902d3804c9725844d4ebf007a2f6fa88a6e4 (commit) via 05040a9ad2dac31dd5f959b3dbeb481d3e48bffa (commit) via 70df0a5a7e03d92e900ac83589faf8f8f0b8c267 (commit) from 0d756ed31c4338a06dd19ef597f20f07d7261c4b (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: debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 859c9ff..ae02401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low + + * Make sure we can build against python-gevent provided on + packages.x2go.org. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 18:13:19 +0200 + python-x2go (0.2.0.9-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.9): diff --git a/debian/control b/debian/control index e5e995a..cc1a956 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, - python-gevent (>= 0.13.6), + python-gevent (>= 0.13.6-0~), python-paramiko, python-cups, python-xlib, hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

python-x2go.git - master (branch) updated: 0.2.0.9-4-g187ce28
by git-admin＠x2go.org 17 Aug '12

17 Aug '12

The branch, master has been updated via 187ce289743a817b1b11e1422e37a4b8968df03e (commit) via 8429902d3804c9725844d4ebf007a2f6fa88a6e4 (commit) via 05040a9ad2dac31dd5f959b3dbeb481d3e48bffa (commit) from 70df0a5a7e03d92e900ac83589faf8f8f0b8c267 (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 187ce289743a817b1b11e1422e37a4b8968df03e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 17 18:13:43 2012 +0200 package revision 0~x2go2 commit 8429902d3804c9725844d4ebf007a2f6fa88a6e4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 17 18:13:18 2012 +0200 Make sure we can build against python-gevent provided on packages.x2go.org. commit 05040a9ad2dac31dd5f959b3dbeb481d3e48bffa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 17 18:12:22 2012 +0200 Revert "Continue development..." This reverts commit 70df0a5a7e03d92e900ac83589faf8f8f0b8c267. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 ++++--- debian/control | 2 +- x2go/__init__.py | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2852e8f..ae02401 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low - * Continue development... + * Make sure we can build against python-gevent provided on + packages.x2go.org. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:29:04 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 18:13:19 +0200 python-x2go (0.2.0.9-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index e5e995a..cc1a956 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, - python-gevent (>= 0.13.6), + python-gevent (>= 0.13.6-0~), python-paramiko, python-cups, python-xlib, diff --git a/x2go/__init__.py b/x2go/__init__.py index 706d488..11643bf 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.10' +__VERSION__ = '0.2.0.9' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.4-1-g6aae7a9
by git-admin＠x2go.org 17 Aug '12

17 Aug '12

The branch, master has been updated via 6aae7a97b952b6211d8993cea97ec05564cff287 (commit) from 0bea1484b609f45b77cae90dafd096525e2dbcbe (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 6aae7a97b952b6211d8993cea97ec05564cff287 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Aug 17 16:39:07 2012 +0200 Contine development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ pyhoca/cli/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a076235..3588698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-cli (0.2.0.5-0~x2go1) UNRELEASED; urgency=low + + * Contine development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 17 Aug 2012 16:38:54 +0200 + pyhoca-cli (0.2.0.4-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.4): diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 428dbc9..b742c4a 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.2.0.4" +__VERSION__ = "0.2.0.5" from frontend import * hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits August 2012