This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pinentry-x2go. from e8ca2a6 New translation of PIN-Entry X2Go into Spanish. new f6366b0 drop binary translation file new f0a1191 Update config.h.in. new 843e6b9 Update German translation file. new 7dabdf9 debian/rules: Remove more buildcruft. new 027f24f Run lrelease during autoreconf. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: config.h.in | 3 +++ configure.ac | 9 ++++++++- debian/changelog | 4 ++++ debian/rules | 2 ++ pinentry-x2go/pinentry-x2go_de.qm | Bin 428 -> 0 bytes pinentry-x2go/pinentry-x2go_de.ts | 13 +++++++------ 6 files changed, 24 insertions(+), 7 deletions(-) delete mode 100644 pinentry-x2go/pinentry-x2go_de.qm -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit f6366b0f79ddd859a332000336526a21b1284862 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 25 17:35:56 2014 +0100 drop binary translation file --- pinentry-x2go/pinentry-x2go_de.qm | Bin 428 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pinentry-x2go/pinentry-x2go_de.qm b/pinentry-x2go/pinentry-x2go_de.qm deleted file mode 100644 index 5204283..0000000 Binary files a/pinentry-x2go/pinentry-x2go_de.qm and /dev/null differ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit f0a1191c0040b050a1ecabdca74f11895c3fe363 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 25 17:51:09 2014 +0100 Update config.h.in. --- config.h.in | 3 +++ debian/changelog | 1 + 2 files changed, 4 insertions(+) diff --git a/config.h.in b/config.h.in index 55d0743..0f7fc0f 100644 --- a/config.h.in +++ b/config.h.in @@ -94,6 +94,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/debian/changelog b/debian/changelog index aa7a06e..389cb95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pinentry-x2go (0.7.5.7-0x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * New upstream version (0.7.5.7): - Set Pinentry title to X2Go Pinpad (was: X2GO ...). + - Update config.h.in. * debian/source/format: + Add file, use format 1.0. * debian/rules: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit 7dabdf9e17df7306271d798dc2cbdfa56ab63369 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 25 17:52:43 2014 +0100 debian/rules: Remove more buildcruft. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 24383b8..b9422d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ pinentry-x2go (0.7.5.7-0x2go1) UNRELEASED; urgency=low + Add file, use format 1.0. * debian/rules: + Don't fail on dh_auto_clean. + + Remove more buildcruft. * pinentry-x2go.spec: + Add spec file for building RPM packages. Inspired by OpenSuSE spec file. diff --git a/debian/rules b/debian/rules index 1f51ee4..04fb07d 100755 --- a/debian/rules +++ b/debian/rules @@ -30,3 +30,5 @@ override_dh_auto_clean: rm -f missing rm -f pinentry/Makefile.in rm -f secmem/Makefile.in + rm -f doc/mdate-sh + rm -f doc/texinfo.tex \ No newline at end of file -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit 843e6b9525f868d2da5f6b0ff4f5c6747f9fd066 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 25 17:51:49 2014 +0100 Update German translation file. --- debian/changelog | 1 + pinentry-x2go/pinentry-x2go_de.ts | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 389cb95..24383b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pinentry-x2go (0.7.5.7-0x2go1) UNRELEASED; urgency=low * New upstream version (0.7.5.7): - Set Pinentry title to X2Go Pinpad (was: X2GO ...). - Update config.h.in. + - Update German translation file. * debian/source/format: + Add file, use format 1.0. * debian/rules: diff --git a/pinentry-x2go/pinentry-x2go_de.ts b/pinentry-x2go/pinentry-x2go_de.ts index 5fe011d..df388e1 100644 --- a/pinentry-x2go/pinentry-x2go_de.ts +++ b/pinentry-x2go/pinentry-x2go_de.ts @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="1.1" language="de"> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>PinEntryDialog</name> <message> - <location filename="pinentrydialog.cpp" line="35"/> + <location filename="pinentrydialog.cpp" line="38"/> <source>X2Go Pinpad</source> - <translation></translation> + <translation>X2Go PIN-Pad</translation> </message> <message> - <location filename="pinentrydialog.cpp" line="162"/> + <location filename="pinentrydialog.cpp" line="166"/> <source>Please, enter your PIN</source> - <translation type="unfinished">Geben Sie bitte Ihre PIN ein</translation> + <translation>Geben Sie bitte Ihre PIN ein</translation> </message> </context> <context> @@ -18,7 +19,7 @@ <message> <location filename="templatedlg.ui" line="13"/> <source>Dialog</source> - <translation type="unfinished"></translation> + <translation>Dialog</translation> </message> </context> </TS> -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit 027f24f7ef0606a4af1ef856a9141f6d5155f641 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 25 17:53:02 2014 +0100 Run lrelease during autoreconf. --- configure.ac | 9 ++++++++- debian/changelog | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index af69073..7b5253f 100644 --- a/configure.ac +++ b/configure.ac @@ -158,13 +158,20 @@ Makefile AC_OUTPUT +for lrelease in $(which lrelease-qt4 lrelease 2>/dev/null); do + break; +done; for qmake in $(which qmake-qt4 qmake 2>/dev/null); do break; done; +if test -z "$lrelease"; then + AC_MSG_ERROR([lrelease not found]) +fi; 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" +( cd pinentry-x2go && "$lrelease" pinentry-x2go.pro; cd - 1>/dev/null;) +( cd pinentry-x2go && "$qmake" PREFIX="$prefix" QMAKE_CFLAGS="$CPPFLAGS $CFLAGS" QMAKE_LFLAGS="$LDFLAGS" QMAKE_CXXFLAGS="$CPPFLAGS $CXXFLAGS"; cd - 1>/dev/null;) AC_MSG_NOTICE([ Pinentry-X2Go v${VERSION} has been configured. diff --git a/debian/changelog b/debian/changelog index b9422d5..c60b0aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pinentry-x2go (0.7.5.7-0x2go1) UNRELEASED; urgency=low - Set Pinentry title to X2Go Pinpad (was: X2GO ...). - Update config.h.in. - Update German translation file. + - Run lrelease during autoreconf. * debian/source/format: + Add file, use format 1.0. * debian/rules: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
-
git-admin＠x2go.org