Restructuring: pinentry-tqtfeat/restructuring

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

199 files changed, 111 insertions, 1178 deletions

diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0001-avoid-self-describing-as-a-beta.patch b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0001-avoid-self-describing-as-a-beta.patch
deleted file mode 100644
index ac9b9137..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0001-avoid-self-describing-as-a-beta.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Wed, 13 May 2015 16:09:21 -0400
-Subject: avoid self-describing as a beta
-
-Using autoreconf against the source as distributed in tarball form
-invariably results in a package that thinks it's a "beta" package,
-which produces the "THIS IS A DEVELOPMENT VERSION" warning string.
-
-since we use dh_autoreconf, i need this patch to avoid producing
-builds that announce themselves as DEVELOPMENT VERSIONs.
-
-See discussion at:
-
- http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029065.html
----
- autogen.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index 9b36158..f381d48 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -249,7 +249,7 @@ if [ "$myhost" = "find-version" ]; then
-     fi
- 
-     beta=no
--    if [ -e .git ]; then
-+    if false; then
-       ingit=yes
-       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
-       tmp=$(echo "$tmp" | sed s/^"$package"//)
-@@ -265,8 +265,8 @@ if [ "$myhost" = "find-version" ]; then
-       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
-     else
-       ingit=no
--      beta=yes
--      tmp="-unknown"
-+      beta=no
-+      tmp=""
-       rev="0000000"
-       rvd="0"
-     fi
-@@ -453,7 +453,7 @@ EOF
- fi
- 
- # Check the git setup.
--if [ -d .git ]; then
-+if false; then
-   CP="cp -p"
-   # If we have a GNU cp we can add -v
-   if cp --version >/dev/null 2>/dev/null; then
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0002-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0002-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch
deleted file mode 100644
index 294ff005..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0002-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Vincent Bernat <bernat@debian.org>
-Date: Mon, 6 Feb 2017 02:38:59 -0500
-Subject: gtk2: When X11 input grabbing fails, try again over ~0.4 seconds.
-
-* gtk+-2/pinentry-gtk-2.c (grab_keyboard): Delay 1 ms before retrying
-keyboard grab, limit to about 0.2 seconds.
-(grab_pointer): Delay 1 ms before retrying pointer_grab, limit to
-about 0.2 seconds.
-
---
-
-These changes were proposed by Vincent Bernat in
-https://bugs.debian.org/851707#124
-
-Debian-bug-id: 851707
-Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
----
- gtk+-2/pinentry-gtk-2.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
-index 6d626cc..f329910 100644
---- a/gtk+-2/pinentry-gtk-2.c
-+++ b/gtk+-2/pinentry-gtk-2.c
-@@ -161,7 +161,7 @@ static int
- grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
- {
-   GdkGrabStatus err;
--  int tries = 0, max_tries = 4096;
-+  int tries = 0, max_tries = 2048;
-   (void)data;
- 
-   if (! pinentry->grab)
-@@ -170,7 +170,8 @@ grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
-   do
-     err = gdk_keyboard_grab (gtk_widget_get_window (win),
-                              FALSE, gdk_event_get_time (event));
--  while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE);
-+  while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE
-+         && (usleep(100), TRUE));
- 
-   if (err)
-     {
-@@ -194,7 +195,7 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
- {
-   GdkGrabStatus err;
-   GdkCursor *cursor;
--  int tries = 0, max_tries = 4096;
-+  int tries = 0, max_tries = 2048;
-   (void)data;
- 
-   /* Change the cursor for the duration of the grab to indicate that
-@@ -216,7 +217,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
-                             cursor,
-                             gdk_event_get_time (event));
-   while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE
--                                 || err == GDK_GRAB_ALREADY_GRABBED));
-+                                 || err == GDK_GRAB_ALREADY_GRABBED)
-+         && (usleep (100), TRUE));
- 
-   if (err)
-     {
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0003-tqt-updates-2023.diff b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0003-tqt-updates-2023.diff
deleted file mode 100644
index d1e316bd..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0003-tqt-updates-2023.diff
+++ /dev/null
@@ -1,302 +0,0 @@
-Description: pinentry-tqt:Update Q_ => TQ_ to ensure compliance with r14.1.x branch.
-Origin: https://mirror.git.trinitydesktop.org/gitea/TDE/extra-dependencies.git
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/tqt/secqinternal_p.h
-+++ b/tqt/secqinternal_p.h
-@@ -63,7 +63,7 @@
- class TQPainter;
- class TQPixmap;
- 
--class Q_EXPORT SecTQSharedDoubleBuffer
-+class TQ_EXPORT SecTQSharedDoubleBuffer
- {
- public:
-     enum DoubleBufferFlags {
---- a/tqt/secqlineedit.cpp
-+++ b/tqt/secqlineedit.cpp
-@@ -86,7 +86,7 @@
- #include "ntqaccessible.h"
- #endif
- 
--#ifndef QT_NO_ACCEL
-+#ifndef TQT_NO_ACCEL
- #include "ntqkeysequence.h"
- #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
- #else
-@@ -235,7 +235,7 @@
-     inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
-     inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
-     void removeSelectedText();
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
-     void copy( bool clipboard = TRUE ) const;
- #endif
-     inline bool inSelection( int x ) const
-@@ -1018,14 +1018,14 @@
- void SecTQLineEdit::setReadOnly( bool enable )
- {
-     d->readOnly = enable;
--#ifndef QT_NO_CURSOR
-+#ifndef TQT_NO_CURSOR
-     setCursor( enable ? arrowCursor : ibeamCursor );
- #endif
-     update();
- }
- 
- 
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
- /*!
-     Copies the selected text to the clipboard and deletes it, if there
-     is any, and if echoMode() is \c Normal.
-@@ -1081,7 +1081,7 @@
- #endif
- }
- 
--#endif // !QT_NO_CLIPBOARD
-+#endif // !TQT_NO_CLIPBOARD
- 
- /*!\reimp
- */
-@@ -1177,7 +1177,7 @@
- void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
- {
- 
--#ifndef QT_NO_CURSOR
-+#ifndef TQT_NO_CURSOR
-     if ( ( e->state() & MouseButtonMask ) == 0 ) {
- 	if ( !d->readOnly )
- 	  setCursor( ( d->inSelection( e->pos().x() ) ? arrowCursor : ibeamCursor ) );
-@@ -1193,7 +1193,7 @@
- */
- void SecTQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
- {
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
-     if (TQApplication::clipboard()->supportsSelection() ) {
- 	if ( e->button() == LeftButton ) {
- 	    d->copy( FALSE );
-@@ -1286,7 +1286,7 @@
- 	case Key_B:
- 	    cursorForward( e->state() & ShiftButton, -1 );
- 	    break;
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
- 	case Key_C:
- 	    copy();
- 	    break;
-@@ -1322,7 +1322,7 @@
- 		clear();
- 	    break;
- #endif
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
- 	case Key_V:
- 	    if ( !d->readOnly )
- 		paste();
-@@ -1431,7 +1431,7 @@
- 	    if ( !d->readOnly )
- 		undo();
- 	    break;
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
- 	case Key_F16: // Copy key on Sun keyboards
- 	    copy();
- 	    break;
-@@ -1720,7 +1720,7 @@
- 
- void SecTQLineEditPrivate::init( const SecTQString& txt )
- {
--#ifndef QT_NO_CURSOR
-+#ifndef TQT_NO_CURSOR
-     q->setCursor( readOnly ? arrowCursor : ibeamCursor );
- #endif
-     q->setFocusPolicy( TQWidget::StrongFocus );
---- a/tqt/secqlineedit.h
-+++ b/tqt/secqlineedit.h
-@@ -80,7 +80,7 @@
- class TQTextParagraph;
- class TQTextCursor;
- 
--class Q_EXPORT SecTQLineEdit : public TQFrame
-+class TQ_EXPORT SecTQLineEdit : public TQFrame
- {
-     TQ_OBJECT
-     TQ_ENUMS( EchoMode )
-@@ -127,7 +127,7 @@
- 
-     int alignment() const;
- 
--#ifndef QT_NO_COMPAT
-+#ifndef TQT_NO_COMPAT
-     void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); }
-     void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); }
- #endif
-@@ -153,7 +153,7 @@
-     bool isUndoAvailable() const;
-     bool isRedoAvailable() const;
- 
--#ifndef QT_NO_COMPAT
-+#ifndef TQT_NO_COMPAT
-     bool hasMarkedText() const { return hasSelectedText(); }
-     SecTQString markedText() const { return selectedText(); }
- #endif
-@@ -175,7 +175,7 @@
-     virtual void setSelection( int, int );
-     virtual void setCursorPosition( int );
-     virtual void setAlignment( int flag );
--#ifndef QT_NO_CLIPBOARD
-+#ifndef TQT_NO_CLIPBOARD
-     virtual void cut();
-     virtual void copy() const;
-     virtual void paste();
-@@ -204,7 +204,7 @@
-     void resizeEvent( TQResizeEvent * );
-     void drawContents( TQPainter * );
-     void windowActivationChange( bool );
--#ifndef QT_NO_COMPAT
-+#ifndef TQT_NO_COMPAT
-     void repaintArea( int, int ) { update(); }
- #endif
- 
---- a/tqt/secqstring.cpp
-+++ b/tqt/secqstring.cpp
-@@ -80,8 +80,8 @@
- // IMPORTANT! If you change these, make sure you also change the
- // "delete unicode" statement in ~SecTQStringData() in SecTQString.h correspondingly!
- 
--#define QT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
--#define QT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
-+#define TQT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
-+#define TQT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
- 
- 
- /*****************************************************************************
-@@ -188,7 +188,7 @@
-     \sa TQChar TQCString TQByteArray SecTQConstString
- */
- 
--Q_EXPORT SecTQStringData *SecTQString::shared_null = 0;
-+TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0;
- QT_STATIC_CONST_IMPL SecTQString SecTQString::null;
- QT_STATIC_CONST_IMPL TQChar TQChar::null;
- QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
-@@ -220,7 +220,7 @@
- */
- SecTQString::SecTQString( TQChar ch )
- {
--    d = new SecTQStringData( QT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
-+    d = new SecTQStringData( TQT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
-     d->unicode[0] = ch;
- }
- 
-@@ -239,7 +239,7 @@
- {
-     if ( size ) {
- 	int l = size;
--	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( l );
-+	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( l );
- 	d = new SecTQStringData( uc, 0, l );
-     } else {
- 	d = shared_null ? shared_null : (shared_null=new SecTQStringData);
-@@ -258,7 +258,7 @@
- 	d = shared_null ? shared_null : makeSharedNull();
- 	d->ref();
-     } else {
--	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
-+	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
- 	if ( unicode )
- 	    memcpy(uc, unicode, length*sizeof(TQChar));
- 	d = new SecTQStringData(uc,unicode ? length : 0,length);
-@@ -287,7 +287,7 @@
- 	d = shared_null ? shared_null : makeSharedNull();
- 	d->ref();
-     } else {
--	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
-+	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
- 	if ( unicode )
- 	    memcpy(uc, unicode, length*sizeof(TQChar));
- 	d = new SecTQStringData(uc,unicode ? length : 0,length);
-@@ -429,7 +429,7 @@
- 	 ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
- 	// detach, grow or shrink
- 	uint newMax = computeNewMax( newLen );
--	TQChar* nd = QT_ALLOC_SECTQCHAR_VEC( newMax );
-+	TQChar* nd = TQT_ALLOC_SECTQCHAR_VEC( newMax );
- 	if ( nd ) {
- 	    uint len = TQMIN( d->len, newLen );
- 	    memcpy( nd, d->unicode, sizeof(TQChar) * len );
-@@ -594,10 +594,10 @@
- 
-     if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
- 	// Part of me - take a copy.
--	TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( len );
-+	TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( len );
- 	memcpy(tmp,s,len*sizeof(TQChar));
- 	insert(index,tmp,len);
--	QT_DELETE_SECTQCHAR_VEC( tmp );
-+	TQT_DELETE_SECTQCHAR_VEC( tmp );
- 	return *this;
-     }
- 
-@@ -669,10 +669,10 @@
- 	memcpy( d->unicode+index, s, len * sizeof(TQChar) );
-     } else if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
- 	// Part of me - take a copy.
--	TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( slen );
-+	TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( slen );
- 	memcpy( tmp, s, slen * sizeof(TQChar) );
- 	replace( index, len, tmp, slen );
--	QT_DELETE_SECTQCHAR_VEC( tmp );
-+	TQT_DELETE_SECTQCHAR_VEC( tmp );
-     } else {
- 	remove( index, len );
- 	insert( index, s, slen );
---- a/tqt/secqstring.h
-+++ b/tqt/secqstring.h
-@@ -87,7 +87,7 @@
- template <class T> class TQDeepCopy;
- #include <stdio.h>
- // internal
--struct Q_EXPORT SecTQStringData : public TQShared {
-+struct TQ_EXPORT SecTQStringData : public TQShared {
-     SecTQStringData() :
-         TQShared(), unicode(0), len(0), maxl(0) { ref(); }
-     SecTQStringData(TQChar *u, uint l, uint m) :
-@@ -109,7 +109,7 @@
- };
- 
- 
--class Q_EXPORT SecTQString
-+class TQ_EXPORT SecTQString
- {
- public:
-     SecTQString();                                  // make null string
-@@ -191,7 +191,7 @@
-     friend class TQDeepCopy<SecTQString>;
- };
- 
--class Q_EXPORT SecTQCharRef {
-+class TQ_EXPORT SecTQCharRef {
-     friend class SecTQString;
-     SecTQString& s;
-     uint p;
-@@ -249,7 +249,7 @@
- inline SecTQCharRef SecTQString::at( uint i ) { return SecTQCharRef(this,i); }
- inline SecTQCharRef SecTQString::operator[]( int i ) { return at((uint)i); }
- 
--class Q_EXPORT SecTQConstString : private SecTQString {
-+class TQ_EXPORT SecTQConstString : private SecTQString {
- public:
-     SecTQConstString( const TQChar* unicode, uint length );
-     ~SecTQConstString();
-@@ -297,7 +297,7 @@
-   SecTQString non-member operators
-  *****************************************************************************/
- 
--Q_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
-+TQ_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
- {
-     SecTQString tmp( s1 );
-     tmp += s2;
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0004-tqt-updates-202404.diff b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0004-tqt-updates-202404.diff
deleted file mode 100644
index a650d6b7..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0004-tqt-updates-202404.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/tqt/pinentrydialog.cpp
-+++ b/tqt/pinentrydialog.cpp
-@@ -84,18 +84,18 @@
- 
-   _ok->setDefault(true);
- 
--  connect( _ok, SIGNAL( clicked() ),
--	   this, SIGNAL( accepted() ) );
--  connect( _cancel, SIGNAL( clicked() ),
--	   this, SIGNAL( rejected() ) );
--  connect( _edit, SIGNAL( textModified(const SecTQString&) ),
--	   this, SLOT( updateQuality(const SecTQString&) ) );
--  connect (_edit, SIGNAL (backspacePressed()),
--	   this, SLOT (onBackspace ()));
--  connect (this, SIGNAL (accepted ()),
--	   this, SLOT (accept ()));
--  connect (this, SIGNAL (rejected ()),
--	   this, SLOT (reject ()));
-+  connect( _ok, TQ_SIGNAL( clicked() ),
-+	   this, TQ_SIGNAL( accepted() ) );
-+  connect( _cancel, TQ_SIGNAL( clicked() ),
-+	   this, TQ_SIGNAL( rejected() ) );
-+  connect( _edit, TQ_SIGNAL( textModified(const SecTQString&) ),
-+	   this, TQ_SLOT( updateQuality(const SecTQString&) ) );
-+  connect (_edit, TQ_SIGNAL (backspacePressed()),
-+	   this, TQ_SLOT (onBackspace ()));
-+  connect (this, TQ_SIGNAL (accepted ()),
-+	   this, TQ_SLOT (accept ()));
-+  connect (this, TQ_SIGNAL (rejected ()),
-+	   this, TQ_SLOT (reject ()));
-   _edit->setFocus();
- }
- 
---- a/tqt/secqlineedit.cpp
-+++ b/tqt/secqlineedit.cpp
-@@ -1073,10 +1073,10 @@
- #ifndef SECURE
-     TQString t = q->selectedText();
-     if ( !t.isEmpty() && echoMode == SecTQLineEdit::Normal ) {
--	q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0);
-+	q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0);
- 	TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
--	q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()),
--		 q, SLOT(clipboardChanged()) );
-+	q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()),
-+		 q, TQ_SLOT(clipboardChanged()) );
-     }
- #endif
- }
---- a/tqt/secqstring.cpp
-+++ b/tqt/secqstring.cpp
-@@ -189,12 +189,12 @@
- */
- 
- TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0;
--QT_STATIC_CONST_IMPL SecTQString SecTQString::null;
--QT_STATIC_CONST_IMPL TQChar TQChar::null;
--QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
--QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff);
--QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
--QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
-+const SecTQString SecTQString::null;
-+const TQChar TQChar::null;
-+const TQChar TQChar::replacement((ushort)0xfffd);
-+const TQChar TQChar::byteOrderMark((ushort)0xfeff);
-+const TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
-+const TQChar TQChar::nbsp((ushort)0x00a0);
- 
- SecTQStringData* SecTQString::makeSharedNull()
- {
---- a/tqt/secqstring.h
-+++ b/tqt/secqstring.h
-@@ -125,7 +125,7 @@
- 
-     SecTQString    &operator=( const SecTQString & );   // impl-shared copy
- 
--    QT_STATIC_CONST SecTQString null;
-+    static const SecTQString null;
- 
-     bool        isNull()        const;
-     bool        isEmpty()       const;
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0005-delete-libassuan.m4.diff b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0005-delete-libassuan.m4.diff
deleted file mode 100644
index 42df7ebd..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0005-delete-libassuan.m4.diff
+++ /dev/null
@@ -1,182 +0,0 @@
-Description: Delete outdated m4/libassuan.m4
- Allows building against libassuan 3.
-Author: Andreas Metzler <ametzler@debian.org>
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2024-08-26
-
---- pinentry-1.2.1.orig/m4/libassuan.m4
-+++ /dev/null
-@@ -1,172 +0,0 @@
--dnl Autoconf macros for libassuan
--dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
--dnl
--dnl This file is free software; as a special exception the author gives
--dnl unlimited permission to copy and/or distribute it, with or without
--dnl modifications, as long as this notice is preserved.
--dnl
--dnl This file is distributed in the hope that it will be useful, but
--dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
--dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--dnl SPDX-License-Identifier: FSFULLR
--# Last-changed: 2020-11-17
--
--dnl
--dnl Common code used for libassuan detection [internal]
--dnl Returns ok set to yes or no.
--dnl
--AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
--[ AC_REQUIRE([AC_CANONICAL_HOST])
--  AC_ARG_WITH(libassuan-prefix,
--              AS_HELP_STRING([--with-libassuan-prefix=PFX],
--                             [prefix where LIBASSUAN is installed (optional)]),
--     libassuan_config_prefix="$withval", libassuan_config_prefix="")
--  if test x$libassuan_config_prefix != x ; then
--    if test x${LIBASSUAN_CONFIG+set} != xset ; then
--      LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
--    fi
--  fi
--
--  use_gpgrt_config=""
--  if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
--    if $GPGRT_CONFIG libassuan --exists; then
--      LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
--      AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
--      use_gpgrt_config=yes
--    fi
--  fi
--  if test -z "$use_gpgrt_config"; then
--    AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
--  fi
--
--  tmp=ifelse([$1], ,1:0.9.2,$1)
--  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
--    req_libassuan_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
--    min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
--  else
--    req_libassuan_api=0
--    min_libassuan_version="$tmp"
--  fi
--
--  AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
--  ok=no
--  if test "$LIBASSUAN_CONFIG" != "no"; then
--    req_major=`echo $min_libassuan_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
--    req_minor=`echo $min_libassuan_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
--    req_micro=`echo $min_libassuan_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
--
--    if test -z "$use_gpgrt_config"; then
--      libassuan_config_version=`$LIBASSUAN_CONFIG --version`
--    else
--      libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
--    fi
--    major=`echo $libassuan_config_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
--    minor=`echo $libassuan_config_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
--    micro=`echo $libassuan_config_version | \
--               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
--
--    if test "$major" -gt "$req_major"; then
--        ok=yes
--    else
--        if test "$major" -eq "$req_major"; then
--            if test "$minor" -gt "$req_minor"; then
--               ok=yes
--            else
--               if test "$minor" -eq "$req_minor"; then
--                   if test "$micro" -ge "$req_micro"; then
--                     ok=yes
--                   fi
--               fi
--            fi
--        fi
--    fi
--  fi
--
--  if test $ok = yes; then
--    AC_MSG_RESULT([yes ($libassuan_config_version)])
--  else
--    AC_MSG_RESULT(no)
--  fi
--
--  if test $ok = yes; then
--    if test "$req_libassuan_api" -gt 0 ; then
--      if test -z "$use_gpgrt_config"; then
--        tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
--      else
--        tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
--      fi
--      if test "$tmp" -gt 0 ; then
--        AC_MSG_CHECKING([LIBASSUAN API version])
--        if test "$req_libassuan_api" -eq "$tmp" ; then
--          AC_MSG_RESULT(okay)
--        else
--          ok=no
--          AC_MSG_RESULT([does not match.  want=$req_libassuan_api got=$tmp.])
--        fi
--      fi
--    fi
--  fi
--
--  if test $ok = yes; then
--    if test x"$host" != x ; then
--      if test -z "$use_gpgrt_config"; then
--        libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
--      else
--        libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
--      fi
--      if test x"$libassuan_config_host" != xnone ; then
--        if test x"$libassuan_config_host" != x"$host" ; then
--  AC_MSG_WARN([[
--***
--*** The config script "$LIBASSUAN_CONFIG" was
--*** built for $libassuan_config_host and thus may not match the
--*** used host $host.
--*** You may want to use the configure option --with-libassuan-prefix
--*** to specify a matching config script.
--***]])
--        fi
--      fi
--    fi
--  fi
--])
--
--dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
--dnl                    [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
--dnl Test whether libassuan has at least MINIMUM-VERSION. This is
--dnl used to test for features only available in newer versions.
--dnl
--AC_DEFUN([AM_CHECK_LIBASSUAN],
--[ _AM_PATH_LIBASSUAN_COMMON($1)
--  if test $ok = yes; then
--    ifelse([$2], , :, [$2])
--  else
--    ifelse([$3], , :, [$3])
--  fi
--])
--
--
--
--
--dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
--dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
--dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
--dnl
--AC_DEFUN([AM_PATH_LIBASSUAN],
--[ _AM_PATH_LIBASSUAN_COMMON($1)
--  if test $ok = yes; then
--    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
--    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
--    ifelse([$2], , :, [$2])
--  else
--    LIBASSUAN_CFLAGS=""
--    LIBASSUAN_LIBS=""
--    ifelse([$3], , :, [$3])
--  fi
--  AC_SUBST(LIBASSUAN_CFLAGS)
--  AC_SUBST(LIBASSUAN_LIBS)
--])
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0006-remove-register-instruction.diff b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0006-remove-register-instruction.diff
deleted file mode 100644
index ee6f0097..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0006-remove-register-instruction.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/tqt/secqstring.cpp
-===================================================================
---- a/tqt/secqstring.cpp
-+++ b/tqt/secqstring.cpp
-@@ -548,7 +548,7 @@
- 	    len = slen - index;
- 	if ( index == 0 && len == slen )
- 	    return *this;
--	register const TQChar *p = unicode()+index;
-+	const TQChar *p = unicode()+index;
- 	SecTQString s( len, TRUE );
- 	memcpy( s.d->unicode, p, len * sizeof(TQChar) );
- 	s.d->len = len;
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers
deleted file mode 100644
index 65cb08d0..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers
+++ /dev/null
@@ -1,190 +0,0 @@
---- a/tqt/main.cpp
-+++ b/tqt/main.cpp
-@@ -26,9 +26,9 @@
- #include <stdlib.h>
- #include <errno.h>
- 
--#include <ntqapplication.h>
--#include <ntqwidget.h>
--#include <ntqmessagebox.h>
-+#include <tqapplication.h>
-+#include <tqwidget.h>
-+#include <tqmessagebox.h>
- #include "secqstring.h"
- 
- #include "pinentrydialog.h"
---- a/tqt/pinentrydialog.cpp
-+++ b/tqt/pinentrydialog.cpp
-@@ -18,12 +18,12 @@
-  * SPDX-License-Identifier: GPL-2.0+
-  */
- 
--#include <ntqlayout.h>
--#include <ntqpushbutton.h>
--#include <ntqlabel.h>
--#include <ntqmessagebox.h>
--#include <ntqprogressbar.h>
--#include <ntqtooltip.h>
-+#include <tqlayout.h>
-+#include <tqpushbutton.h>
-+#include <tqlabel.h>
-+#include <tqmessagebox.h>
-+#include <tqprogressbar.h>
-+#include <tqtooltip.h>
- 
- #include "secqlineedit.h"
- 
---- a/tqt/pinentrydialog.h
-+++ b/tqt/pinentrydialog.h
-@@ -20,7 +20,7 @@
- #ifndef __PINENTRYDIALOG_H__
- #define __PINENTRYDIALOG_H__
- 
--#include <ntqdialog.h>
-+#include <tqdialog.h>
- #include "pinentry.h"
- 
- class TQLabel;
---- a/tqt/secqinternal.cpp
-+++ b/tqt/secqinternal.cpp
-@@ -38,10 +38,10 @@
- **********************************************************************/
- 
- #include "secqinternal_p.h"
--#include "ntqwidget.h"
--#include "ntqpixmap.h"
--#include "ntqpainter.h"
--#include "ntqcleanuphandler.h"
-+#include "tqwidget.h"
-+#include "tqpixmap.h"
-+#include "tqpainter.h"
-+#include "tqcleanuphandler.h"
- 
- static TQPixmap* qdb_shared_pixmap = 0;
- static TQPixmap *qdb_force_pixmap = 0;
---- a/tqt/secqinternal_p.h
-+++ b/tqt/secqinternal_p.h
-@@ -52,11 +52,11 @@
- //
- //
- #ifndef QT_H
--#include "ntqnamespace.h"
--#include "ntqrect.h"
--#include "ntqptrlist.h"
--#include "ntqcstring.h"
--#include "ntqiodevice.h"
-+#include "tqnamespace.h"
-+#include "tqrect.h"
-+#include "tqptrlist.h"
-+#include "tqcstring.h"
-+#include "tqiodevice.h"
- #endif // QT_H
- 
- class TQWidget;
---- a/tqt/secqlineedit.cpp
-+++ b/tqt/secqlineedit.cpp
-@@ -67,27 +67,27 @@
- **********************************************************************/
- 
- #include "secqlineedit.h"
--#include "ntqpainter.h"
--#include "ntqdrawutil.h"
--#include "ntqfontmetrics.h"
--#include "ntqpixmap.h"
--#include "ntqclipboard.h"
--#include "ntqapplication.h"
--#include "ntqtimer.h"
--#include "ntqpopupmenu.h"
--#include "ntqstringlist.h"
--#include "ntqguardedptr.h"
--#include "ntqstyle.h"
--#include "ntqwhatsthis.h"
-+#include "tqpainter.h"
-+#include "tqdrawutil.h"
-+#include "tqfontmetrics.h"
-+#include "tqpixmap.h"
-+#include "tqclipboard.h"
-+#include "tqapplication.h"
-+#include "tqtimer.h"
-+#include "tqpopupmenu.h"
-+#include "tqstringlist.h"
-+#include "tqguardedptr.h"
-+#include "tqstyle.h"
-+#include "tqwhatsthis.h"
- #include "secqinternal_p.h"
--#include "private/qtextlayout_p.h"
--#include "ntqvaluevector.h"
-+#include "private/tqtextlayout_p.h"
-+#include "tqvaluevector.h"
- #if defined(QT_ACCESSIBILITY_SUPPORT)
--#include "ntqaccessible.h"
-+#include "tqaccessible.h"
- #endif
- 
- #ifndef TQT_NO_ACCEL
--#include "ntqkeysequence.h"
-+#include "tqkeysequence.h"
- #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
- #else
- #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
---- a/tqt/secqlineedit.h
-+++ b/tqt/secqlineedit.h
-@@ -1,8 +1,8 @@
--/* secntqlineedit.h - Secure version of TQLineEdit.
-+/* secqlineedit.h - Secure version of TQLineEdit.
-  * Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
-  * Copyright (C) 2003 g10 Code GmbH
-  *
-- * The license of the original ntqlineedit.h file from which this file
-+ * The license of the original tqlineedit.h file from which this file
-  * is derived can be found below.  Modified by Marcus Brinkmann
-  * <marcus@g10code.de>.  All modifications are licensed as follows, so
-  * that the intersection of the two licenses is then the GNU General
-@@ -73,8 +73,8 @@
- class TQPopupMenu;
- 
- #ifndef QT_H
--#include "ntqframe.h"
--#include "ntqstring.h"
-+#include "tqframe.h"
-+#include "tqstring.h"
- #endif // QT_H
- 
- class TQTextParagraph;
---- a/tqt/secqstring.cpp
-+++ b/tqt/secqstring.cpp
-@@ -138,7 +138,7 @@
-     and join a list of strings into a single string with an optional
-     separator using SecTQStringList::join(). You can obtain a list of
-     strings from a string list that contain a particular substring or
--    that match a particular \link ntqregexp.html regex\endlink using
-+    that match a particular \link tqregexp.html regex\endlink using
-     SecTQStringList::grep().
- 
-     <b>Note for C programmers</b>
---- a/tqt/secqstring.h
-+++ b/tqt/secqstring.h
-@@ -1,8 +1,8 @@
--/* secntqstring.h - Secure version of TQString.
-+/* sectqstring.h - Secure version of TQString.
-  * Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
-  * Copyright (C) 2003 g10 Code GmbH
-  *
-- * The license of the original ntqstring.h file from which this file is
-+ * The license of the original tqstring.h file from which this file is
-  * derived can be found below.  Modified by Marcus Brinkmann
-  * <marcus@g10code.de>.  All modifications are licensed as follows, so
-  * that the intersection of the two licenses is then the GNU General
-@@ -71,10 +71,10 @@
- /* We need the original qchar and qstring for transparent conversion
-    from TQChar to TQChar and TQString to SecTQString (but not the other
-    way round).  */
--#include <ntqstring.h>
-+#include <tqstring.h>
- 
- #ifndef QT_H
--#include "ntqcstring.h"
-+#include "tqcstring.h"
- #endif // QT_H
- 
- 
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/series b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/series
deleted file mode 100644
index 19fcfefe..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-0001-avoid-self-describing-as-a-beta.patch
-0002-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch
-0003-tqt-updates-2023.diff
-0004-tqt-updates-202404.diff
-0005-delete-libassuan.m4.diff
-0006-remove-register-instruction.diff
-0007-tq-headers
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/libassuan.m4 b/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/libassuan.m4
deleted file mode 100644
index df504841..00000000
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/libassuan.m4
+++ /dev/null
@@ -1,172 +0,0 @@
-dnl Autoconf macros for libassuan
-dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
-dnl
-dnl This file is free software; as a special exception the author gives
-dnl unlimited permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-dnl This file is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-dnl SPDX-License-Identifier: FSFULLR
-# Last-changed: 2020-11-17
-
-dnl
-dnl Common code used for libassuan detection [internal]
-dnl Returns ok set to yes or no.
-dnl
-AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
-[ AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_ARG_WITH(libassuan-prefix,
-              AS_HELP_STRING([--with-libassuan-prefix=PFX],
-                             [prefix where LIBASSUAN is installed (optional)]),
-     libassuan_config_prefix="$withval", libassuan_config_prefix="")
-  if test x$libassuan_config_prefix != x ; then
-    if test x${LIBASSUAN_CONFIG+set} != xset ; then
-      LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
-    fi
-  fi
-
-  use_gpgrt_config=""
-  if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
-    if $GPGRT_CONFIG libassuan --exists; then
-      LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
-      AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
-      use_gpgrt_config=yes
-    fi
-  fi
-  if test -z "$use_gpgrt_config"; then
-    AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
-  fi
-
-  tmp=ifelse([$1], ,1:0.9.2,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-    req_libassuan_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-    min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
-    req_libassuan_api=0
-    min_libassuan_version="$tmp"
-  fi
-
-  AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
-  ok=no
-  if test "$LIBASSUAN_CONFIG" != "no"; then
-    req_major=`echo $min_libassuan_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-    req_minor=`echo $min_libassuan_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    req_micro=`echo $min_libassuan_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-
-    if test -z "$use_gpgrt_config"; then
-      libassuan_config_version=`$LIBASSUAN_CONFIG --version`
-    else
-      libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
-    fi
-    major=`echo $libassuan_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-    minor=`echo $libassuan_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-    micro=`echo $libassuan_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-
-    if test "$major" -gt "$req_major"; then
-        ok=yes
-    else
-        if test "$major" -eq "$req_major"; then
-            if test "$minor" -gt "$req_minor"; then
-               ok=yes
-            else
-               if test "$minor" -eq "$req_minor"; then
-                   if test "$micro" -ge "$req_micro"; then
-                     ok=yes
-                   fi
-               fi
-            fi
-        fi
-    fi
-  fi
-
-  if test $ok = yes; then
-    AC_MSG_RESULT([yes ($libassuan_config_version)])
-  else
-    AC_MSG_RESULT(no)
-  fi
-
-  if test $ok = yes; then
-    if test "$req_libassuan_api" -gt 0 ; then
-      if test -z "$use_gpgrt_config"; then
-        tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
-      else
-        tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
-      fi
-      if test "$tmp" -gt 0 ; then
-        AC_MSG_CHECKING([LIBASSUAN API version])
-        if test "$req_libassuan_api" -eq "$tmp" ; then
-          AC_MSG_RESULT(okay)
-        else
-          ok=no
-          AC_MSG_RESULT([does not match.  want=$req_libassuan_api got=$tmp.])
-        fi
-      fi
-    fi
-  fi
-
-  if test $ok = yes; then
-    if test x"$host" != x ; then
-      if test -z "$use_gpgrt_config"; then
-        libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
-      else
-        libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
-      fi
-      if test x"$libassuan_config_host" != xnone ; then
-        if test x"$libassuan_config_host" != x"$host" ; then
-  AC_MSG_WARN([[
-***
-*** The config script "$LIBASSUAN_CONFIG" was
-*** built for $libassuan_config_host and thus may not match the
-*** used host $host.
-*** You may want to use the configure option --with-libassuan-prefix
-*** to specify a matching config script.
-***]])
-        fi
-      fi
-    fi
-  fi
-])
-
-dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
-dnl                    [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test whether libassuan has at least MINIMUM-VERSION. This is
-dnl used to test for features only available in newer versions.
-dnl
-AC_DEFUN([AM_CHECK_LIBASSUAN],
-[ _AM_PATH_LIBASSUAN_COMMON($1)
-  if test $ok = yes; then
-    ifelse([$2], , :, [$2])
-  else
-    ifelse([$3], , :, [$3])
-  fi
-])
-
-
-
-
-dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
-dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
-dnl
-AC_DEFUN([AM_PATH_LIBASSUAN],
-[ _AM_PATH_LIBASSUAN_COMMON($1)
-  if test $ok = yes; then
-    LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
-    LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
-    ifelse([$2], , :, [$2])
-  else
-    LIBASSUAN_CFLAGS=""
-    LIBASSUAN_LIBS=""
-    ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(LIBASSUAN_CFLAGS)
-  AC_SUBST(LIBASSUAN_LIBS)
-])
diff --git a/debian/pinentry-tqt/pinentry-tqt_1.2.1.orig.tar.bz2 b/debian/pinentry-tqt/pinentry-tqt_1.2.1.orig.tar.bz2
deleted file mode 100644
index cfa3e579..00000000
--- a/debian/pinentry-tqt/pinentry-tqt_1.2.1.orig.tar.bz2
+++ /dev/null
diff --git a/debian/pinentry-tqt/pinentry-tqt_1.2.1.orig.tar.bz2.asc b/debian/pinentry-tqt/pinentry-tqt_1.2.1.orig.tar.bz2.asc
deleted file mode 100644
index 426d62e9..00000000
--- a/debian/pinentry-tqt/pinentry-tqt_1.2.1.orig.tar.bz2.asc
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQRtqm5kp20oQFcbSQJSiJe4JkA62gUCYwYDUwAKCRBSiJe4JkA6
-2oLvAQDnnCjGuMWl2Q2OhNWTJ+xCSh98qjbCJhhPh0XdlYYllAEAgpwKE8j8zhb8
-bpWiye8YMK73S52u22spIO1fOzXH0QKIdQQAFggAHRYhBKyOEVv3Pi2NR/qZCOmO
-my0Zxsi9BQJjBw2vAAoJEOmOmy0Zxsi9gg0BAMw2ynU0fU0kDoi6zce44On7VmXE
-9MMvpki4BbfW9yvmAQCzzRirV3k/NY3fMVC+T9OFQV6KEpBCSd8I2dQ6v79WDw==
-=WKvZ
------END PGP SIGNATURE-----
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/AUTHORS b/main/pinentry-tqt/AUTHORS
index 36bf40bc..36bf40bc 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/AUTHORS
+++ b/main/pinentry-tqt/AUTHORS
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/COPYING b/main/pinentry-tqt/COPYING
index c7aea189..c7aea189 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/COPYING
+++ b/main/pinentry-tqt/COPYING
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/ChangeLog b/main/pinentry-tqt/ChangeLog
index 4f1a0172..4f1a0172 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/ChangeLog
+++ b/main/pinentry-tqt/ChangeLog
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/ChangeLog-old b/main/pinentry-tqt/ChangeLog-old
index 02a8010a..02a8010a 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/ChangeLog-old
+++ b/main/pinentry-tqt/ChangeLog-old
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/INSTALL b/main/pinentry-tqt/INSTALL
index 8b82ade0..8b82ade0 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/INSTALL
+++ b/main/pinentry-tqt/INSTALL
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/Makefile.am b/main/pinentry-tqt/Makefile.am
index bbe6ee3e..bbe6ee3e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/Makefile.am
+++ b/main/pinentry-tqt/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/Makefile.in b/main/pinentry-tqt/Makefile.in
index 5e0ddb80..5e0ddb80 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/Makefile.in
+++ b/main/pinentry-tqt/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/NEWS b/main/pinentry-tqt/NEWS
index c080b34e..c080b34e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/NEWS
+++ b/main/pinentry-tqt/NEWS
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/README b/main/pinentry-tqt/README
index d946ff37..d946ff37 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/README
+++ b/main/pinentry-tqt/README
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/README.GIT b/main/pinentry-tqt/README.GIT
index ee2c6383..ee2c6383 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/README.GIT
+++ b/main/pinentry-tqt/README.GIT
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/THANKS b/main/pinentry-tqt/THANKS
index 90fce79b..90fce79b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/THANKS
+++ b/main/pinentry-tqt/THANKS
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/TODO b/main/pinentry-tqt/TODO
index e287c4c9..e287c4c9 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/TODO
+++ b/main/pinentry-tqt/TODO
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/VERSION b/main/pinentry-tqt/VERSION
index 6085e946..6085e946 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/VERSION
+++ b/main/pinentry-tqt/VERSION
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/acinclude.m4 b/main/pinentry-tqt/acinclude.m4
index 20e64bce..20e64bce 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/acinclude.m4
+++ b/main/pinentry-tqt/acinclude.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/aclocal.m4 b/main/pinentry-tqt/aclocal.m4
index 056ae0e3..056ae0e3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/aclocal.m4
+++ b/main/pinentry-tqt/aclocal.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/autogen.rc b/main/pinentry-tqt/autogen.rc
index 46a5f44f..46a5f44f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/autogen.rc
+++ b/main/pinentry-tqt/autogen.rc
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/autogen.sh b/main/pinentry-tqt/autogen.sh
index 8f33ece8..1f98ce63 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/autogen.sh
+++ b/main/pinentry-tqt/autogen.sh
@@ -249,7 +249,7 @@ if [ "$myhost" = "find-version" ]; then
     fi
 
     beta=no
-    if [ -e .git ]; then
+    if false; then
       ingit=yes
       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
       tmp=$(echo "$tmp" | sed s/^"$package"//)
@@ -265,8 +265,8 @@ if [ "$myhost" = "find-version" ]; then
       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
     else
       ingit=no
-      beta=yes
-      tmp="-unknown"
+      beta=no
+      tmp=""
       rev="0000000"
       rvd="0"
     fi
@@ -453,7 +453,7 @@ EOF
 fi
 
 # Check the git setup.
-if [ -d .git ]; then
+if false; then
   CP="cp -p"
   # If we have a GNU cp we can add -v
   if cp --version >/dev/null 2>/dev/null; then
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/compile b/main/pinentry-tqt/build-aux/compile
index 52f8f943..52f8f943 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/compile
+++ b/main/pinentry-tqt/build-aux/compile
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/config.guess b/main/pinentry-tqt/build-aux/config.guess
index 7f76b622..7f76b622 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/config.guess
+++ b/main/pinentry-tqt/build-aux/config.guess
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/config.rpath b/main/pinentry-tqt/build-aux/config.rpath
index 24be79cf..24be79cf 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/config.rpath
+++ b/main/pinentry-tqt/build-aux/config.rpath
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/config.sub b/main/pinentry-tqt/build-aux/config.sub
index dba16e84..dba16e84 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/config.sub
+++ b/main/pinentry-tqt/build-aux/config.sub
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/depcomp b/main/pinentry-tqt/build-aux/depcomp
index f0a474cd..f0a474cd 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/depcomp
+++ b/main/pinentry-tqt/build-aux/depcomp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/git-log-fix b/main/pinentry-tqt/build-aux/git-log-fix
index af702fe6..af702fe6 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/git-log-fix
+++ b/main/pinentry-tqt/build-aux/git-log-fix
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/git-log-footer b/main/pinentry-tqt/build-aux/git-log-footer
index 475366a7..475366a7 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/git-log-footer
+++ b/main/pinentry-tqt/build-aux/git-log-footer
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/gitlog-to-changelog b/main/pinentry-tqt/build-aux/gitlog-to-changelog
index 81a04310..81a04310 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/gitlog-to-changelog
+++ b/main/pinentry-tqt/build-aux/gitlog-to-changelog
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/install-sh b/main/pinentry-tqt/build-aux/install-sh
index 377bb868..377bb868 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/install-sh
+++ b/main/pinentry-tqt/build-aux/install-sh
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/mdate-sh b/main/pinentry-tqt/build-aux/mdate-sh
index 39f48bb1..39f48bb1 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/mdate-sh
+++ b/main/pinentry-tqt/build-aux/mdate-sh
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/missing b/main/pinentry-tqt/build-aux/missing
index 528c6c43..528c6c43 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/missing
+++ b/main/pinentry-tqt/build-aux/missing
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/texinfo.tex b/main/pinentry-tqt/build-aux/texinfo.tex
index 1e6de891..1e6de891 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/build-aux/texinfo.tex
+++ b/main/pinentry-tqt/build-aux/texinfo.tex
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/config.h.in b/main/pinentry-tqt/config.h.in
index a298744b..a298744b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/config.h.in
+++ b/main/pinentry-tqt/config.h.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/configure b/main/pinentry-tqt/configure
index 25c1c65c..25c1c65c 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/configure
+++ b/main/pinentry-tqt/configure
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/configure.ac b/main/pinentry-tqt/configure.ac
index cb4e43fa..cb4e43fa 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/configure.ac
+++ b/main/pinentry-tqt/configure.ac
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/curses/Makefile.am b/main/pinentry-tqt/curses/Makefile.am
index 3bbdec8f..3bbdec8f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/curses/Makefile.am
+++ b/main/pinentry-tqt/curses/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/curses/Makefile.in b/main/pinentry-tqt/curses/Makefile.in
index 122d7453..122d7453 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/curses/Makefile.in
+++ b/main/pinentry-tqt/curses/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/curses/pinentry-curses.c b/main/pinentry-tqt/curses/pinentry-curses.c
index 20a5c937..20a5c937 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/curses/pinentry-curses.c
+++ b/main/pinentry-tqt/curses/pinentry-curses.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/depcomp b/main/pinentry-tqt/depcomp
index e5f9736c..e5f9736c 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/depcomp
+++ b/main/pinentry-tqt/depcomp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/HACKING b/main/pinentry-tqt/doc/HACKING
index bfdbdde8..bfdbdde8 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/HACKING
+++ b/main/pinentry-tqt/doc/HACKING
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/Makefile.am b/main/pinentry-tqt/doc/Makefile.am
index e02b74c9..e02b74c9 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/Makefile.am
+++ b/main/pinentry-tqt/doc/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/Makefile.in b/main/pinentry-tqt/doc/Makefile.in
index e127328f..e127328f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/Makefile.in
+++ b/main/pinentry-tqt/doc/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/gpl.texi b/main/pinentry-tqt/doc/gpl.texi
index 6eb301e2..6eb301e2 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/gpl.texi
+++ b/main/pinentry-tqt/doc/gpl.texi
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/mdate-sh b/main/pinentry-tqt/doc/mdate-sh
index 83d27009..83d27009 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/mdate-sh
+++ b/main/pinentry-tqt/doc/mdate-sh
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/pinentry.info b/main/pinentry-tqt/doc/pinentry.info
index a560bfaa..a560bfaa 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/pinentry.info
+++ b/main/pinentry-tqt/doc/pinentry.info
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/pinentry.texi b/main/pinentry-tqt/doc/pinentry.texi
index 11728909..11728909 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/pinentry.texi
+++ b/main/pinentry-tqt/doc/pinentry.texi
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/stamp-vti b/main/pinentry-tqt/doc/stamp-vti
index 77a967c8..77a967c8 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/stamp-vti
+++ b/main/pinentry-tqt/doc/stamp-vti
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/texinfo.tex b/main/pinentry-tqt/doc/texinfo.tex
index 3f81058b..3f81058b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/texinfo.tex
+++ b/main/pinentry-tqt/doc/texinfo.tex
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/version.texi b/main/pinentry-tqt/doc/version.texi
index 77a967c8..77a967c8 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/doc/version.texi
+++ b/main/pinentry-tqt/doc/version.texi
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/efl/Makefile.am b/main/pinentry-tqt/efl/Makefile.am
index 23399b07..23399b07 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/efl/Makefile.am
+++ b/main/pinentry-tqt/efl/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/efl/Makefile.in b/main/pinentry-tqt/efl/Makefile.in
index 4d5cec7d..4d5cec7d 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/efl/Makefile.in
+++ b/main/pinentry-tqt/efl/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/efl/pinentry-efl.c b/main/pinentry-tqt/efl/pinentry-efl.c
index 58796ba1..58796ba1 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/efl/pinentry-efl.c
+++ b/main/pinentry-tqt/efl/pinentry-efl.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/emacs/Makefile.am b/main/pinentry-tqt/emacs/Makefile.am
index 6bb806bd..6bb806bd 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/emacs/Makefile.am
+++ b/main/pinentry-tqt/emacs/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/emacs/Makefile.in b/main/pinentry-tqt/emacs/Makefile.in
index 97da3707..97da3707 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/emacs/Makefile.in
+++ b/main/pinentry-tqt/emacs/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/emacs/pinentry-emacs.c b/main/pinentry-tqt/emacs/pinentry-emacs.c
index 116cddc8..116cddc8 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/emacs/pinentry-emacs.c
+++ b/main/pinentry-tqt/emacs/pinentry-emacs.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/Makefile.am b/main/pinentry-tqt/fltk/Makefile.am
index 660ab4ce..660ab4ce 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/Makefile.am
+++ b/main/pinentry-tqt/fltk/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/Makefile.in b/main/pinentry-tqt/fltk/Makefile.in
index 78a8c57a..78a8c57a 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/Makefile.in
+++ b/main/pinentry-tqt/fltk/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/encrypt.xpm b/main/pinentry-tqt/fltk/encrypt.xpm
index 80402e39..80402e39 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/encrypt.xpm
+++ b/main/pinentry-tqt/fltk/encrypt.xpm
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/icon.xpm b/main/pinentry-tqt/fltk/icon.xpm
index eed3cd66..eed3cd66 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/icon.xpm
+++ b/main/pinentry-tqt/fltk/icon.xpm
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/main.cxx b/main/pinentry-tqt/fltk/main.cxx
index 2afad1cd..2afad1cd 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/main.cxx
+++ b/main/pinentry-tqt/fltk/main.cxx
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/passwindow.cxx b/main/pinentry-tqt/fltk/passwindow.cxx
index a0cbe25d..a0cbe25d 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/passwindow.cxx
+++ b/main/pinentry-tqt/fltk/passwindow.cxx
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/passwindow.h b/main/pinentry-tqt/fltk/passwindow.h
index 28472d52..28472d52 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/passwindow.h
+++ b/main/pinentry-tqt/fltk/passwindow.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/pinwindow.cxx b/main/pinentry-tqt/fltk/pinwindow.cxx
index c187dd5e..c187dd5e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/pinwindow.cxx
+++ b/main/pinentry-tqt/fltk/pinwindow.cxx
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/pinwindow.h b/main/pinentry-tqt/fltk/pinwindow.h
index e1548dae..e1548dae 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/pinwindow.h
+++ b/main/pinentry-tqt/fltk/pinwindow.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/qualitypasswindow.cxx b/main/pinentry-tqt/fltk/qualitypasswindow.cxx
index 45290730..45290730 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/qualitypasswindow.cxx
+++ b/main/pinentry-tqt/fltk/qualitypasswindow.cxx
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/qualitypasswindow.h b/main/pinentry-tqt/fltk/qualitypasswindow.h
index eee55150..eee55150 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/fltk/qualitypasswindow.h
+++ b/main/pinentry-tqt/fltk/qualitypasswindow.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gnome3/Makefile.am b/main/pinentry-tqt/gnome3/Makefile.am
index 96ae5a61..96ae5a61 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gnome3/Makefile.am
+++ b/main/pinentry-tqt/gnome3/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gnome3/Makefile.in b/main/pinentry-tqt/gnome3/Makefile.in
index 9d4c480e..9d4c480e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gnome3/Makefile.in
+++ b/main/pinentry-tqt/gnome3/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gnome3/pinentry-gnome3.c b/main/pinentry-tqt/gnome3/pinentry-gnome3.c
index 0b8d8d18..0b8d8d18 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gnome3/pinentry-gnome3.c
+++ b/main/pinentry-tqt/gnome3/pinentry-gnome3.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gtk+-2/Makefile.am b/main/pinentry-tqt/gtk+-2/Makefile.am
index 0523b0bf..0523b0bf 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gtk+-2/Makefile.am
+++ b/main/pinentry-tqt/gtk+-2/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gtk+-2/Makefile.in b/main/pinentry-tqt/gtk+-2/Makefile.in
index e7280593..e7280593 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gtk+-2/Makefile.in
+++ b/main/pinentry-tqt/gtk+-2/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gtk+-2/pinentry-gtk-2.c b/main/pinentry-tqt/gtk+-2/pinentry-gtk-2.c
index 32112ae3..264e4ed0 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/gtk+-2/pinentry-gtk-2.c
+++ b/main/pinentry-tqt/gtk+-2/pinentry-gtk-2.c
@@ -161,7 +161,7 @@ static int
 grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
 {
   GdkGrabStatus err;
-  int tries = 0, max_tries = 4096;
+  int tries = 0, max_tries = 2048;
   (void)data;
 
   if (! pinentry->grab)
@@ -170,7 +170,8 @@ grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
   do
     err = gdk_keyboard_grab (gtk_widget_get_window (win),
                              FALSE, gdk_event_get_time (event));
-  while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE);
+  while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE
+         && (usleep(100), TRUE));
 
   if (err)
     {
@@ -194,7 +195,7 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
 {
   GdkGrabStatus err;
   GdkCursor *cursor;
-  int tries = 0, max_tries = 4096;
+  int tries = 0, max_tries = 2048;
   (void)data;
 
   /* Change the cursor for the duration of the grab to indicate that
@@ -216,7 +217,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data)
                             cursor,
                             gdk_event_get_time (event));
   while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE
-                                 || err == GDK_GRAB_ALREADY_GRABBED));
+                                 || err == GDK_GRAB_ALREADY_GRABBED)
+         && (usleep (100), TRUE));
 
   if (err)
     {
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/install-sh b/main/pinentry-tqt/install-sh
index a5897de6..a5897de6 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/install-sh
+++ b/main/pinentry-tqt/install-sh
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/ChangeLog b/main/pinentry-tqt/m4/ChangeLog
index a7d64198..a7d64198 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/ChangeLog
+++ b/main/pinentry-tqt/m4/ChangeLog
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/Makefile.am b/main/pinentry-tqt/m4/Makefile.am
index a5d43de4..a5d43de4 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/Makefile.am
+++ b/main/pinentry-tqt/m4/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/Makefile.in b/main/pinentry-tqt/m4/Makefile.in
index 0fb709b6..0fb709b6 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/Makefile.in
+++ b/main/pinentry-tqt/m4/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/curses.m4 b/main/pinentry-tqt/m4/curses.m4
index 572d3214..572d3214 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/curses.m4
+++ b/main/pinentry-tqt/m4/curses.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/glib.m4 b/main/pinentry-tqt/m4/glib.m4
index 7338acb9..7338acb9 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/glib.m4
+++ b/main/pinentry-tqt/m4/glib.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/gpg-error.m4 b/main/pinentry-tqt/m4/gpg-error.m4
index 4b5cd40b..4b5cd40b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/gpg-error.m4
+++ b/main/pinentry-tqt/m4/gpg-error.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/gtk.m4 b/main/pinentry-tqt/m4/gtk.m4
index 6f6a4222..6f6a4222 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/gtk.m4
+++ b/main/pinentry-tqt/m4/gtk.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/iconv.m4 b/main/pinentry-tqt/m4/iconv.m4
index a285e9da..a285e9da 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/iconv.m4
+++ b/main/pinentry-tqt/m4/iconv.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/pkg.m4 b/main/pinentry-tqt/m4/pkg.m4
index 5acff96c..5acff96c 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/pkg.m4
+++ b/main/pinentry-tqt/m4/pkg.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/qt.m4 b/main/pinentry-tqt/m4/qt.m4
index fdf99913..fdf99913 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/qt.m4
+++ b/main/pinentry-tqt/m4/qt.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/qt4.m4 b/main/pinentry-tqt/m4/qt4.m4
index 9212e574..9212e574 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/m4/qt4.m4
+++ b/main/pinentry-tqt/m4/qt4.m4
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/missing b/main/pinentry-tqt/missing
index 1c8ff704..1c8ff704 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/missing
+++ b/main/pinentry-tqt/missing
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/mkinstalldirs b/main/pinentry-tqt/mkinstalldirs
index ef7e16fd..ef7e16fd 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/mkinstalldirs
+++ b/main/pinentry-tqt/mkinstalldirs
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/Makefile.am b/main/pinentry-tqt/pinentry/Makefile.am
index 0866ccec..0866ccec 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/Makefile.am
+++ b/main/pinentry-tqt/pinentry/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/Makefile.in b/main/pinentry-tqt/pinentry/Makefile.in
index 5d4f9154..5d4f9154 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/Makefile.in
+++ b/main/pinentry-tqt/pinentry/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/argparse.c b/main/pinentry-tqt/pinentry/argparse.c
index ee9c08b9..ee9c08b9 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/argparse.c
+++ b/main/pinentry-tqt/pinentry/argparse.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/argparse.h b/main/pinentry-tqt/pinentry/argparse.h
index 5b652eba..5b652eba 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/argparse.h
+++ b/main/pinentry-tqt/pinentry/argparse.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/password-cache.c b/main/pinentry-tqt/pinentry/password-cache.c
index f9523b1c..f9523b1c 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/password-cache.c
+++ b/main/pinentry-tqt/pinentry/password-cache.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/password-cache.h b/main/pinentry-tqt/pinentry/password-cache.h
index d7ccfeef..d7ccfeef 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/password-cache.h
+++ b/main/pinentry-tqt/pinentry/password-cache.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-curses.c b/main/pinentry-tqt/pinentry/pinentry-curses.c
index cc4cecbe..cc4cecbe 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-curses.c
+++ b/main/pinentry-tqt/pinentry/pinentry-curses.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-curses.h b/main/pinentry-tqt/pinentry/pinentry-curses.h
index b33f1349..b33f1349 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-curses.h
+++ b/main/pinentry-tqt/pinentry/pinentry-curses.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-emacs.c b/main/pinentry-tqt/pinentry/pinentry-emacs.c
index 9685b67d..9685b67d 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-emacs.c
+++ b/main/pinentry-tqt/pinentry/pinentry-emacs.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-emacs.h b/main/pinentry-tqt/pinentry/pinentry-emacs.h
index b05d53bc..b05d53bc 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry-emacs.h
+++ b/main/pinentry-tqt/pinentry/pinentry-emacs.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry.c b/main/pinentry-tqt/pinentry/pinentry.c
index ea11b67f..ea11b67f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry.c
+++ b/main/pinentry-tqt/pinentry/pinentry.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry.h b/main/pinentry-tqt/pinentry/pinentry.h
index b97f069b..b97f069b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/pinentry/pinentry.h
+++ b/main/pinentry-tqt/pinentry/pinentry.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/Makefile.am b/main/pinentry-tqt/qt/Makefile.am
index 4b2cec2b..4b2cec2b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/Makefile.am
+++ b/main/pinentry-tqt/qt/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/Makefile.in b/main/pinentry-tqt/qt/Makefile.in
index f3aeeea4..f3aeeea4 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/Makefile.in
+++ b/main/pinentry-tqt/qt/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/accessibility.cpp b/main/pinentry-tqt/qt/accessibility.cpp
index 7372df74..7372df74 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/accessibility.cpp
+++ b/main/pinentry-tqt/qt/accessibility.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/accessibility.h b/main/pinentry-tqt/qt/accessibility.h
index 831964bb..831964bb 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/accessibility.h
+++ b/main/pinentry-tqt/qt/accessibility.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock.cpp b/main/pinentry-tqt/qt/capslock.cpp
index 2d20864d..2d20864d 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock.cpp
+++ b/main/pinentry-tqt/qt/capslock.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock.h b/main/pinentry-tqt/qt/capslock.h
index b5a04855..b5a04855 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock.h
+++ b/main/pinentry-tqt/qt/capslock.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock_p.h b/main/pinentry-tqt/qt/capslock_p.h
index 8c6fc491..8c6fc491 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock_p.h
+++ b/main/pinentry-tqt/qt/capslock_p.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock_unix.cpp b/main/pinentry-tqt/qt/capslock_unix.cpp
index 320f738b..320f738b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock_unix.cpp
+++ b/main/pinentry-tqt/qt/capslock_unix.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock_win.cpp b/main/pinentry-tqt/qt/capslock_win.cpp
index 960369b4..960369b4 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/capslock_win.cpp
+++ b/main/pinentry-tqt/qt/capslock_win.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/Makefile.am b/main/pinentry-tqt/qt/icons/Makefile.am
index 49cef366..49cef366 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/Makefile.am
+++ b/main/pinentry-tqt/qt/icons/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/Makefile.in b/main/pinentry-tqt/qt/icons/Makefile.in
index f2d3330f..f2d3330f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/Makefile.in
+++ b/main/pinentry-tqt/qt/icons/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/data-error.svg b/main/pinentry-tqt/qt/icons/data-error.svg
index 6fc3137e..6fc3137e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/data-error.svg
+++ b/main/pinentry-tqt/qt/icons/data-error.svg
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/document-encrypt.png b/main/pinentry-tqt/qt/icons/document-encrypt.png
index b80c2a6f..b80c2a6f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/document-encrypt.png
+++ b/main/pinentry-tqt/qt/icons/document-encrypt.png
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/hint.svg b/main/pinentry-tqt/qt/icons/hint.svg
index f6b818fc..f6b818fc 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/hint.svg
+++ b/main/pinentry-tqt/qt/icons/hint.svg
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/password-generate.svg b/main/pinentry-tqt/qt/icons/password-generate.svg
index 12d703c4..12d703c4 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/password-generate.svg
+++ b/main/pinentry-tqt/qt/icons/password-generate.svg
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/visibility.svg b/main/pinentry-tqt/qt/icons/visibility.svg
index df91c9d3..df91c9d3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/icons/visibility.svg
+++ b/main/pinentry-tqt/qt/icons/visibility.svg
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/main.cpp b/main/pinentry-tqt/qt/main.cpp
index 47d15d26..47d15d26 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/main.cpp
+++ b/main/pinentry-tqt/qt/main.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentry_debug.cpp b/main/pinentry-tqt/qt/pinentry_debug.cpp
index 9afbcdb3..9afbcdb3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentry_debug.cpp
+++ b/main/pinentry-tqt/qt/pinentry_debug.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentry_debug.h b/main/pinentry-tqt/qt/pinentry_debug.h
index fc8c808a..fc8c808a 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentry_debug.h
+++ b/main/pinentry-tqt/qt/pinentry_debug.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentryconfirm.cpp b/main/pinentry-tqt/qt/pinentryconfirm.cpp
index a97eaa6e..a97eaa6e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentryconfirm.cpp
+++ b/main/pinentry-tqt/qt/pinentryconfirm.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentryconfirm.h b/main/pinentry-tqt/qt/pinentryconfirm.h
index f175f53a..f175f53a 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentryconfirm.h
+++ b/main/pinentry-tqt/qt/pinentryconfirm.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentrydialog.cpp b/main/pinentry-tqt/qt/pinentrydialog.cpp
index 17e87e6c..17e87e6c 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentrydialog.cpp
+++ b/main/pinentry-tqt/qt/pinentrydialog.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentrydialog.h b/main/pinentry-tqt/qt/pinentrydialog.h
index 60161c58..60161c58 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentrydialog.h
+++ b/main/pinentry-tqt/qt/pinentrydialog.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentryrc.qrc b/main/pinentry-tqt/qt/pinentryrc.qrc
index 2b198de3..2b198de3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinentryrc.qrc
+++ b/main/pinentry-tqt/qt/pinentryrc.qrc
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinlineedit.cpp b/main/pinentry-tqt/qt/pinlineedit.cpp
index 286195d8..286195d8 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinlineedit.cpp
+++ b/main/pinentry-tqt/qt/pinlineedit.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinlineedit.h b/main/pinentry-tqt/qt/pinlineedit.h
index e67ced83..e67ced83 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/pinlineedit.h
+++ b/main/pinentry-tqt/qt/pinlineedit.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/qti18n.cpp b/main/pinentry-tqt/qt/qti18n.cpp
index 8e6bb591..8e6bb591 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/qti18n.cpp
+++ b/main/pinentry-tqt/qt/qti18n.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/util.h b/main/pinentry-tqt/qt/util.h
index 04f35957..04f35957 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt/util.h
+++ b/main/pinentry-tqt/qt/util.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/Makefile.am b/main/pinentry-tqt/qt4/Makefile.am
index dc570a1e..dc570a1e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/Makefile.am
+++ b/main/pinentry-tqt/qt4/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/Makefile.in b/main/pinentry-tqt/qt4/Makefile.in
index 40a19afe..40a19afe 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/Makefile.in
+++ b/main/pinentry-tqt/qt4/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/document-encrypt.png b/main/pinentry-tqt/qt4/document-encrypt.png
index b80c2a6f..b80c2a6f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/document-encrypt.png
+++ b/main/pinentry-tqt/qt4/document-encrypt.png
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/main.cpp b/main/pinentry-tqt/qt4/main.cpp
index a2c155c3..a2c155c3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/main.cpp
+++ b/main/pinentry-tqt/qt4/main.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentry.qrc b/main/pinentry-tqt/qt4/pinentry.qrc
index 94db0548..94db0548 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentry.qrc
+++ b/main/pinentry-tqt/qt4/pinentry.qrc
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentryconfirm.cpp b/main/pinentry-tqt/qt4/pinentryconfirm.cpp
index 65b191cf..65b191cf 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentryconfirm.cpp
+++ b/main/pinentry-tqt/qt4/pinentryconfirm.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentryconfirm.h b/main/pinentry-tqt/qt4/pinentryconfirm.h
index ec116ac3..ec116ac3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentryconfirm.h
+++ b/main/pinentry-tqt/qt4/pinentryconfirm.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentrydialog.cpp b/main/pinentry-tqt/qt4/pinentrydialog.cpp
index 0c4e3855..0c4e3855 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentrydialog.cpp
+++ b/main/pinentry-tqt/qt4/pinentrydialog.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentrydialog.h b/main/pinentry-tqt/qt4/pinentrydialog.h
index 45671b95..45671b95 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinentrydialog.h
+++ b/main/pinentry-tqt/qt4/pinentrydialog.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinlineedit.cpp b/main/pinentry-tqt/qt4/pinlineedit.cpp
index b05bd07b..b05bd07b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinlineedit.cpp
+++ b/main/pinentry-tqt/qt4/pinlineedit.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinlineedit.h b/main/pinentry-tqt/qt4/pinlineedit.h
index b1b48dfd..b1b48dfd 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/pinlineedit.h
+++ b/main/pinentry-tqt/qt4/pinlineedit.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/qrc_pinentry.cpp b/main/pinentry-tqt/qt4/qrc_pinentry.cpp
index 6ab21299..6ab21299 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/qt4/qrc_pinentry.cpp
+++ b/main/pinentry-tqt/qt4/qrc_pinentry.cpp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/Makefile.am b/main/pinentry-tqt/secmem/Makefile.am
index 9e176e76..9e176e76 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/Makefile.am
+++ b/main/pinentry-tqt/secmem/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/Makefile.in b/main/pinentry-tqt/secmem/Makefile.in
index 333ab946..333ab946 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/Makefile.in
+++ b/main/pinentry-tqt/secmem/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/memory.h b/main/pinentry-tqt/secmem/memory.h
index 75fe708b..75fe708b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/memory.h
+++ b/main/pinentry-tqt/secmem/memory.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/secmem++.h b/main/pinentry-tqt/secmem/secmem++.h
index b0aa9e9e..b0aa9e9e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/secmem++.h
+++ b/main/pinentry-tqt/secmem/secmem++.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/secmem-util.h b/main/pinentry-tqt/secmem/secmem-util.h
index b422182b..b422182b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/secmem-util.h
+++ b/main/pinentry-tqt/secmem/secmem-util.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/secmem.c b/main/pinentry-tqt/secmem/secmem.c
index a12f0b3c..a12f0b3c 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/secmem.c
+++ b/main/pinentry-tqt/secmem/secmem.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/util.c b/main/pinentry-tqt/secmem/util.c
index 44609cf6..44609cf6 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/util.c
+++ b/main/pinentry-tqt/secmem/util.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/util.h b/main/pinentry-tqt/secmem/util.h
index 3c8ffb8a..3c8ffb8a 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/secmem/util.h
+++ b/main/pinentry-tqt/secmem/util.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/Makefile.am b/main/pinentry-tqt/tqt/Makefile.am
index 3252bf74..3252bf74 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/Makefile.am
+++ b/main/pinentry-tqt/tqt/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/Makefile.in b/main/pinentry-tqt/tqt/Makefile.in
index ee534a28..ee534a28 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/Makefile.in
+++ b/main/pinentry-tqt/tqt/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/main.cpp b/main/pinentry-tqt/tqt/main.cpp
index af12b9bd..6661ee92 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/main.cpp
+++ b/main/pinentry-tqt/tqt/main.cpp
@@ -26,9 +26,9 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <ntqapplication.h>
-#include <ntqwidget.h>
-#include <ntqmessagebox.h>
+#include <tqapplication.h>
+#include <tqwidget.h>
+#include <tqmessagebox.h>
 #include "secqstring.h"
 
 #include "pinentrydialog.h"
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/pinentrydialog.cpp b/main/pinentry-tqt/tqt/pinentrydialog.cpp
index b7aa309b..feef3988 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/pinentrydialog.cpp
+++ b/main/pinentry-tqt/tqt/pinentrydialog.cpp
@@ -18,12 +18,12 @@
  * SPDX-License-Identifier: GPL-2.0+
  */
 
-#include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqlabel.h>
-#include <ntqmessagebox.h>
-#include <ntqprogressbar.h>
-#include <ntqtooltip.h>
+#include <tqlayout.h>
+#include <tqpushbutton.h>
+#include <tqlabel.h>
+#include <tqmessagebox.h>
+#include <tqprogressbar.h>
+#include <tqtooltip.h>
 
 #include "secqlineedit.h"
 
@@ -84,18 +84,18 @@ PinEntryDialog::PinEntryDialog( TQWidget* parent, const char* name,
 
   _ok->setDefault(true);
 
-  connect( _ok, SIGNAL( clicked() ),
-	   this, SIGNAL( accepted() ) );
-  connect( _cancel, SIGNAL( clicked() ),
-	   this, SIGNAL( rejected() ) );
-  connect( _edit, SIGNAL( textModified(const SecTQString&) ),
-	   this, SLOT( updateQuality(const SecTQString&) ) );
-  connect (_edit, SIGNAL (backspacePressed()),
-	   this, SLOT (onBackspace ()));
-  connect (this, SIGNAL (accepted ()),
-	   this, SLOT (accept ()));
-  connect (this, SIGNAL (rejected ()),
-	   this, SLOT (reject ()));
+  connect( _ok, TQ_SIGNAL( clicked() ),
+	   this, TQ_SIGNAL( accepted() ) );
+  connect( _cancel, TQ_SIGNAL( clicked() ),
+	   this, TQ_SIGNAL( rejected() ) );
+  connect( _edit, TQ_SIGNAL( textModified(const SecTQString&) ),
+	   this, TQ_SLOT( updateQuality(const SecTQString&) ) );
+  connect (_edit, TQ_SIGNAL (backspacePressed()),
+	   this, TQ_SLOT (onBackspace ()));
+  connect (this, TQ_SIGNAL (accepted ()),
+	   this, TQ_SLOT (accept ()));
+  connect (this, TQ_SIGNAL (rejected ()),
+	   this, TQ_SLOT (reject ()));
   _edit->setFocus();
 }
 
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/pinentrydialog.h b/main/pinentry-tqt/tqt/pinentrydialog.h
index 8ec3fd5c..78850f5f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/pinentrydialog.h
+++ b/main/pinentry-tqt/tqt/pinentrydialog.h
@@ -20,7 +20,7 @@
 #ifndef __PINENTRYDIALOG_H__
 #define __PINENTRYDIALOG_H__
 
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #include "pinentry.h"
 
 class TQLabel;
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqinternal.cpp b/main/pinentry-tqt/tqt/secqinternal.cpp
index 7accf709..90849895 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqinternal.cpp
+++ b/main/pinentry-tqt/tqt/secqinternal.cpp
@@ -38,10 +38,10 @@
 **********************************************************************/
 
 #include "secqinternal_p.h"
-#include "ntqwidget.h"
-#include "ntqpixmap.h"
-#include "ntqpainter.h"
-#include "ntqcleanuphandler.h"
+#include "tqwidget.h"
+#include "tqpixmap.h"
+#include "tqpainter.h"
+#include "tqcleanuphandler.h"
 
 static TQPixmap* qdb_shared_pixmap = 0;
 static TQPixmap *qdb_force_pixmap = 0;
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqinternal_p.h b/main/pinentry-tqt/tqt/secqinternal_p.h
index a05c9c3f..034817e8 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqinternal_p.h
+++ b/main/pinentry-tqt/tqt/secqinternal_p.h
@@ -52,18 +52,18 @@
 //
 //
 #ifndef QT_H
-#include "ntqnamespace.h"
-#include "ntqrect.h"
-#include "ntqptrlist.h"
-#include "ntqcstring.h"
-#include "ntqiodevice.h"
+#include "tqnamespace.h"
+#include "tqrect.h"
+#include "tqptrlist.h"
+#include "tqcstring.h"
+#include "tqiodevice.h"
 #endif // QT_H
 
 class TQWidget;
 class TQPainter;
 class TQPixmap;
 
-class Q_EXPORT SecTQSharedDoubleBuffer
+class TQ_EXPORT SecTQSharedDoubleBuffer
 {
 public:
     enum DoubleBufferFlags {
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqlineedit.cpp b/main/pinentry-tqt/tqt/secqlineedit.cpp
index da0637a5..bcf83290 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqlineedit.cpp
+++ b/main/pinentry-tqt/tqt/secqlineedit.cpp
@@ -67,27 +67,27 @@
 **********************************************************************/
 
 #include "secqlineedit.h"
-#include "ntqpainter.h"
-#include "ntqdrawutil.h"
-#include "ntqfontmetrics.h"
-#include "ntqpixmap.h"
-#include "ntqclipboard.h"
-#include "ntqapplication.h"
-#include "ntqtimer.h"
-#include "ntqpopupmenu.h"
-#include "ntqstringlist.h"
-#include "ntqguardedptr.h"
-#include "ntqstyle.h"
-#include "ntqwhatsthis.h"
+#include "tqpainter.h"
+#include "tqdrawutil.h"
+#include "tqfontmetrics.h"
+#include "tqpixmap.h"
+#include "tqclipboard.h"
+#include "tqapplication.h"
+#include "tqtimer.h"
+#include "tqpopupmenu.h"
+#include "tqstringlist.h"
+#include "tqguardedptr.h"
+#include "tqstyle.h"
+#include "tqwhatsthis.h"
 #include "secqinternal_p.h"
-#include "private/qtextlayout_p.h"
-#include "ntqvaluevector.h"
+#include "private/tqtextlayout_p.h"
+#include "tqvaluevector.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "ntqaccessible.h"
+#include "tqaccessible.h"
 #endif
 
-#ifndef QT_NO_ACCEL
-#include "ntqkeysequence.h"
+#ifndef TQT_NO_ACCEL
+#include "tqkeysequence.h"
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
@@ -235,7 +235,7 @@ struct SecTQLineEditPrivate : public TQt
     inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
     inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
     void removeSelectedText();
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     void copy( bool clipboard = TRUE ) const;
 #endif
     inline bool inSelection( int x ) const
@@ -1018,14 +1018,14 @@ bool SecTQLineEdit::isReadOnly() const
 void SecTQLineEdit::setReadOnly( bool enable )
 {
     d->readOnly = enable;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     setCursor( enable ? arrowCursor : ibeamCursor );
 #endif
     update();
 }
 
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 /*!
     Copies the selected text to the clipboard and deletes it, if there
     is any, and if echoMode() is \c Normal.
@@ -1073,15 +1073,15 @@ void SecTQLineEditPrivate::copy( bool clipboard ) const
 #ifndef SECURE
     TQString t = q->selectedText();
     if ( !t.isEmpty() && echoMode == SecTQLineEdit::Normal ) {
-	q->disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), q, 0);
+	q->disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), q, 0);
 	TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection );
-	q->connect( TQApplication::clipboard(), SIGNAL(selectionChanged()),
-		 q, SLOT(clipboardChanged()) );
+	q->connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()),
+		 q, TQ_SLOT(clipboardChanged()) );
     }
 #endif
 }
 
-#endif // !QT_NO_CLIPBOARD
+#endif // !TQT_NO_CLIPBOARD
 
 /*!\reimp
 */
@@ -1177,7 +1177,7 @@ void SecTQLineEdit::mousePressEvent( TQMouseEvent* e )
 void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
 {
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( ( e->state() & MouseButtonMask ) == 0 ) {
 	if ( !d->readOnly )
 	  setCursor( ( d->inSelection( e->pos().x() ) ? arrowCursor : ibeamCursor ) );
@@ -1193,7 +1193,7 @@ void SecTQLineEdit::mouseMoveEvent( TQMouseEvent * e )
 */
 void SecTQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
 {
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     if (TQApplication::clipboard()->supportsSelection() ) {
 	if ( e->button() == LeftButton ) {
 	    d->copy( FALSE );
@@ -1286,7 +1286,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
 	case Key_B:
 	    cursorForward( e->state() & ShiftButton, -1 );
 	    break;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case Key_C:
 	    copy();
 	    break;
@@ -1322,7 +1322,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
 		clear();
 	    break;
 #endif
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case Key_V:
 	    if ( !d->readOnly )
 		paste();
@@ -1431,7 +1431,7 @@ void SecTQLineEdit::keyPressEvent( TQKeyEvent * e )
 	    if ( !d->readOnly )
 		undo();
 	    break;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case Key_F16: // Copy key on Sun keyboards
 	    copy();
 	    break;
@@ -1720,7 +1720,7 @@ void SecTQLineEdit::clipboardChanged()
 
 void SecTQLineEditPrivate::init( const SecTQString& txt )
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     q->setCursor( readOnly ? arrowCursor : ibeamCursor );
 #endif
     q->setFocusPolicy( TQWidget::StrongFocus );
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqlineedit.h b/main/pinentry-tqt/tqt/secqlineedit.h
index 126f2314..fb581c8f 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqlineedit.h
+++ b/main/pinentry-tqt/tqt/secqlineedit.h
@@ -1,8 +1,8 @@
-/* secntqlineedit.h - Secure version of TQLineEdit.
+/* secqlineedit.h - Secure version of TQLineEdit.
  * Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
  * Copyright (C) 2003 g10 Code GmbH
  *
- * The license of the original ntqlineedit.h file from which this file
+ * The license of the original tqlineedit.h file from which this file
  * is derived can be found below.  Modified by Marcus Brinkmann
  * <marcus@g10code.de>.  All modifications are licensed as follows, so
  * that the intersection of the two licenses is then the GNU General
@@ -73,14 +73,14 @@ struct SecTQLineEditPrivate;
 class TQPopupMenu;
 
 #ifndef QT_H
-#include "ntqframe.h"
-#include "ntqstring.h"
+#include "tqframe.h"
+#include "tqstring.h"
 #endif // QT_H
 
 class TQTextParagraph;
 class TQTextCursor;
 
-class Q_EXPORT SecTQLineEdit : public TQFrame
+class TQ_EXPORT SecTQLineEdit : public TQFrame
 {
     TQ_OBJECT
     TQ_ENUMS( EchoMode )
@@ -127,7 +127,7 @@ public:
 
     int alignment() const;
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     void cursorLeft( bool mark, int steps = 1 ) { cursorForward( mark, -steps ); }
     void cursorRight( bool mark, int steps = 1 ) { cursorForward( mark, steps ); }
 #endif
@@ -153,7 +153,7 @@ public:
     bool isUndoAvailable() const;
     bool isRedoAvailable() const;
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     bool hasMarkedText() const { return hasSelectedText(); }
     SecTQString markedText() const { return selectedText(); }
 #endif
@@ -175,7 +175,7 @@ public slots:
     virtual void setSelection( int, int );
     virtual void setCursorPosition( int );
     virtual void setAlignment( int flag );
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     virtual void cut();
     virtual void copy() const;
     virtual void paste();
@@ -204,7 +204,7 @@ protected:
     void resizeEvent( TQResizeEvent * );
     void drawContents( TQPainter * );
     void windowActivationChange( bool );
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     void repaintArea( int, int ) { update(); }
 #endif
 
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqstring.cpp b/main/pinentry-tqt/tqt/secqstring.cpp
index 82dd9180..1d6529ba 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqstring.cpp
+++ b/main/pinentry-tqt/tqt/secqstring.cpp
@@ -80,8 +80,8 @@ static uint computeNewMax( uint len )
 // IMPORTANT! If you change these, make sure you also change the
 // "delete unicode" statement in ~SecTQStringData() in SecTQString.h correspondingly!
 
-#define QT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
-#define QT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
+#define TQT_ALLOC_SECTQCHAR_VEC(N) (TQChar*) ::secmem_malloc (sizeof(TQChar) * (N))
+#define TQT_DELETE_SECTQCHAR_VEC(P) ::secmem_free (P)
 
 
 /*****************************************************************************
@@ -138,7 +138,7 @@ static uint computeNewMax( uint len )
     and join a list of strings into a single string with an optional
     separator using SecTQStringList::join(). You can obtain a list of
     strings from a string list that contain a particular substring or
-    that match a particular \link ntqregexp.html regex\endlink using
+    that match a particular \link tqregexp.html regex\endlink using
     SecTQStringList::grep().
 
     <b>Note for C programmers</b>
@@ -188,13 +188,13 @@ static uint computeNewMax( uint len )
     \sa TQChar TQCString TQByteArray SecTQConstString
 */
 
-Q_EXPORT SecTQStringData *SecTQString::shared_null = 0;
-QT_STATIC_CONST_IMPL SecTQString SecTQString::null;
-QT_STATIC_CONST_IMPL TQChar TQChar::null;
-QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff);
-QT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
-QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0);
+TQ_EXPORT SecTQStringData *SecTQString::shared_null = 0;
+const SecTQString SecTQString::null;
+const TQChar TQChar::null;
+const TQChar TQChar::replacement((ushort)0xfffd);
+const TQChar TQChar::byteOrderMark((ushort)0xfeff);
+const TQChar TQChar::byteOrderSwapped((ushort)0xfffe);
+const TQChar TQChar::nbsp((ushort)0x00a0);
 
 SecTQStringData* SecTQString::makeSharedNull()
 {
@@ -220,7 +220,7 @@ SecTQStringData* SecTQString::makeSharedNull()
 */
 SecTQString::SecTQString( TQChar ch )
 {
-    d = new SecTQStringData( QT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
+    d = new SecTQStringData( TQT_ALLOC_SECTQCHAR_VEC( 1 ), 1, 1 );
     d->unicode[0] = ch;
 }
 
@@ -239,7 +239,7 @@ SecTQString::SecTQString( int size, bool /*dummy*/ )
 {
     if ( size ) {
 	int l = size;
-	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( l );
+	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( l );
 	d = new SecTQStringData( uc, 0, l );
     } else {
 	d = shared_null ? shared_null : (shared_null=new SecTQStringData);
@@ -258,7 +258,7 @@ SecTQString::SecTQString( const TQString &str )
 	d = shared_null ? shared_null : makeSharedNull();
 	d->ref();
     } else {
-	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
+	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
 	if ( unicode )
 	    memcpy(uc, unicode, length*sizeof(TQChar));
 	d = new SecTQStringData(uc,unicode ? length : 0,length);
@@ -287,7 +287,7 @@ SecTQString::SecTQString( const TQChar* unicode, uint length )
 	d = shared_null ? shared_null : makeSharedNull();
 	d->ref();
     } else {
-	TQChar* uc = QT_ALLOC_SECTQCHAR_VEC( length );
+	TQChar* uc = TQT_ALLOC_SECTQCHAR_VEC( length );
 	if ( unicode )
 	    memcpy(uc, unicode, length*sizeof(TQChar));
 	d = new SecTQStringData(uc,unicode ? length : 0,length);
@@ -429,7 +429,7 @@ void SecTQString::setLength( uint newLen )
 	 ( newLen * 4 < d->maxl && d->maxl > 4 ) ) {
 	// detach, grow or shrink
 	uint newMax = computeNewMax( newLen );
-	TQChar* nd = QT_ALLOC_SECTQCHAR_VEC( newMax );
+	TQChar* nd = TQT_ALLOC_SECTQCHAR_VEC( newMax );
 	if ( nd ) {
 	    uint len = TQMIN( d->len, newLen );
 	    memcpy( nd, d->unicode, sizeof(TQChar) * len );
@@ -548,7 +548,7 @@ SecTQString SecTQString::mid( uint index, uint len ) const
 	    len = slen - index;
 	if ( index == 0 && len == slen )
 	    return *this;
-	register const TQChar *p = unicode()+index;
+	const TQChar *p = unicode()+index;
 	SecTQString s( len, TRUE );
 	memcpy( s.d->unicode, p, len * sizeof(TQChar) );
 	s.d->len = len;
@@ -594,10 +594,10 @@ SecTQString &SecTQString::insert( uint index, const TQChar* s, uint len )
 
     if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
 	// Part of me - take a copy.
-	TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( len );
+	TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( len );
 	memcpy(tmp,s,len*sizeof(TQChar));
 	insert(index,tmp,len);
-	QT_DELETE_SECTQCHAR_VEC( tmp );
+	TQT_DELETE_SECTQCHAR_VEC( tmp );
 	return *this;
     }
 
@@ -669,10 +669,10 @@ SecTQString &SecTQString::replace( uint index, uint len, const TQChar* s, uint s
 	memcpy( d->unicode+index, s, len * sizeof(TQChar) );
     } else if ( s >= d->unicode && (uint)(s - d->unicode) < d->maxl ) {
 	// Part of me - take a copy.
-	TQChar *tmp = QT_ALLOC_SECTQCHAR_VEC( slen );
+	TQChar *tmp = TQT_ALLOC_SECTQCHAR_VEC( slen );
 	memcpy( tmp, s, slen * sizeof(TQChar) );
 	replace( index, len, tmp, slen );
-	QT_DELETE_SECTQCHAR_VEC( tmp );
+	TQT_DELETE_SECTQCHAR_VEC( tmp );
     } else {
 	remove( index, len );
 	insert( index, s, slen );
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqstring.h b/main/pinentry-tqt/tqt/secqstring.h
index e8fa5548..392fb59b 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tqt/secqstring.h
+++ b/main/pinentry-tqt/tqt/secqstring.h
@@ -1,8 +1,8 @@
-/* secntqstring.h - Secure version of TQString.
+/* sectqstring.h - Secure version of TQString.
  * Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
  * Copyright (C) 2003 g10 Code GmbH
  *
- * The license of the original ntqstring.h file from which this file is
+ * The license of the original tqstring.h file from which this file is
  * derived can be found below.  Modified by Marcus Brinkmann
  * <marcus@g10code.de>.  All modifications are licensed as follows, so
  * that the intersection of the two licenses is then the GNU General
@@ -71,10 +71,10 @@ extern "C"
 /* We need the original qchar and qstring for transparent conversion
    from TQChar to TQChar and TQString to SecTQString (but not the other
    way round).  */
-#include <ntqstring.h>
+#include <tqstring.h>
 
 #ifndef QT_H
-#include "ntqcstring.h"
+#include "tqcstring.h"
 #endif // QT_H
 
 
@@ -87,7 +87,7 @@ class SecTQCharRef;
 template <class T> class TQDeepCopy;
 #include <stdio.h>
 // internal
-struct Q_EXPORT SecTQStringData : public TQShared {
+struct TQ_EXPORT SecTQStringData : public TQShared {
     SecTQStringData() :
         TQShared(), unicode(0), len(0), maxl(0) { ref(); }
     SecTQStringData(TQChar *u, uint l, uint m) :
@@ -109,7 +109,7 @@ struct Q_EXPORT SecTQStringData : public TQShared {
 };
 
 
-class Q_EXPORT SecTQString
+class TQ_EXPORT SecTQString
 {
 public:
     SecTQString();                                  // make null string
@@ -125,7 +125,7 @@ public:
 
     SecTQString    &operator=( const SecTQString & );   // impl-shared copy
 
-    QT_STATIC_CONST SecTQString null;
+    static const SecTQString null;
 
     bool        isNull()        const;
     bool        isEmpty()       const;
@@ -191,7 +191,7 @@ private:
     friend class TQDeepCopy<SecTQString>;
 };
 
-class Q_EXPORT SecTQCharRef {
+class TQ_EXPORT SecTQCharRef {
     friend class SecTQString;
     SecTQString& s;
     uint p;
@@ -249,7 +249,7 @@ public:
 inline SecTQCharRef SecTQString::at( uint i ) { return SecTQCharRef(this,i); }
 inline SecTQCharRef SecTQString::operator[]( int i ) { return at((uint)i); }
 
-class Q_EXPORT SecTQConstString : private SecTQString {
+class TQ_EXPORT SecTQConstString : private SecTQString {
 public:
     SecTQConstString( const TQChar* unicode, uint length );
     ~SecTQConstString();
@@ -297,7 +297,7 @@ inline bool SecTQString::isEmpty() const
   SecTQString non-member operators
  *****************************************************************************/
 
-Q_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
+TQ_EXPORT inline const SecTQString operator+( const SecTQString &s1, const SecTQString &s2 )
 {
     SecTQString tmp( s1 );
     tmp += s2;
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tty/Makefile.am b/main/pinentry-tqt/tty/Makefile.am
index 260ee390..260ee390 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tty/Makefile.am
+++ b/main/pinentry-tqt/tty/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tty/Makefile.in b/main/pinentry-tqt/tty/Makefile.in
index 2bb778f5..2bb778f5 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tty/Makefile.in
+++ b/main/pinentry-tqt/tty/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tty/pinentry-tty.c b/main/pinentry-tqt/tty/pinentry-tty.c
index c4d85c60..c4d85c60 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/tty/pinentry-tty.c
+++ b/main/pinentry-tqt/tty/pinentry-tty.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/Makefile.am b/main/pinentry-tqt/w32/Makefile.am
index 12c66db6..12c66db6 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/Makefile.am
+++ b/main/pinentry-tqt/w32/Makefile.am
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/Makefile.in b/main/pinentry-tqt/w32/Makefile.in
index d7acbb72..d7acbb72 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/Makefile.in
+++ b/main/pinentry-tqt/w32/Makefile.in
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-128.bmp b/main/pinentry-tqt/w32/logo-128.bmp
index 883475b3..883475b3 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-128.bmp
+++ b/main/pinentry-tqt/w32/logo-128.bmp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-32.bmp b/main/pinentry-tqt/w32/logo-32.bmp
index 38d60183..38d60183 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-32.bmp
+++ b/main/pinentry-tqt/w32/logo-32.bmp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-48.bmp b/main/pinentry-tqt/w32/logo-48.bmp
index 53c62743..53c62743 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-48.bmp
+++ b/main/pinentry-tqt/w32/logo-48.bmp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-64.bmp b/main/pinentry-tqt/w32/logo-64.bmp
index 7d4ca29a..7d4ca29a 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-64.bmp
+++ b/main/pinentry-tqt/w32/logo-64.bmp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-96.bmp b/main/pinentry-tqt/w32/logo-96.bmp
index f0496c88..f0496c88 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/logo-96.bmp
+++ b/main/pinentry-tqt/w32/logo-96.bmp
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/main.c b/main/pinentry-tqt/w32/main.c
index d8a48339..d8a48339 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/main.c
+++ b/main/pinentry-tqt/w32/main.c
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/pinentry-w32.rc b/main/pinentry-tqt/w32/pinentry-w32.rc
index bc3dacbd..bc3dacbd 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/pinentry-w32.rc
+++ b/main/pinentry-tqt/w32/pinentry-w32.rc
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/resource.h b/main/pinentry-tqt/w32/resource.h
index 4311bf3e..4311bf3e 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/w32/resource.h
+++ b/main/pinentry-tqt/w32/resource.h
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/README.Debian b/packaging/debian/pinentry-tqt/debian/README.Debian
index 09d64a97..09d64a97 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/README.Debian
+++ b/packaging/debian/pinentry-tqt/debian/README.Debian
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/changelog b/packaging/debian/pinentry-tqt/debian/changelog
index 40938d15..40938d15 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/changelog
+++ b/packaging/debian/pinentry-tqt/debian/changelog
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/clean b/packaging/debian/pinentry-tqt/debian/clean
index e06b79e9..e06b79e9 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/clean
+++ b/packaging/debian/pinentry-tqt/debian/clean
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/compat b/packaging/debian/pinentry-tqt/debian/compat
index ec635144..ec635144 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/compat
+++ b/packaging/debian/pinentry-tqt/debian/compat
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/control b/packaging/debian/pinentry-tqt/debian/control
index a516af43..a516af43 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/control
+++ b/packaging/debian/pinentry-tqt/debian/control
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/copyright b/packaging/debian/pinentry-tqt/debian/copyright
index 3711cad2..3711cad2 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/copyright
+++ b/packaging/debian/pinentry-tqt/debian/copyright
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/gbp.conf b/packaging/debian/pinentry-tqt/debian/gbp.conf
index 0c87d574..0c87d574 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/gbp.conf
+++ b/packaging/debian/pinentry-tqt/debian/gbp.conf
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/not-installed b/packaging/debian/pinentry-tqt/debian/not-installed
index 4cf6e4ce..4cf6e4ce 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/not-installed
+++ b/packaging/debian/pinentry-tqt/debian/not-installed
diff --git a/packaging/debian/pinentry-tqt/debian/patches/series b/packaging/debian/pinentry-tqt/debian/patches/series
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packaging/debian/pinentry-tqt/debian/patches/series
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.1 b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.1
index 862aead7..862aead7 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.1
+++ b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.1
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.install b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.install
index fb5a1347..fb5a1347 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.install
+++ b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.install
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.manpages b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.manpages
index 7c89b9a4..7c89b9a4 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.manpages
+++ b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.manpages
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.postinst b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.postinst
index 3e07e8ac..3e07e8ac 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.postinst
+++ b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.postinst
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.prerm b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.prerm
index 2febd750..2febd750 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/pinentry-tqt.prerm
+++ b/packaging/debian/pinentry-tqt/debian/pinentry-tqt.prerm
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/rules b/packaging/debian/pinentry-tqt/debian/rules
index 940764dd..940764dd 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/rules
+++ b/packaging/debian/pinentry-tqt/debian/rules
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source/format b/packaging/debian/pinentry-tqt/debian/source/format
index 163aaf8d..163aaf8d 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source/format
+++ b/packaging/debian/pinentry-tqt/debian/source/format
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source/options b/packaging/debian/pinentry-tqt/debian/source/options
index d71748bb..d71748bb 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source/options
+++ b/packaging/debian/pinentry-tqt/debian/source/options
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/tests/control b/packaging/debian/pinentry-tqt/debian/tests/control
index af216f95..af216f95 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/tests/control
+++ b/packaging/debian/pinentry-tqt/debian/tests/control
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/tests/simple-tty b/packaging/debian/pinentry-tqt/debian/tests/simple-tty
index cbe0a103..cbe0a103 100755
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/tests/simple-tty
+++ b/packaging/debian/pinentry-tqt/debian/tests/simple-tty
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/upstream/signing-key.asc b/packaging/debian/pinentry-tqt/debian/upstream/signing-key.asc
index 8e2ce73d..8e2ce73d 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/upstream/signing-key.asc
+++ b/packaging/debian/pinentry-tqt/debian/upstream/signing-key.asc
diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/watch b/packaging/debian/pinentry-tqt/debian/watch
index 0f219698..0f219698 100644
--- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/watch
+++ b/packaging/debian/pinentry-tqt/debian/watch