From 34f077da4d7246ffd8821b80dce941adf27bce90 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Thu, 5 Feb 2026 05:23:02 +0100 Subject: DEB pinentry-tqt: Replace TRUE/FALSE with boolean values true/false. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Changes to silence lintian reports. + Bump debhelper compatibility level to 10. + Replace pkg-config dependency with pkgconf. Signed-off-by: Slávek Banko --- .../pinentry-tqt-1.2.1/debian/changelog | 8 + .../pinentry-tqt/pinentry-tqt-1.2.1/debian/compat | 2 +- .../pinentry-tqt/pinentry-tqt-1.2.1/debian/control | 4 +- .../debian/patches/0007-tq-headers | 190 ------ .../debian/patches/0007-tq-headers.diff | 190 ++++++ .../debian/patches/0008-tqt-rename-true-false.diff | 657 +++++++++++++++++++++ .../pinentry-tqt-1.2.1/debian/patches/series | 3 +- .../debian/source.lintian-overrides | 9 + 8 files changed, 869 insertions(+), 194 deletions(-) delete mode 100644 debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers create mode 100644 debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers.diff create mode 100644 debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0008-tqt-rename-true-false.diff create mode 100644 debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source.lintian-overrides diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/changelog b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/changelog index 40938d15..a6a35d5f 100644 --- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/changelog +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/changelog @@ -1,3 +1,11 @@ +pinentry-tqt (1.2.1-4~3) unstable; urgency=medium + + * Replace TRUE/FALSE with boolean values true/false. + * Bump debhelper compatibility level to 10. + * Replace pkg-config dependency with pkgconf. + + -- Slávek Banko Thu, 05 Feb 2026 05:10:25 +0100 + pinentry-tqt (1.2.1-4~2) unstable; urgency=medium * Use tq* headers diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/compat b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/compat index ec635144..f599e28b 100644 --- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/compat +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/control b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/control index a516af43..7ec77f0d 100644 --- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/control +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/control @@ -5,14 +5,14 @@ Maintainer: Debian GnuPG Maintainers Uploaders: Daniel Kahn Gillmor , Build-Depends: - debhelper (>= 9~), + debhelper (>= 10~), libassuan-dev (>= 2.1.0), libgcr-3-dev, libgpg-error-dev (>= 1.16), libncurses-dev | libncurses5-dev, libncurses-dev | libncursesw5-dev, m4, - pkg-config, + pkgconf, libtqt3-mt-dev, tqt3-apps-dev, texinfo, Standards-Version: 4.6.1 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 - #include - --#include --#include --#include -+#include -+#include -+#include - #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 --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include - - #include "secqlineedit.h" - ---- a/tqt/pinentrydialog.h -+++ b/tqt/pinentrydialog.h -@@ -20,7 +20,7 @@ - #ifndef __PINENTRYDIALOG_H__ - #define __PINENTRYDIALOG_H__ - --#include -+#include - #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 - * . 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(). - - Note for C programmers ---- 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 - * . 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 -+#include - - #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/0007-tq-headers.diff b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers.diff new file mode 100644 index 00000000..65cb08d0 --- /dev/null +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0007-tq-headers.diff @@ -0,0 +1,190 @@ +--- a/tqt/main.cpp ++++ b/tqt/main.cpp +@@ -26,9 +26,9 @@ + #include + #include + +-#include +-#include +-#include ++#include ++#include ++#include + #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 +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "secqlineedit.h" + +--- a/tqt/pinentrydialog.h ++++ b/tqt/pinentrydialog.h +@@ -20,7 +20,7 @@ + #ifndef __PINENTRYDIALOG_H__ + #define __PINENTRYDIALOG_H__ + +-#include ++#include + #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 + * . 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(). + + Note for C programmers +--- 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 + * . 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 ++#include + + #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/0008-tqt-rename-true-false.diff b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0008-tqt-rename-true-false.diff new file mode 100644 index 00000000..a0298511 --- /dev/null +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/0008-tqt-rename-true-false.diff @@ -0,0 +1,657 @@ +Index: b/tqt/secqinternal.cpp +=================================================================== +--- a/tqt/secqinternal.cpp ++++ b/tqt/secqinternal.cpp +@@ -50,9 +50,9 @@ + static TQCleanupHandler qdb_pixmap_cleanup; + + #ifdef Q_WS_MACX +-bool SecTQSharedDoubleBuffer::dblbufr = FALSE; ++bool SecTQSharedDoubleBuffer::dblbufr = false; + #else +-bool SecTQSharedDoubleBuffer::dblbufr = TRUE; ++bool SecTQSharedDoubleBuffer::dblbufr = true; + #endif + + +@@ -162,7 +162,7 @@ + bool SecTQSharedDoubleBufferCleaner::event( TQEvent *e ) + { + if ( e->type() != TQEvent::Timer ) +- return FALSE; ++ return false; + + TQTimerEvent *event = (TQTimerEvent *) e; + if ( event->timerId() == timer_id ) { +@@ -172,11 +172,11 @@ + #ifdef QT_CHECK_STATE + else { + tqWarning( "SecTQSharedDoubleBufferCleaner::event: invalid timer event received." ); +- return FALSE; ++ return false; + } + #endif // QT_CHECK_STATE + +- return TRUE; ++ return true; + } + + // static instance +@@ -326,7 +326,7 @@ + tqWarning( "SecTQSharedDoubleBuffer::begin: Buffer is already active." + "\n\tYou must end() the buffer before a second begin()" ); + #endif // QT_CHECK_STATE +- return FALSE; ++ return false; + } + + external_p = painter; +@@ -360,7 +360,7 @@ + p = external_p; + } + +- return TRUE; ++ return true; + } + + /* \internal +@@ -381,7 +381,7 @@ + tqWarning( "SecTQSharedDoubleBuffer::begin: Buffer is already active." + "\n\tYou must end() the buffer before a second begin()" ); + #endif // QT_CHECK_STATE +- return FALSE; ++ return false; + } + + state = Active; +@@ -421,7 +421,7 @@ + wid->erase( rx, ry, rw, rh ); + } + } +- return TRUE; ++ return true; + } + + /* \internal +@@ -438,7 +438,7 @@ + tqWarning( "SecTQSharedDoubleBuffer::end: Buffer is not active." + "\n\tYou must call begin() before calling end()." ); + #endif // QT_CHECK_STATE +- return FALSE; ++ return false; + } + + if ( ! ( state & ExternalPainter ) ) { +@@ -460,7 +460,7 @@ + p = external_p = 0; + pix = 0; + +- return TRUE; ++ return true; + } + + /* \internal +@@ -581,13 +581,13 @@ + /* \internal + \fn bool SecTQSharedDoubleBuffer::isDisabled() + +- Returns TRUE is double buffering is disabled globally, FALSE otherwise. ++ Returns true is double buffering is disabled globally, false otherwise. + */ + + /* \internal + \fn void SecTQSharedDoubleBuffer::setDisabled( bool off ) + +- Disables global double buffering \a off is TRUE, otherwise global ++ Disables global double buffering \a off is true, otherwise global + double buffering is enabled. + */ + +@@ -627,11 +627,11 @@ + /* \internal + \fn bool SecTQSharedDoubleBuffer::isActive() const + +- Returns TRUE if double buffered painting is active, FALSE otherwise. ++ Returns true if double buffered painting is active, false otherwise. + */ + + /* \internal + \fn bool SecTQSharedDoubleBuffer::isBuffered() const + +- Returns TRUE if painting is double buffered, FALSE otherwise. ++ Returns true if painting is double buffered, false otherwise. + */ +Index: b/tqt/secqlineedit.cpp +=================================================================== +--- a/tqt/secqlineedit.cpp ++++ b/tqt/secqlineedit.cpp +@@ -130,7 +130,7 @@ + int menuId; + int hscroll; + +- void finishChange( int validateFromState = -1, bool setModified = TRUE ); ++ void finishChange( int validateFromState = -1, bool setModified = true ); + + void setCursorVisible( bool visible ); + +@@ -152,10 +152,10 @@ + #endif /* SECURE_NO_UNDO */ + + void insert( const SecTQString& s ); +- void del( bool wasBackspace = FALSE ); ++ void del( bool wasBackspace = false ); + void remove( int pos ); + +- inline void separate() { separator = TRUE; } ++ inline void separate() { separator = true; } + #ifndef SECURE_NO_UNDO + inline void undo( int until = -1 ) { + if ( !isUndoAvailable() ) +@@ -189,7 +189,7 @@ + } + } + modified = ( undoState != 0 ); +- textDirty = TRUE; ++ textDirty = true; + } + inline void redo() { + if ( !isRedoAvailable() ) +@@ -219,7 +219,7 @@ + break; + } + } +- textDirty = TRUE; ++ textDirty = true; + } + #endif /* SECURE_NO_UNDO */ + inline bool isUndoAvailable() const { return !readOnly && undoState; } +@@ -236,10 +236,10 @@ + inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; } + void removeSelectedText(); + #ifndef TQT_NO_CLIPBOARD +- void copy( bool clipboard = TRUE ) const; ++ void copy( bool clipboard = true ) const; + #endif + inline bool inSelection( int x ) const +- { if ( selstart >= selend ) return FALSE; ++ { if ( selstart >= selend ) return false; + int pos = xToPos( x, TQTextItem::OnCharacters ); return pos >= selstart && pos < selend; } + + // input methods +@@ -248,7 +248,7 @@ + // complex text layout + TQTextLayout textLayout; + void updateTextLayout(); +- void moveCursor( int pos, bool mark = FALSE ); ++ void moveCursor( int pos, bool mark = false ); + void setText( const SecTQString& txt ); + int xToPos( int x, TQTextItem::CursorPosition = TQTextItem::BetweenCharacters ) const; + inline int visualAlignment() const { return alignment ? alignment : int( isRightToLeft() ? AlignRight : AlignLeft ); } +@@ -293,7 +293,7 @@ + + By default, SecTQLineEdits have a frame as specified by the Windows + and Motif style guides; you can turn it off by calling +- setFrame(FALSE). ++ setFrame(false). + + The default key bindings are described below. + \target desc +@@ -411,7 +411,7 @@ + + Setting this property clears the selection, clears the undo/redo + history, moves the cursor to the end of the line and resets the +- \c modified property to FALSE. ++ \c modified property to false. + + The text is truncated to maxLength() length. + +@@ -426,8 +426,8 @@ + { + resetInputContext(); + d->setText( text ); +- d->modified = FALSE; +- d->finishChange( -1, FALSE ); ++ d->modified = false; ++ d->finishChange( -1, false ); + } + + +@@ -644,9 +644,9 @@ + */ + + /*! +- Moves the cursor forward \a steps characters. If \a mark is TRUE ++ Moves the cursor forward \a steps characters. If \a mark is true + each character moved over is added to the selection; if \a mark is +- FALSE the selection is cleared. ++ false the selection is cleared. + + \sa cursorBackward() + */ +@@ -666,9 +666,9 @@ + + + /*! +- Moves the cursor back \a steps characters. If \a mark is TRUE each ++ Moves the cursor back \a steps characters. If \a mark is true each + character moved over is added to the selection; if \a mark is +- FALSE the selection is cleared. ++ false the selection is cleared. + + \sa cursorForward() + */ +@@ -678,7 +678,7 @@ + } + + /*! +- Moves the cursor one word forward. If \a mark is TRUE, the word is ++ Moves the cursor one word forward. If \a mark is true, the word is + also selected. + + \sa cursorWordBackward() +@@ -689,7 +689,7 @@ + } + + /*! +- Moves the cursor one word backward. If \a mark is TRUE, the word ++ Moves the cursor one word backward. If \a mark is true, the word + is also selected. + + \sa cursorWordForward() +@@ -716,7 +716,7 @@ + d->removeSelectedText(); + } else if ( d->cursor ) { + --d->cursor; +- d->del( TRUE ); ++ d->del( true ); + } + d->finishChange( priorState ); + +@@ -746,7 +746,7 @@ + + /*! + Moves the text cursor to the beginning of the line unless it is +- already there. If \a mark is TRUE, text is selected towards the ++ already there. If \a mark is true, text is selected towards the + first position; otherwise, any selected text is unselected if the + cursor is moved. + +@@ -760,7 +760,7 @@ + + /*! + Moves the text cursor to the end of the line unless it is already +- there. If \a mark is TRUE, text is selected towards the last ++ there. If \a mark is true, text is selected towards the last + position; otherwise, any selected text is unselected if the cursor + is moved. + +@@ -778,18 +778,18 @@ + \brief whether the line edit's contents has been modified by the user + + The modified flag is never read by SecTQLineEdit; it has a default value +- of FALSE and is changed to TRUE whenever the user changes the line ++ of false and is changed to true whenever the user changes the line + edit's contents. + + This is useful for things that need to provide a default value but + do not start out knowing what the default should be (perhaps it + depends on other fields on the form). Start the line edit without + the best default, and when the default is known, if modified() +- returns FALSE (the user hasn't entered any text), insert the ++ returns false (the user hasn't entered any text), insert the + default value. + + Calling clearModified() or setText() resets the modified flag to +- FALSE. ++ false. + */ + + bool SecTQLineEdit::isModified() const +@@ -798,13 +798,13 @@ + } + + /*! +- Resets the modified flag to FALSE. ++ Resets the modified flag to false. + + \sa isModified() + */ + void SecTQLineEdit::clearModified() + { +- d->modified = FALSE; ++ d->modified = false; + d->history.clear(); + d->undoState = 0; + } +@@ -827,8 +827,8 @@ + \property SecTQLineEdit::hasSelectedText + \brief whether there is any text selected + +- hasSelectedText() returns TRUE if some or all of the text has been +- selected by the user; otherwise returns FALSE. ++ hasSelectedText() returns true if some or all of the text has been ++ selected by the user; otherwise returns false. + + \sa selectedText() + */ +@@ -926,7 +926,7 @@ + void SecTQLineEdit::selectAll() + { + d->selstart = d->selend = d->cursor = 0; +- d->moveCursor( d->text.length(), TRUE ); ++ d->moveCursor( d->text.length(), true ); + } + + /*! +@@ -980,7 +980,7 @@ + #ifndef SECURE_NO_UNDO + resetInputContext(); + d->undo(); +- d->finishChange( -1, FALSE ); ++ d->finishChange( -1, false ); + #endif + } + +@@ -1185,7 +1185,7 @@ + #endif + + if ( e->state() & LeftButton ) { +- d->moveCursor( d->xToPos( e->pos().x() ), TRUE ); ++ d->moveCursor( d->xToPos( e->pos().x() ), true ); + } + } + +@@ -1196,7 +1196,7 @@ + #ifndef TQT_NO_CLIPBOARD + if (TQApplication::clipboard()->supportsSelection() ) { + if ( e->button() == LeftButton ) { +- d->copy( FALSE ); ++ d->copy( false ); + } else if ( !d->readOnly && e->button() == MidButton ) { + d->deselect(); + insert( TQApplication::clipboard()->text( TQClipboard::Selection ) ); +@@ -1217,7 +1217,7 @@ + int end = d->textLayout.nextCursorPosition( d->cursor, TQTextLayout::SkipWords ); + while ( end > d->cursor && d->text[end-1].isSpace() ) + --end; +- d->moveCursor( end, TRUE ); ++ d->moveCursor( end, true ); + d->tripleClickTimer = startTimer( TQApplication::doubleClickInterval() ); + d->tripleClick = e->pos(); + } +@@ -1241,7 +1241,7 @@ + + void SecTQLineEdit::keyPressEvent( TQKeyEvent * e ) + { +- d->setCursorVisible( TRUE ); ++ d->setCursorVisible( true ); + if ( e->key() == Key_Enter || e->key() == Key_Return ) { + emit returnPressed(); + e->ignore(); +@@ -1273,7 +1273,7 @@ + return; + } + } +- bool unknown = FALSE; ++ bool unknown = false; + if ( e->state() & ControlButton ) { + switch ( e->key() ) { + case Key_A: +@@ -1341,13 +1341,13 @@ + #endif + case Key_Delete: + if ( !d->readOnly ) { +- cursorWordForward( TRUE ); ++ cursorWordForward( true ); + del(); + } + break; + case Key_Backspace: + if ( !d->readOnly ) { +- cursorWordBackward( TRUE ); ++ cursorWordBackward( true ); + del(); + } + break; +@@ -1378,7 +1378,7 @@ + redo(); + break; + default: +- unknown = TRUE; ++ unknown = true; + } + } else { // ### check for *no* modifier + switch ( e->key() ) { +@@ -1424,7 +1424,7 @@ + if ( !d->readOnly && e->state() & ShiftButton ) + paste(); + else +- unknown = TRUE; ++ unknown = true; + break; + #endif + case Key_F14: // Undo key on Sun keyboards +@@ -1447,7 +1447,7 @@ + break; + #endif + default: +- unknown = TRUE; ++ unknown = true; + } + } + if ( e->key() == Key_Direction_L ) +@@ -1498,7 +1498,7 @@ + } else { + d->text.remove( d->imstart, d->imend - d->imstart ); + d->cursor = d->imselstart = d->imselend = d->imend = d->imstart; +- d->textDirty = TRUE; ++ d->textDirty = true; + insert( e->text() ); + } + } +@@ -1527,7 +1527,7 @@ + if ( e->reason() != TQFocusEvent::ActiveWindow && + e->reason() != TQFocusEvent::Popup ) + deselect(); +- d->setCursorVisible( FALSE ); ++ d->setCursorVisible( false ); + if ( d->cursorTimer > 0 ) + killTimer( d->cursorTimer ); + d->cursorTimer = 0; +@@ -1724,15 +1724,15 @@ + q->setCursor( readOnly ? arrowCursor : ibeamCursor ); + #endif + q->setFocusPolicy( TQWidget::StrongFocus ); +- q->setInputMethodEnabled( TRUE ); ++ q->setInputMethodEnabled( true ); + // Specifies that this widget can use more, but is able to survive on + // less, horizontal space; and is fixed vertically. + q->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) ); + q->setBackgroundMode( PaletteBase ); +- q->setKeyCompression( TRUE ); +- q->setMouseTracking( TRUE ); +- q->setAcceptDrops( TRUE ); +- q->setFrame( TRUE ); ++ q->setKeyCompression( true ); ++ q->setMouseTracking( true ); ++ q->setAcceptDrops( true ); ++ q->setFrame( true ); + text = txt; + updateTextLayout(); + cursor = text.length(); +@@ -1818,14 +1818,14 @@ + cursor = pos; + q->update(); + } else { +- setCursorVisible( FALSE ); ++ setCursorVisible( false ); + cursor = pos; +- setCursorVisible( TRUE ); ++ setCursorVisible( true ); + } + updateMicroFocusHint(); + if ( mark ) { + if( !q->style().styleHint( TQStyle::SH_BlinkCursorWhenTextSelected )) +- setCursorVisible( FALSE ); ++ setCursorVisible( false ); + emit q->selectionChanged(); + } + } +@@ -1839,15 +1839,15 @@ + undo( validateFromState ); + #endif /* SECURE_NO_UNDO */ + history.resize( undoState ); +- textDirty = setModified = FALSE; ++ textDirty = setModified = false; + } + updateTextLayout(); + updateMicroFocusHint(); + lineDirty |= textDirty; + if ( setModified ) +- modified = TRUE; ++ modified = true; + if ( textDirty ) { +- textDirty = FALSE; ++ textDirty = false; + emit q->textChanged( text ); + } + emit q->textModified( text ); +@@ -1856,7 +1856,7 @@ + #endif + } + if ( selDirty ) { +- selDirty = FALSE; ++ selDirty = false; + emit q->selectionChanged(); + } + if ( lineDirty || !setModified ) +@@ -1898,7 +1898,7 @@ + } else { + history.resize( undoState + 1); + } +- separator = FALSE; ++ separator = false; + history[ undoState++ ] = cmd; + } + #endif /* SECURE_NO_UNDO */ +@@ -1914,7 +1914,7 @@ + #endif /* SECURE_NO_UNDO */ + cursor++; + } +- textDirty = TRUE; ++ textDirty = true; + } + + void SecTQLineEditPrivate::del( bool wasBackspace ) +@@ -1924,7 +1924,7 @@ + addCommand ( Command( (CommandType)(wasBackspace?Remove:Delete), cursor, text.at(cursor) ) ); + #endif /* SECURE_NO_UNDO */ + text.remove( cursor, 1 ); +- textDirty = TRUE; ++ textDirty = true; + } + } + +@@ -1950,7 +1950,7 @@ + if ( cursor > selstart ) + cursor -= TQMIN( cursor, selend ) - selstart; + deselect(); +- textDirty = TRUE; ++ textDirty = true; + } + } + +Index: b/tqt/secqstring.cpp +=================================================================== +--- a/tqt/secqstring.cpp ++++ b/tqt/secqstring.cpp +@@ -356,13 +356,13 @@ + /*! + \fn bool SecTQString::isNull() const + +- Returns TRUE if the string is null; otherwise returns FALSE. A ++ Returns true if the string is null; otherwise returns false. A + null string is always empty. + + \code + SecTQString a; // a.unicode() == 0, a.length() == 0 +- a.isNull(); // TRUE, because a.unicode() == 0 +- a.isEmpty(); // TRUE, because a.length() == 0 ++ a.isNull(); // true, because a.unicode() == 0 ++ a.isEmpty(); // true, because a.length() == 0 + \endcode + + \sa isEmpty(), length() +@@ -371,17 +371,17 @@ + /*! + \fn bool SecTQString::isEmpty() const + +- Returns TRUE if the string is empty, i.e. if length() == 0; +- otherwise returns FALSE. Null strings are also empty. ++ Returns true if the string is empty, i.e. if length() == 0; ++ otherwise returns false. Null strings are also empty. + + \code + SecTQString a( "" ); +- a.isEmpty(); // TRUE +- a.isNull(); // FALSE ++ a.isEmpty(); // true ++ a.isNull(); // false + + SecTQString b; +- b.isEmpty(); // TRUE +- b.isNull(); // TRUE ++ b.isEmpty(); // true ++ b.isNull(); // true + \endcode + + \sa isNull(), length() +@@ -481,7 +481,7 @@ + } else if ( len >= length() ) { + return *this; + } else { +- SecTQString s( len, TRUE ); ++ SecTQString s( len, true ); + memcpy( s.d->unicode, d->unicode, len * sizeof(TQChar) ); + s.d->len = len; + return s; +@@ -513,7 +513,7 @@ + uint l = length(); + if ( len >= l ) + return *this; +- SecTQString s( len, TRUE ); ++ SecTQString s( len, true ); + memcpy( s.d->unicode, d->unicode+(l-len), len*sizeof(TQChar) ); + s.d->len = len; + return s; +@@ -549,7 +549,7 @@ + if ( index == 0 && len == slen ) + return *this; + const TQChar *p = unicode()+index; +- SecTQString s( len, TRUE ); ++ SecTQString s( len, true ); + memcpy( s.d->unicode, p, len * sizeof(TQChar) ); + s.d->len = len; + return s; +@@ -904,18 +904,18 @@ + case TQChar::DirL: + case TQChar::DirLRO: + case TQChar::DirLRE: +- return FALSE; ++ return false; + case TQChar::DirR: + case TQChar::DirAL: + case TQChar::DirRLO: + case TQChar::DirRLE: +- return TRUE; ++ return true; + default: + break; + } + ++p; + } +- return FALSE; ++ return false; + } + + 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 index 19fcfefe..e89b07d7 100644 --- a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/series +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/patches/series @@ -4,4 +4,5 @@ 0004-tqt-updates-202404.diff 0005-delete-libassuan.m4.diff 0006-remove-register-instruction.diff -0007-tq-headers +0007-tq-headers.diff +0008-tqt-rename-true-false.diff diff --git a/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source.lintian-overrides b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source.lintian-overrides new file mode 100644 index 00000000..db7677fb --- /dev/null +++ b/debian/pinentry-tqt/pinentry-tqt-1.2.1/debian/source.lintian-overrides @@ -0,0 +1,9 @@ +# We build for many distribution versions and therefore need +# the distribution version as part of the package version, +# which is unintentionally understood as NMU. +pinentry-tqt source: source-nmu-has-incorrect-version-number +pinentry-tqt source: binary-nmu-debian-revision-in-source +pinentry-tqt source: no-nmu-in-changelog + +# We want XZ regardless of the default compression. +pinentry-tqt source: custom-compression-in-debian-source-options -- cgit v1.2.3