diffstat of debian/ for pinentry_0.9.7-3 pinentry_0.9.7-3co1 changelog | 20 +++++++++++++++++ control | 72 -------------------------------------------------------------- rules | 8 +++--- 3 files changed, 24 insertions(+), 76 deletions(-) diff -Nru pinentry-0.9.7/debian/changelog pinentry-0.9.7/debian/changelog --- pinentry-0.9.7/debian/changelog 2016-02-04 23:13:01.000000000 +0000 +++ pinentry-0.9.7/debian/changelog 2016-03-14 11:53:19.000000000 +0000 @@ -1,3 +1,13 @@ +pinentry (0.9.7-3co1) 16.06; urgency=low + + [ Merge-o-Matic ] + * Merge from Ubuntu xenial. Remaining changes: + an/control: Drop qt4, gtk and gnome3 binary package. + - debian/control: drop build-deps on qt4, gtk and gnome3 related package. + - debian/rules: disable qt4, gtk and gnome3 variants. + + -- Andrew Lee (李健秋) Mon, 14 Mar 2016 19:52:43 +0800 + pinentry (0.9.7-3) unstable; urgency=medium * build -tty, -curses, and -qt without libsecret (Closes: #787883) @@ -45,6 +55,15 @@ -- Daniel Kahn Gillmor Thu, 01 Oct 2015 19:04:24 -0700 +pinentry (0.9.5-4co1) 15.12; urgency=medium + + * Merge from Ubuntu Wily. Remaining changes: + - debian/control: Drop qt4, gtk and gnome3 binary package. + - debian/control: drop build-deps on qt4, gtk and gnome3 related package. + - debian/rules: disable qt4, gtk and gnome3 variants. + + -- Andrew Lee (李健秋) Sun, 18 Oct 2015 09:13:40 +0800 + pinentry (0.9.5-4) unstable; urgency=medium * use -std=gnu++11 for pinentry-qt4 (Closes: #795175) @@ -315,3 +334,4 @@ * Added missing include file path in qt/Makefile.am. -- Peter Eisentraut Fri, 07 May 2004 11:07:25 +0200 + diff -Nru pinentry-0.9.7/debian/control pinentry-0.9.7/debian/control --- pinentry-0.9.7/debian/control 2016-01-04 15:45:16.000000000 +0000 +++ pinentry-0.9.7/debian/control 2016-03-14 11:50:03.000000000 +0000 @@ -13,7 +13,6 @@ libgtk2.0-dev (>= 2.4.0), libncurses5-dev, libncursesw5-dev, - qtbase5-dev, libsecret-1-dev, m4 Standards-Version: 3.9.6 @@ -67,77 +66,6 @@ friendlier text-mode inputs on non-dumb terminals, and other sibling packages that provide PIN entry dialogs using an X tool kit. -Package: pinentry-qt -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Suggests: pinentry-doc -Provides: pinentry, pinentry-x11 -Enhances: gnupg-agent -Description: Qt-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, so it is especially suitable for users of KDE. - 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-qt4 -Architecture: all -Depends: ${misc:Depends}, ${shlibs:Depends}, pinentry-qt (>= ${binary:Version}) -Description: Qt-based PIN or pass-phrase entry dialog for GnuPG (transitional dummy package) - Pinentry is a program for secure entry of PINs and passphrases, from - the GnuPG project. - . - This package installs a symbolic link from pinentry-qt4 to - pinentry-qt. You should switch to using pinentry-qt instead. - -Package: pinentry-gtk2 -Architecture: any -Depends: ${misc:Depends}, ${shlibs: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. 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-gnome3 -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, gcr -Suggests: pinentry-doc -Provides: pinentry, pinentry-x11 -Enhances: gnupg-agent -Description: GNOME 3 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 - designed for use with GNOME 3. It tries to follow the Gnome Human - Interface Guidelines as much as possible. 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.9.7/debian/rules pinentry-0.9.7/debian/rules --- pinentry-0.9.7/debian/rules 2016-02-04 23:08:58.000000000 +0000 +++ pinentry-0.9.7/debian/rules 2016-03-14 11:52:22.000000000 +0000 @@ -2,7 +2,7 @@ QT_SELECT = qt5 export QT_SELECT -SHARED_CONFIGS = --disable-rpath --without-libcap --disable-pinentry-emacs --disable-inside-emacs +SHARED_CONFIGS = --disable-rpath --without-libcap --disable-pinentry-emacs --disable-inside-emacs --disable-pinentry-qt --disable-pinentry-gtk2 --disable-pinentry-gnome3 %: dh $@ --with autoreconf @@ -12,10 +12,10 @@ $(SHARED_CONFIGS) --disable-libsecret \ --enable-pinentry-tty \ --enable-pinentry-curses \ - --enable-pinentry-qt + --disable-pinentry-qt dh_auto_configure -- $(SHARED_CONFIGS) \ - --enable-pinentry-gtk2 \ - --enable-pinentry-gnome3 + --disable-pinentry-gtk2 \ + --disable-pinentry-gnome3 override_dh_auto_build: dh_auto_build --builddirectory=build-no-libsecret