lp:~logan/ubuntu/trusty/pinentry/0.8.3-1ubuntu1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/trusty/pinentry at revision 23

Daniel Holbach (community): Approve on 2014-01-24

Diff: 31176 lines (+6881/-10790)

76 files modified

.pc/applied-patches (+0/-1)
.pc/kubuntu_fix_stayontop.diff/qt4/pinentrydialog.cpp (+0/-306)
ChangeLog (+80/-2156)
ChangeLog-old (+2175/-0)
Makefile.am (+35/-13)
Makefile.in (+230/-87)
Manifest (+0/-4)
NEWS (+19/-1)
README.GIT (+49/-0)
README.SVN (+0/-51)
VERSION (+1/-0)
aclocal.m4 (+414/-205)
assuan/ChangeLog (+0/-247)
assuan/ChangeLog-old (+254/-0)
assuan/Makefile.am (+3/-3)
assuan/Makefile.in (+87/-31)
assuan/Manifest (+0/-17)
autogen.sh (+13/-13)
build-aux/git-log-fix (+3/-0)
build-aux/git-log-footer (+14/-0)
build-aux/gitlog-to-changelog (+375/-0)
config.guess (+208/-207)
config.h.in (+6/-0)
config.sub (+164/-71)
configure (+1188/-799)
configure.ac (+46/-37)
curses/Makefile.in (+114/-42)
debian/changelog (+15/-0)
debian/control (+1/-1)
debian/rules (+1/-1)
debian/watch (+1/-1)
doc/HACKING (+23/-0)
doc/Makefile.am (+4/-2)
doc/Makefile.in (+180/-86)
doc/pinentry.info (+26/-15)
doc/pinentry.texi (+13/-0)
doc/stamp-vti (+4/-4)
doc/version.texi (+4/-4)
gtk+-2/Makefile.in (+114/-42)
gtk+-2/gtksecentry.c (+41/-25)
gtk+-2/pinentry-gtk-2.c (+29/-13)
gtk/Makefile.in (+114/-42)
m4/curses.m4 (+17/-3)
pinentry/Makefile.am (+3/-3)
pinentry/Makefile.in (+86/-30)
pinentry/Manifest (+0/-6)
pinentry/pinentry-curses.c (+172/-26)
pinentry/pinentry.c (+17/-1)
pinentry/pinentry.h (+3/-0)
qt/Makefile.in (+114/-42)
qt/secqinternal.cpp (+1/-1)
qt/secqinternal_p.h (+1/-1)
qt/secqlineedit.cpp (+1/-1)
qt/secqlineedit.h (+1/-1)
qt/secqstring.cpp (+1/-1)
qt/secqstring.h (+1/-1)
qt4/Makefile.am (+0/-48)
qt4/Makefile.in (+0/-530)
qt4/main.cpp (+0/-320)
qt4/pinentryconfirm.cpp (+42/-0)
qt4/pinentryconfirm.h (+41/-0)
qt4/pinentryconfirm.moc (+94/-0)
qt4/pinentrydialog.cpp (+0/-305)
qt4/pinentrydialog.h (+0/-97)
qt4/pinentrydialog.moc (+0/-112)
qt4/qsecurelineedit.cpp (+0/-3591)
qt4/qsecurelineedit.h (+0/-314)
qt4/qsecurelineedit.moc (+0/-229)
qt4/qsecurelineedit_p.h (+0/-256)
qt4/secstring.cpp (+0/-104)
qt4/secstring.h (+0/-40)
secmem/Makefile.in (+82/-26)
secmem/secmem++.h (+0/-91)
w32/Makefile.in (+114/-42)
w32/main.c (+36/-36)
w32/pinentry-w32.rc (+6/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

24. By Logan Rosen on 2014-01-24

* Merge from Debian unstable. Remaining changes:
  - debian/patches/kubuntu_fix_stayontop.diff: Make pinentry stay on top.
* New upstream release (closes: #731494)
* Updated watch file
* Updated standards version

23. By Logan Rosen on 2014-01-24

Merging shared upstream rev into target branch.

22. By Colin Watson on 2012-10-08

Rebuild for new armel compiler default of ARMv5t.

21. By Felix Geyer on 2011-07-30

Re-add kubuntu_01_fix_stayontop.diff, dropped while syncing the package
from Debian.

20. By Peter Eisentraut on 2011-02-16

* New upstream release
  - keyboard-race.patch incorporated upstream
  - Fixed segmentation fault in pinentry-gtk2 (closes: #584947)
* Removed Qt 3 variant (closes: #604369)
* Updated standards version
* Changed to debhelper level 8

19. By Scott Kitterman on 2010-10-17

Also drop no longer needed Qt 3 build-depends

18. By Scott Kitterman on 2010-10-17

[ Rohan Garg ]
* Add kubuntu_01_fix_stayontop.diff to make pinetry-qt4 stay on top (LP: #657219)

[ Scott Kitterman ]
* Drop obsolete pinentry-qt package
  - Drop package from debian/control
  - pinentry-doc suggests pinentry-qt4 instead
  - Switch configure flag to --disable-pinentry-qt in debian/rules

17. By Peter Eisentraut on 2010-03-18

* New upstream release
* Changed source format to 3.0 (quilt)
* Updated standards version

16. By Peter Eisentraut on 2009-07-13

* New upstream release
  - Includes Qt 4 variant, formerly in separate source package pinentry-qt4
  - Obsoletes gmalloc-prototypes.patch
  - Made Gtk+-2 pinentry transient to the root window (closes: #445607)
* Changed copyright file to refer to GPL-2 file, per lintian
* Updated standards version
* Changed to debhelper level 7 and minimal version 7.2.17, to avoid obsolete
  calls to install-info

15. By Artur Rona on 2009-06-24

* New upstream release (LP: #390895).
* debian/patches/gmalloc-prototypes.patch: Removed, fixed upstream.
* debian/patches/keyboard-race.patch: updated.