diffstat for pinentry-0.8.1 pinentry-0.8.1 changelog | 27 ++++++++++++++++++++++ control | 44 ++----------------------------------- patches/kubuntu_fix_stayontop.diff | 25 +++++++++++++++++++++ patches/series | 1 rules | 10 +------- 5 files changed, 58 insertions(+), 49 deletions(-) diff -Nru pinentry-0.8.1/debian/changelog pinentry-0.8.1/debian/changelog --- pinentry-0.8.1/debian/changelog 2011-02-16 18:19:04.000000000 +0000 +++ pinentry-0.8.1/debian/changelog 2012-10-09 01:18:15.000000000 +0000 @@ -1,3 +1,29 @@ +pinentry (0.8.1-1ubuntu2co1) UNRELEASED; urgency=low + + * Merge from Ubuntu quantal. Remaining changes: + - SUMMARISE HERE + + -- Merge-o-Matic for Chaiwala Tue, 09 Oct 2012 01:18:15 +0000 + +pinentry (0.8.1-1ubuntu2) quantal; urgency=low + + * Rebuild for new armel compiler default of ARMv5t. + + -- Colin Watson Mon, 08 Oct 2012 08:38:23 +0100 + +pinentry (0.8.1-1ubuntu1co1) Bosch; urgency=low + + * Remove qt4 and gtk variants + + -- Sjoerd Simons Tue, 29 May 2012 08:02:29 +0200 + +pinentry (0.8.1-1ubuntu1) oneiric; urgency=low + + * Re-add kubuntu_01_fix_stayontop.diff, dropped while syncing the package + from Debian. + + -- Felix Geyer Sat, 30 Jul 2011 22:32:23 +0200 + pinentry (0.8.1-1) unstable; urgency=low * New upstream release @@ -164,3 +190,4 @@ * Added missing include file path in qt/Makefile.am. -- Peter Eisentraut Fri, 07 May 2004 11:07:25 +0200 + diff -Nru pinentry-0.8.1/debian/control pinentry-0.8.1/debian/control --- pinentry-0.8.1/debian/control 2011-02-16 18:16:53.000000000 +0000 +++ pinentry-0.8.1/debian/control 2012-10-09 01:18:15.000000000 +0000 @@ -1,8 +1,9 @@ Source: pinentry Section: utils Priority: optional -Maintainer: Peter Eisentraut -Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), libglib2.0-dev (>= 2.15.5), libgtk2.0-dev (>= 2.4.0), libncurses5-dev, libqt4-dev, m4 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Peter Eisentraut +Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), libncurses5-dev, m4 Standards-Version: 3.9.1 Homepage: http://www.gnupg.org/aegypten/ @@ -29,45 +30,6 @@ because the sibling packages automatically fall back to text mode if X is not active. -Package: pinentry-qt4 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: pinentry-doc -Provides: pinentry, pinentry-qt, pinentry-x11 -Enhances: gnupg-agent -Description: Qt-4-based PIN or pass-phrase entry dialog for GnuPG - This package contains a program that allows for entry of PINs or pass - phrases. It is useful for entering pass phrases when using encryption - software such as GnuPG or e-mail clients using the same. It uses an open - protocol and is therefore not tied to particular software. - . - The program contained in this package implements a PIN entry dialog - using the Qt tool kit version 4, so it is especially suitable for - users of KDE 4. If the X Window System is not active then an - alternative text-mode dialog will be used. There are sibling - packages that implement PIN entry dialogs using other tool kits. - -Package: pinentry-gtk2 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: pinentry-doc -Provides: pinentry, pinentry-x11 -Enhances: gnupg-agent -Description: GTK+-2-based PIN or pass-phrase entry dialog for GnuPG - This package contains a program that allows for secure entry of PINs or - pass phrases. That means it tries to take care that the entered - information is not swapped to disk or temporarily stored anywhere. - This functionality is particularly useful for entering pass phrases - when using encryption software such as GnuPG or e-mail clients using - the same. It uses an open protocol and is therefore not tied to - particular software. - . - The program contained in this package implements a PIN entry dialog - using the GTK+ tool kit version 2, so it is especially suitable for - users of GNOME. If the X Window System is not active then an - alternative text-mode dialog will be used. There are sibling packages - that implement PIN entry dialogs using other tool kits. - Package: pinentry-doc Section: doc Architecture: all diff -Nru pinentry-0.8.1/debian/patches/kubuntu_fix_stayontop.diff pinentry-0.8.1/debian/patches/kubuntu_fix_stayontop.diff --- pinentry-0.8.1/debian/patches/kubuntu_fix_stayontop.diff 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-0.8.1/debian/patches/kubuntu_fix_stayontop.diff 2012-10-09 01:18:15.000000000 +0000 @@ -0,0 +1,25 @@ +From 0cc3dd71213687ccb5ec0a1866864558bf03260b Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Fri, 7 May 2010 14:45:44 +0200 +Subject: [PATCH] Fix qt4 pinentry window created in the background + +This is probably just a workaround. Proper fix is being investigated. +--- + qt4/pinentrydialog.cpp | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp +index 8644136..6064ab9 100644 +--- a/qt4/pinentrydialog.cpp ++++ b/qt4/pinentrydialog.cpp +@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) + SetForegroundWindow( w->winId() ); + #endif + w->raise(); +- w->activateWindow(); + } + + QPixmap icon( QStyle::StandardPixmap which ) +-- +1.6.6.1 + diff -Nru pinentry-0.8.1/debian/patches/series pinentry-0.8.1/debian/patches/series --- pinentry-0.8.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-0.8.1/debian/patches/series 2012-10-09 01:18:15.000000000 +0000 @@ -0,0 +1 @@ +kubuntu_fix_stayontop.diff diff -Nru pinentry-0.8.1/debian/rules pinentry-0.8.1/debian/rules --- pinentry-0.8.1/debian/rules 2011-02-15 19:54:11.000000000 +0000 +++ pinentry-0.8.1/debian/rules 2012-10-09 01:18:15.000000000 +0000 @@ -4,26 +4,20 @@ include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS = --disable-rpath --without-libcap \ - --enable-pinentry-curses --disable-pinentry-qt --enable-pinentry-qt4 --disable-pinentry-gtk --enable-pinentry-gtk2 + --enable-pinentry-curses --disable-pinentry-qt --disable-pinentry-gtk DEB_INSTALL_DOCS_ALL = NEWS AUTHORS DEB_DH_INSTALL_SOURCEDIR = debian/tmp LDFLAGS += -Wl,--as-needed -pre-build:: debian/stamp-custom-prepare qt4/pinentrydialog.moc qt4/qsecurelineedit.moc +pre-build:: debian/stamp-custom-prepare debian/stamp-custom-prepare: dh_testdir make -C debian all touch $@ -# I guess you're supposed to do this manually, per upstream: -# -# --petere@d.o -%.moc: %.h - moc-qt4 $< >$@ - clean:: rm -f debian/stamp-custom-prepare make -C debian clean