diffstat for pinentry-0.8.3 pinentry-0.8.3 changelog | 20 ++++++++++++++++++++ control | 3 ++- patches/kubuntu_fix_stayontop.diff | 25 +++++++++++++++++++++++++ patches/series | 1 + 4 files changed, 48 insertions(+), 1 deletion(-) diff -Nru pinentry-0.8.3/debian/changelog pinentry-0.8.3/debian/changelog --- pinentry-0.8.3/debian/changelog 2013-12-16 03:06:14.000000000 +0000 +++ pinentry-0.8.3/debian/changelog 2014-01-24 09:24:25.000000000 +0000 @@ -1,3 +1,10 @@ +pinentry (0.8.3-1ubuntu1) trusty; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/patches/kubuntu_fix_stayontop.diff: Make pinentry stay on top. + + -- Logan Rosen Thu, 23 Jan 2014 22:10:38 -0500 + pinentry (0.8.3-1) unstable; urgency=medium * New upstream release (closes: #731494) @@ -6,6 +13,19 @@ -- Peter Eisentraut Sun, 15 Dec 2013 22:01:20 -0500 +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-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 diff -Nru pinentry-0.8.3/debian/control pinentry-0.8.3/debian/control --- pinentry-0.8.3/debian/control 2013-12-15 12:31:11.000000000 +0000 +++ pinentry-0.8.3/debian/control 2014-01-24 09:24:25.000000000 +0000 @@ -1,7 +1,8 @@ Source: pinentry Section: utils Priority: optional -Maintainer: Peter Eisentraut +Maintainer: Ubuntu Developers +XSBC-Original-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 Standards-Version: 3.9.5 Homepage: http://www.gnupg.org/aegypten/ diff -Nru pinentry-0.8.3/debian/patches/kubuntu_fix_stayontop.diff pinentry-0.8.3/debian/patches/kubuntu_fix_stayontop.diff --- pinentry-0.8.3/debian/patches/kubuntu_fix_stayontop.diff 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-0.8.3/debian/patches/kubuntu_fix_stayontop.diff 2014-01-24 09:24:25.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.3/debian/patches/series pinentry-0.8.3/debian/patches/series --- pinentry-0.8.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ pinentry-0.8.3/debian/patches/series 2014-01-24 09:24:25.000000000 +0000 @@ -0,0 +1 @@ +kubuntu_fix_stayontop.diff