seahorse-plugins

Merge lp:~ari-tczew/seahorse-plugins/ubuntu into lp:~ubuntu-desktop/seahorse-plugins/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Artur Rona
Status: Merged
Merged at revision: 32
Proposed branch: lp:~ari-tczew/seahorse-plugins/ubuntu
Merge into: lp:~ubuntu-desktop/seahorse-plugins/ubuntu
Diff against target: 917 lines (+356/-384)
13 files modified
debian/changelog (+165/-0)
debian/control (+8/-8)
debian/control.in (+7/-7)
debian/copyright (+78/-364)
debian/patches/01_nomenu.patch (+12/-0)
debian/patches/01_ubuntu_keyserver.patch (+5/-0)
debian/patches/02_copy_gpg_conf_skeleton.patch (+6/-0)
debian/patches/03_dont_crash_on_exit.patch (+1/-1)
debian/patches/10_gpgme_crash.patch (+69/-0)
debian/patches/series (+2/-2)
debian/rules (+0/-1)
debian/source/format (+1/-0)
debian/watch (+2/-1)
To merge this branch: bzr merge lp:~ari-tczew/seahorse-plugins/ubuntu
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+46397@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Excellent work! Thanks a lot :)

review: Approve
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

BTW, as discussed on IRC, you should set UNRELEASED on the commit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-04-08 00:47:42 +0000
+++ debian/changelog 2011-01-15 23:03:57 +0000
@@ -1,3 +1,75 @@
1seahorse-plugins (2.30.1-3ubuntu1) natty; urgency=low
2
3 * Merge from debian unstable. Remaining changes: (LP: #701670)
4 - debian/control{.in}:
5 + Replace Build-Depends intltool with libxml-parser-perl.
6 + Add Vcs-Bzr link related to Ubuntu Desktop Team.
7 + seahorse-plugins: Move seahorse from Depends to Recommends.
8 - debian/menu: Add menu file.
9 - debian/patches/01_ubuntu_keyserver.patch:
10 + Added ubuntu keyserver to the defaults.
11 - debian/patches/02_copy_gpg_conf_skeleton.patch:
12 + Copy gpg.conf skel instead of creating blank file.
13 - debian/patches/03_dont_crash_on_exit.patch:
14 + Only clean up the socket dir on exit. Calling GConf functions
15 in the atexit handler is bad, as it conflicts with a handler
16 registered inside liborbit, leading to a crash.
17 - debian/rules:
18 + Remove DEB_DH_MAKESHLIBS_ARGS_seahorse-plugins.
19 + Rename 60seahorse to 60seahorse-plugins.
20 + Remove mime-type catalog, seahorse source package related.
21 - debian/seahorse{-preferences.1, .Xsession, -plugins.manpages}:
22 + Remove due to related with seahorse source package.
23 - debian/seahorse-plugins.Xsession:
24 + Start the seahorse-agent. Replaces debian/seahorse.Xsession.
25 * debian/copyright: Restore from Debian. seahorse-plugins source
26 has been uploaded in Debian after our initial upload.
27 * debian/patches/06_gpgme_check_version.patch:
28 - Dropped, applied upstream.
29 * debian/rules: Drop quilt, Debian has switched to 3.0 source format.
30 * debian/watch: Restore from Debian. There is no point to keep
31 change longer.
32
33 -- Artur Rona <ari-tczew@ubuntu.com> Tue, 11 Jan 2011 15:13:36 +0100
34
35seahorse-plugins (2.30.1-3) unstable; urgency=low
36
37 * 10_gpgme_crash.patch: stolen upstream. Fix a crash caused by a
38 change in gpgme. Closes: #581030, #587092.
39
40 -- Josselin Mouette <joss@debian.org> Fri, 25 Jun 2010 19:10:12 +0200
41
42seahorse-plugins (2.30.1-2) unstable; urgency=low
43
44 * Switch to 3.0 source format.
45 * 01_nomenu.patch: new patch. Remove the preferences from the menu.
46 The defaults are sane anyway, and that makes two encryption capplets
47 in the preferences menu.
48
49 -- Josselin Mouette <joss@debian.org> Fri, 07 May 2010 22:18:49 +0200
50
51seahorse-plugins (2.30.1-1) unstable; urgency=low
52
53 * New upstream bugfix release.
54
55 -- Sebastian Dröge <slomo@debian.org> Wed, 28 Apr 2010 14:21:16 +0200
56
57seahorse-plugins (2.30.0-1) unstable; urgency=low
58
59 [ Emilio Pozuelo Monfort ]
60 * debian/patches/01_maxpathlen_hurd.patch:
61 - Fix build failure on the Hurd, use dynamic allocation rather than
62 hardcoding the GPG homedir maximum length to MAXPATHLEN.
63
64 [ Sebastian Dröge ]
65 * New upstream stable release:
66 + debian/control.in:
67 - Update build dependencies.
68 + debian/patches/01_maxpathlen_hurd.patch:
69 - Dropped, merged upstream.
70
71 -- Sebastian Dröge <slomo@debian.org> Mon, 12 Apr 2010 17:37:48 +0200
72
1seahorse-plugins (2.30.0-0ubuntu2) lucid; urgency=low73seahorse-plugins (2.30.0-0ubuntu2) lucid; urgency=low
274
3 * debian/patches/06_gpgme_check_version.patch:75 * debian/patches/06_gpgme_check_version.patch:
@@ -55,6 +127,19 @@
55127
56 -- Didier Roche <didrocks@ubuntu.com> Tue, 09 Feb 2010 14:55:30 +0100128 -- Didier Roche <didrocks@ubuntu.com> Tue, 09 Feb 2010 14:55:30 +0100
57129
130seahorse-plugins (2.28.1-2) unstable; urgency=low
131
132 * Disable epiphany plugin, it doesn’t work at all since it’s still
133 Gecko-based.
134
135 -- Josselin Mouette <joss@debian.org> Sat, 14 Nov 2009 14:49:11 +0100
136
137seahorse-plugins (2.28.1-1) unstable; urgency=low
138
139 * New upstream release.
140
141 -- Andrea Veri <andrea.veri89@gmail.com> Thu, 22 Oct 2009 21:45:01 +0200
142
58seahorse-plugins (2.28.1-0ubuntu5) lucid; urgency=low143seahorse-plugins (2.28.1-0ubuntu5) lucid; urgency=low
59144
60 * debian/seahorse-plugins.Xsession: Add support for session command145 * debian/seahorse-plugins.Xsession: Add support for session command
@@ -94,6 +179,15 @@
94179
95 -- Robert Ancell <robert.ancell@canonical.com> Mon, 19 Oct 2009 17:00:18 +1100180 -- Robert Ancell <robert.ancell@canonical.com> Mon, 19 Oct 2009 17:00:18 +1100
96181
182seahorse-plugins (2.28.0-1) unstable; urgency=low
183
184 * New upstream release.
185 * ephipany's seahorse plugin it's disabled for now,
186 it needs porting to the newer ephiphany-webkit package.
187 (configure tests check gecko stuff only atm)
188
189 -- Andrea Veri <andrea.veri89@gmail.com> Thu, 15 Oct 2009 23:17:26 +0200
190
97seahorse-plugins (2.28.0-0ubuntu1) karmic; urgency=low191seahorse-plugins (2.28.0-0ubuntu1) karmic; urgency=low
98192
99 * New upstream release: (LP: #435562)193 * New upstream release: (LP: #435562)
@@ -112,6 +206,33 @@
112206
113 -- Andreas Moog <amoog@ubuntu.com> Sat, 02 May 2009 01:30:06 +0200207 -- Andreas Moog <amoog@ubuntu.com> Sat, 02 May 2009 01:30:06 +0200
114208
209seahorse-plugins (2.26.2-1) unstable; urgency=low
210
211 [ Andreas Moog ]
212 * New upstream release. (Closes: #544345)
213 * debian/control{.in}
214 + bump standards version to 3.8.3, no changes needed
215 + Fix spelling error in description (Gnu -> GNU)
216 * debian/seahorse-preferences.1, debian/seahorse-plugins.manpages:
217 + provide a man page for seahorse-preferences
218
219 [ Emilio Pozuelo Monfort ]
220 * Update my email address.
221
222 -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 31 Aug 2009 00:51:44 +0200
223
224seahorse-plugins (2.26.1-1) unstable; urgency=low
225
226 [ Loic Minier ]
227 * searhorse.Xsession: don't start seahorse-agent if $GPG_AGENT_INFO is set.
228
229 [ Josselin Mouette ]
230 * New upstream release.
231 + Fixes crash when gedit exits. Closes: #525590.
232 * 10_ephyembed_api.patch: dropped, merged upstream.
233
234 -- Josselin Mouette <joss@debian.org> Wed, 20 May 2009 16:45:40 +0200
235
115seahorse-plugins (2.26.1-0ubuntu1) jaunty; urgency=low236seahorse-plugins (2.26.1-0ubuntu1) jaunty; urgency=low
116237
117 * New upstream release: (LP: #360711)238 * New upstream release: (LP: #360711)
@@ -182,6 +303,50 @@
182303
183 -- Christophe Sauthier <christophe.sauthier@gmail.com> Thu, 08 Jan 2009 18:24:20 +0100304 -- Christophe Sauthier <christophe.sauthier@gmail.com> Thu, 08 Jan 2009 18:24:20 +0100
184305
306seahorse-plugins (2.24.1-3) unstable; urgency=low
307
308 * Upload to unstable.
309 + Don’t require the nautilus 2.22 version, so that the extension is
310 built at the old place.
311
312 -- Josselin Mouette <joss@debian.org> Sun, 08 Mar 2009 19:58:52 +0100
313
314seahorse-plugins (2.24.1-2) experimental; urgency=low
315
316 * debian/copyright: Add Gaim developers due to
317 libseahorse/seahorse-gtkstock.[ch]
318
319 -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Fri, 06 Mar 2009 20:34:19 +0100
320
321seahorse-plugins (2.24.1-1) experimental; urgency=low
322
323 [ Emilio Pozuelo Monfort ]
324 * Initial upload to Debian (Closes: #506895).
325 * debian/control.in: Update description, maintainer, add Vcs-* and
326 Homepage fields, update build-dependencies.
327 * Remove menu file, it references the seahorse binary which is in the
328 seahorse package.
329 * debian/rules: Add missing hack to remove the mime catalog, from the
330 seahorse package.
331
332 [ Josselin Mouette ]
333 * Rename 60seahorse-plugins to 60seahorse so that the file can be
334 transparently replaced across packages. (We already replace seahorse
335 < 2.24).
336 * Require nautilus 2.22 and epiphany 2.24 to be sure to build the
337 plugins for the correct versions.
338 * Depend on seahorse.
339 * Deactivate dh_makeshlibs.
340 * Enable simple-patchsys.
341 * 10_ephyembed_api.patch: taken from the old seahorse package.
342 Necessary to make the epiphany plugin work.
343 * copyright:
344 + Don’t ship the full GFDL, only reference it.
345 + Update authors list.
346 + Add complete list of copyright holders.
347
348 -- Josselin Mouette <joss@debian.org> Tue, 09 Dec 2008 22:42:45 +0100
349
185seahorse-plugins (2.24.1-0ubuntu2) jaunty; urgency=low350seahorse-plugins (2.24.1-0ubuntu2) jaunty; urgency=low
186351
187 * no changes upload for nss/nspr SONAME mini-transition352 * no changes upload for nss/nspr SONAME mini-transition
188353
=== modified file 'debian/control'
--- debian/control 2010-02-09 13:47:04 +0000
+++ debian/control 2011-01-15 23:03:57 +0000
@@ -6,12 +6,11 @@
6Source: seahorse-plugins6Source: seahorse-plugins
7Section: gnome7Section: gnome
8Priority: optional8Priority: optional
9Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>9Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>10XSBC-Original-Maintainer: Emilio Pozuelo Monfort <pochu@debian.org>
11Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu11Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
12Build-Depends: debhelper (>= 5),12Build-Depends: debhelper (>= 5),
13 cdbs (>= 0.4.41),13 cdbs (>= 0.4.41),
14 quilt,
15 scrollkeeper,14 scrollkeeper,
16 libgpgme11-dev,15 libgpgme11-dev,
17 libxml-parser-perl,16 libxml-parser-perl,
@@ -21,14 +20,16 @@
21 libgnome-keyring-dev,20 libgnome-keyring-dev,
22 libcryptui-dev,21 libcryptui-dev,
23 libglib2.0-dev (>= 2.16),22 libglib2.0-dev (>= 2.16),
24 libgtk2.0-dev (>= 2.10.0),23 libgtk2.0-dev (>= 2.18.0),
25 libpanel-applet2-dev,24 libpanel-applet2-dev,
26 gedit-dev,25 gedit-dev,
27 libxml2-dev (>= 2.6.0),26 libxml2-dev (>= 2.6.0),
28 libebook1.2-dev (>= 1.7.90),27 libebook1.2-dev (>= 1.7.90),
29 gnome-pkg-tools,28 gnome-pkg-tools,
30 libnautilus-extension-dev (>= 2.12.0)29 libnautilus-extension-dev (>= 2.12)
31Standards-Version: 3.8.030Standards-Version: 3.8.3
31Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
32Homepage: http://live.gnome.org/Seahorse
3233
33Package: seahorse-plugins34Package: seahorse-plugins
34Architecture: any35Architecture: any
@@ -45,4 +46,3 @@
45 .46 .
46 In addition it includes an agent for storing private passphrases, 47 In addition it includes an agent for storing private passphrases,
47 as well as a GnuPG and OpenSSH key manager.48 as well as a GnuPG and OpenSSH key manager.
48
4949
=== modified file 'debian/control.in'
--- debian/control.in 2010-02-09 13:47:04 +0000
+++ debian/control.in 2011-01-15 23:03:57 +0000
@@ -1,12 +1,11 @@
1Source: seahorse-plugins1Source: seahorse-plugins
2Section: gnome2Section: gnome
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Emilio Pozuelo Monfort <pochu@debian.org>
5Uploaders: @GNOME_TEAM@6Uploaders: @GNOME_TEAM@
6Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
7Build-Depends: debhelper (>= 5),7Build-Depends: debhelper (>= 5),
8 cdbs (>= 0.4.41),8 cdbs (>= 0.4.41),
9 quilt,
10 scrollkeeper,9 scrollkeeper,
11 libgpgme11-dev,10 libgpgme11-dev,
12 libxml-parser-perl,11 libxml-parser-perl,
@@ -16,14 +15,16 @@
16 libgnome-keyring-dev,15 libgnome-keyring-dev,
17 libcryptui-dev,16 libcryptui-dev,
18 libglib2.0-dev (>= 2.16),17 libglib2.0-dev (>= 2.16),
19 libgtk2.0-dev (>= 2.10.0),18 libgtk2.0-dev (>= 2.18.0),
20 libpanel-applet2-dev,19 libpanel-applet2-dev,
21 gedit-dev,20 gedit-dev,
22 libxml2-dev (>= 2.6.0),21 libxml2-dev (>= 2.6.0),
23 libebook1.2-dev (>= 1.7.90),22 libebook1.2-dev (>= 1.7.90),
24 gnome-pkg-tools,23 gnome-pkg-tools,
25 libnautilus-extension-dev (>= 2.12.0)24 libnautilus-extension-dev (>= 2.12)
26Standards-Version: 3.8.025Standards-Version: 3.8.3
26Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
27Homepage: http://live.gnome.org/Seahorse
2728
28Package: seahorse-plugins29Package: seahorse-plugins
29Architecture: any30Architecture: any
@@ -40,4 +41,3 @@
40 .41 .
41 In addition it includes an agent for storing private passphrases, 42 In addition it includes an agent for storing private passphrases,
42 as well as a GnuPG and OpenSSH key manager.43 as well as a GnuPG and OpenSSH key manager.
43
4444
=== modified file 'debian/copyright'
--- debian/copyright 2009-02-15 19:14:28 +0000
+++ debian/copyright 2011-01-15 23:03:57 +0000
@@ -3,11 +3,63 @@
33
4It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse4It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse
55
6Upstream Authors: Nate Nielsen <nielsen@memberwebs.com>, Adam Schreiber <sadam@clemson.edu>6Upstream Authors: Jacob Perkins <jap1@users.sourceforge.net>
77 Jose Carlos Garcia Sogo <jsogo@users.sourceforge.net>
8Copyright (C) 2001, 2002 Jose Carlos Garcia Sogo8 Jean Schurger <jk24@users.sourceforge.net>
9Copyright (C) 2002, 2003 Jacob Perkins9 Stef Walter <stef@memberwebs.com>
10Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber10 Adam Schreiber <sadam@clemson.edu>
11
12Copyright © 2004-2007 Stefan Walter
13Copyright © 2004-2006 Adam Schreiber
14Copyright © 2001-2003 Jose Carlos Garcia Sogo
15Copyright © 2002, 2003 Jacob Perkins
16Copyright © 2004, 2006 Nate Nielsen
17Copyright © 2000-2004 Marco Pesenti Gritti
18Copyright © 2003-2006 Christian Persch
19Copyright © 2004, 2006 Jean-François Rameau
20Copyright © 2000, 2001 Eazel, Inc.
21Copyright © 2007, 2008 Jorge González
22Copyright © 2007, 2008 Daniel Nylander
23Copyright © 2004-2005 Shaun McCance
24Copyright © 2007 Milo Casagrande
25Copyright © 2007-2008 Claude Paroz
26Copyright © 2007 GNOME i18n Project for Vietnamese
27Copyright © 2008 Василий Фаронов
28Copyright © 1992-2008 Free Software Foundation, Inc.
29Copyright © 1999 Dave Camp
30Copyright © 2005 Tecsidel S.A.
31Copyright © 2004-2005 Adam Weinberger and the GNOME Foundation
32Copyright © 2007, 2008 The GNOME Project
33Copyright © 2007 Swecha Telugu Localisation Team
34Copyright © 1995-1997 Ulrich Drepper
35Copyright © 2004-2008 Rodney Dawes
36Copyright © 1999, 2000 Anthony Mulcahy
37Copyright © 2007 Ihar Hrachyshka
38Copyright © 2004, 2005 Miloslav Trmac
39Copyright © 2003 Péter Mátó
40Copyright © 2004, 2005 Danijel Studen, Denis Lackovic, Ivan Jankovic
41Copyright © 1994 X Consortium
42Copyright © 2006 Alexander Larsson
43Copyright © 2000-2003 Ximian Inc.
44Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
45Copyright © 1999, 2000 Robert Bihlmeyer
46Copyright © Crispin Flowerday
47Copyright © 2008 Frédéric Péters
48Copyright © 2008 Lucas Lommer
49Copyright © 2008 Mario Blättermann
50Copyright © 2001-2004 Red Hat, Inc.
51Copyright © 2004 Scott James Remnant
52
53
54Gaim is the legal property of its developers, whose names are too numerous
55to list here. Please refer to the COPYRIGHT file distributed with the gaim
56source distribution.
57
58Copyright (C) 1998-2006 by the following:
59
60Dave Ahlswede, Manuel Amador, Matt Amato, Daniel Atallah, Paul Aurich, Patrick Aussems, Anibal Avelar, Alex Badea, John Bailey, Chris Banal, Luca Barbato, Levi Bard, Kevin Barry, Derek Battams, Martin Bayard, Curtis Beattie, Dave Bell, Igor Belyi, Brian Bernas, Paul Betts, Jonas Birmé, Eric Blade, Ethan Blanton, Joshua Blanton, Rainer Blessing, Herman Bloggs, David Blue, Jason Boerner, Graham Booker, Paolo Borelli, Julien Bossart, Craig Boston, Chris Boyle, Derrick J Brashear, Matt Brenneke, Jeremy Brooks, Philip Brown, Sean Burke, Thomas Butter, Andrea Canciani, Damien Carbery, Michael Carlson, Keegan Carruthers-Smith, Steve Cavilia, Julien Cegarra, Cerulean Studios, LLC, Jonathan Champ, Christophe Chapuis, Patrick Cheung, Ka-Hing Cheung, Sadrul Habib Chowdhury, Brian Chu, Arturo Cisneros, Jr., Vincas Ciziunas, Jonathan Clark, Joe Clarke, Eoin Coffey, Jason Cohen, Todd Cohen, Jono Cole, Lorenzo Colitti, Nathan Conrad, Felipe Contreras, Alex Converse, Irving Cordova, Glauber de Oliveira Costa, Adam Cowell, Palmer Cox, Jeramey Crawford, Michael Culbertson, Martijn Dekker, Philip Derrin, Taso N. Devetzis, Balwinder Singh Dheeman, Andrew Dieffenbach, Finlay Dobbie, Mark Doliner, Nuno Donato, Jim Duchek, Alex Duggan, Tom Dyas, Marc E., Andrew Echols, John Eckerdal, Sean Egan <seanegan@gmail.com>, Nelson Elhage, Ignacio J. Elia, Brian Enigma, Mattias Eriksson, Stefan Esser, Steffen Eschenbacher, Marc Etcheverry, Larry Ewing, Gábor Farkas, Jesse Farmer, Gavan Fantom (gavan), David Fiander, Rob Flynn <gaim@robflynn.com>, Rob Foehl (rwf), Alan Ford, Nathan Fredrickson, Chris J. Friesen, Free Software Foundation, Decklin Foster, Francesco Fracassi, Adam Fritzler, Max G., François Gagné, Evgueni V. Gavrilov, Ignacy Gawedzki, Georgi Georgiev, Ike Gingerich, Gustavo Giráldez, Richard Gobeille, Ian Goldberg, Michael Golden, Charlie Gordon, Ryan C. Gordon, Miah Gregory, Christian Hammond, Erick Hamness, Fred Hampton, Casey Harkins, Andy Harrison, Andrew Hart (arhart), G. Sumner Hayes, Michael R. Head, Nick Hebner, Mike Heffner, Benjamin Herrenschmidt, Fernando Herrera, hjheins, Hil, Casey Ho, Iain Holmes, Joshua Honeycutt, Nigel Horne, Juanjo Molinero Horno, Nathanael Hoyle, Greg Hudson, Magnus Hult, Karsten Huneycutt, Kevin Hunter, Rian Hunter, Thomas Huriaux, Scott Jackson, Hans Petter Jansson, Henry Jen, Benjamin Kahn, Anders Kaseorg, Praveen Karadakal, John Kelm, Akuke Kok, Cole Kowalski, Gary Kramlich, Jan Kratochvil, Andrej Krivulčík, Patrik Kullman, Tuomas Kuosmanen, Tero Kuusela, Richard Laager, Scott Lamb, Dennis Lambe Jr., Joe LaPenna, Steve Láposi, Daniel Larsson, Peter Lawler, Ho-seok Lee, Jean-Yves Lefort, Moses Lei, Ambrose C. Li, Nicolas Lichtmaier, Wesley Lin, Artem Litvinovich, Syd Logan, Lokheed, Norberto Lopes, Uli Luckas, Matthew Luckie, Mike Lundy, Jason Lynch, Lucio Maciel, Brian Macke, Paolo Maggi, Willian T. Mahan, Kris Marsh, Fidel Martinez, Lalo Martins, John Matthews, Ryan McCabe, Peter McCurdy, Kurt McKee, Torrey McMahon, Robert McQueen, Robert Mibus, Lars T. Mikkelsen, Benjamin Miller, Kevin Miller, Paul Miller, Arkadiusz Miskiewicz, Andrew Molloy, Benjamin Moody, Tim Mooney, Sergio Moretto, Christian Muise, Richard Nelson, Dennis Nezic, Matthew A. Nicholson, Henning Norén, Szilard Novaki, Novell, Padraig O'Briain, Christopher O'Brien (siege), Jon Oberheide, Ruediger Oertel, Gudmundur Bjarni Olafsson, Bartosz Oler, Shawn Outman, Nathan Owens (pianocomp81), John Oyler, Matt Pandina, Ricardo Fernandez Pascual, Riley Patterson, Havoc Pennington, Ted Percival, Eduardo Pérez, Joao Luís Marques Pinto, Aleksander Piotrowski, Julien Pivotto, Ari Pollak, Robey Pointer, Nathan Poznick, Jory A. Pratt, Brent Priddy, Federicco Mena Quintero, Yosef Radchenko, David Raeman, R. Ramkumar, Mart Raudsepp, Etan Reisner, Kristian Rietveld, Pekka Riikonen, Tim Ringenbach, Dennis Ristuccia, Lee Roach, Rhett Robinson, Luciano Miguel Ferreira Rocha, Andrew Rodland, Miguel Rodríguez (migrax), Jason Roth, Jean-Francois Roy, Sam S., Pradyumna Sampath, Arvind Samptur, Tom Samstag, Neil Sanchala, Laurent Sansonetti, Andrew Sayman, Alceste Scalas, Carsten Schaar, Matteo Settenvini, Colin Seymour, Luke Schierer, Ralph Schmieder, David Schmitt, Mark Schneider, Evan Schoenberg, Federico Schwindt, Torrey Searle, Peter Seebach, Don Seiler, Leonardo Serra, Jim Seymour, Joe Shaw, Scott Shedden, Ettore Simone, John Silvestri, Craig Slusher, Alex Smith, Malcolm Smith, David Smock, Phil Snowberger, Eddie Sohn (tr1sk), Sony Computer Entertainment America, Inc., Mark Spencer, Lex Spoon, Kevin Stange, Richard Stellingwerff, Charlie Stockman, David Stoddard, Sun Microsystems, Mårten Svantesson (fursten), Robert T., Brian Tarricone, Peter Teichman, Philip Tellis, Arun A. Tharuvai, Cestonaro Thilo, Will Thompson, Douglas Thrift (douglaswth), Andrew Tinney, Jeffery To, Warren Togami, Stu Tomlinson, Bill Tompkins, Chris Toshok, Ken Tossell, Tom Tromey, Todd Troxell, Brad Turcotte, Junichi Uekawa, István Váradi, Martijn van Beers, Philip Van Hoof, Kristof Vansant, James Vega, David Vermeille, Sid Vicious, Bjoern Voigt, Wan Hing Wah, Philip Walford, Nathan Walp, Jonty Wareing, Eric Warmenhoven, Adam J. Warrington, Andrew Wellington, Adam Wendt, Dave West, Daniel Westermann-Clark, Andrew Whewell, Simon Wilkinson, Dan Willemsen, Jason Willis, Matt Wilson, Dan Winship, Scott Wolchok, Pui Lam Wong, Justin Wood, Ximian, Ma Xuan, Jared Yanovich, Timmy Yee, Nickolai Zeldovich, Marco Ziech, Piotr Zielinski, Welker Zsombor, Jeroen Zwartepoorte
61
62
1163
12Main License (everything except docs):64Main License (everything except docs):
1365
@@ -28,362 +80,24 @@
28On Debian systems, the complete text of the GNU General80On Debian systems, the complete text of the GNU General
29Public License can be found in `/usr/share/common-licenses/GPL'.81Public License can be found in `/usr/share/common-licenses/GPL'.
3082
31Documentation and help files are covered by GFDL license.83The Debian packaging is Copyright © 2008 Sébastien Bacher, Andreas
3284Moog, Emilio Pozuelo Monfort and Josselin Mouette. It is licensed under
33GFDL License:85the same conditions.
3486
35 GNU Free Documentation License87
36 Version 1.1, March 200088License for the documentation:
3789
38 Copyright (C) 2000 Free Software Foundation, Inc.90 Permission is granted to copy, distribute and/or modify this
39 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA91 document under the terms of the GNU Free Documentation
40 Everyone is permitted to copy and distribute verbatim copies92 License (GFDL), Version 1.1 or any later version published
41 of this license document, but changing it is not allowed.93 by the Free Software Foundation with no Invariant Sections,
4294 no Front-Cover Texts, and no Back-Cover Texts.
4395
440. PREAMBLE96 This manual is part of a collection of GNOME manuals
4597 distributed under the GFDL. If you want to distribute this
46The purpose of this License is to make a manual, textbook, or other98 manual separately from the collection, you can do so by
47written document "free" in the sense of freedom: to assure everyone99 adding a copy of the license to the manual, as described in
48the effective freedom to copy and redistribute it, with or without100 section 6 of the license.
49modifying it, either commercially or noncommercially. Secondarily,101
50this License preserves for the author and publisher a way to get102On Debian systems, the complete text of the GNU Free Documentation
51credit for their work, while not being considered responsible for103License can be found in `/usr/share/common-licenses/GFDL'.
52modifications made by others.
53
54This License is a kind of "copyleft", which means that derivative
55works of the document must themselves be free in the same sense. It
56complements the GNU General Public License, which is a copyleft
57license designed for free software.
58
59We have designed this License in order to use it for manuals for free
60software, because free software needs free documentation: a free
61program should come with manuals providing the same freedoms that the
62software does. But this License is not limited to software manuals;
63it can be used for any textual work, regardless of subject matter or
64whether it is published as a printed book. We recommend this License
65principally for works whose purpose is instruction or reference.
66
67
681. APPLICABILITY AND DEFINITIONS
69
70This License applies to any manual or other work that contains a
71notice placed by the copyright holder saying it can be distributed
72under the terms of this License. The "Document", below, refers to any
73such manual or work. Any member of the public is a licensee, and is
74addressed as "you".
75
76A "Modified Version" of the Document means any work containing the
77Document or a portion of it, either copied verbatim, or with
78modifications and/or translated into another language.
79
80A "Secondary Section" is a named appendix or a front-matter section of
81the Document that deals exclusively with the relationship of the
82publishers or authors of the Document to the Document's overall subject
83(or to related matters) and contains nothing that could fall directly
84within that overall subject. (For example, if the Document is in part a
85textbook of mathematics, a Secondary Section may not explain any
86mathematics.) The relationship could be a matter of historical
87connection with the subject or with related matters, or of legal,
88commercial, philosophical, ethical or political position regarding
89them.
90
91The "Invariant Sections" are certain Secondary Sections whose titles
92are designated, as being those of Invariant Sections, in the notice
93that says that the Document is released under this License.
94
95The "Cover Texts" are certain short passages of text that are listed,
96as Front-Cover Texts or Back-Cover Texts, in the notice that says that
97the Document is released under this License.
98
99A "Transparent" copy of the Document means a machine-readable copy,
100represented in a format whose specification is available to the
101general public, whose contents can be viewed and edited directly and
102straightforwardly with generic text editors or (for images composed of
103pixels) generic paint programs or (for drawings) some widely available
104drawing editor, and that is suitable for input to text formatters or
105for automatic translation to a variety of formats suitable for input
106to text formatters. A copy made in an otherwise Transparent file
107format whose markup has been designed to thwart or discourage
108subsequent modification by readers is not Transparent. A copy that is
109not "Transparent" is called "Opaque".
110
111Examples of suitable formats for Transparent copies include plain
112ASCII without markup, Texinfo input format, LaTeX input format, SGML
113or XML using a publicly available DTD, and standard-conforming simple
114HTML designed for human modification. Opaque formats include
115PostScript, PDF, proprietary formats that can be read and edited only
116by proprietary word processors, SGML or XML for which the DTD and/or
117processing tools are not generally available, and the
118machine-generated HTML produced by some word processors for output
119purposes only.
120
121The "Title Page" means, for a printed book, the title page itself,
122plus such following pages as are needed to hold, legibly, the material
123this License requires to appear in the title page. For works in
124formats which do not have any title page as such, "Title Page" means
125the text near the most prominent appearance of the work's title,
126preceding the beginning of the body of the text.
127
128
1292. VERBATIM COPYING
130
131You may copy and distribute the Document in any medium, either
132commercially or noncommercially, provided that this License, the
133copyright notices, and the license notice saying this License applies
134to the Document are reproduced in all copies, and that you add no other
135conditions whatsoever to those of this License. You may not use
136technical measures to obstruct or control the reading or further
137copying of the copies you make or distribute. However, you may accept
138compensation in exchange for copies. If you distribute a large enough
139number of copies you must also follow the conditions in section 3.
140
141You may also lend copies, under the same conditions stated above, and
142you may publicly display copies.
143
144
1453. COPYING IN QUANTITY
146
147If you publish printed copies of the Document numbering more than 100,
148and the Document's license notice requires Cover Texts, you must enclose
149the copies in covers that carry, clearly and legibly, all these Cover
150Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
151the back cover. Both covers must also clearly and legibly identify
152you as the publisher of these copies. The front cover must present
153the full title with all words of the title equally prominent and
154visible. You may add other material on the covers in addition.
155Copying with changes limited to the covers, as long as they preserve
156the title of the Document and satisfy these conditions, can be treated
157as verbatim copying in other respects.
158
159If the required texts for either cover are too voluminous to fit
160legibly, you should put the first ones listed (as many as fit
161reasonably) on the actual cover, and continue the rest onto adjacent
162pages.
163
164If you publish or distribute Opaque copies of the Document numbering
165more than 100, you must either include a machine-readable Transparent
166copy along with each Opaque copy, or state in or with each Opaque copy
167a publicly-accessible computer-network location containing a complete
168Transparent copy of the Document, free of added material, which the
169general network-using public has access to download anonymously at no
170charge using public-standard network protocols. If you use the latter
171option, you must take reasonably prudent steps, when you begin
172distribution of Opaque copies in quantity, to ensure that this
173Transparent copy will remain thus accessible at the stated location
174until at least one year after the last time you distribute an Opaque
175copy (directly or through your agents or retailers) of that edition to
176the public.
177
178It is requested, but not required, that you contact the authors of the
179Document well before redistributing any large number of copies, to give
180them a chance to provide you with an updated version of the Document.
181
182
1834. MODIFICATIONS
184
185You may copy and distribute a Modified Version of the Document under
186the conditions of sections 2 and 3 above, provided that you release
187the Modified Version under precisely this License, with the Modified
188Version filling the role of the Document, thus licensing distribution
189and modification of the Modified Version to whoever possesses a copy
190of it. In addition, you must do these things in the Modified Version:
191
192A. Use in the Title Page (and on the covers, if any) a title distinct
193 from that of the Document, and from those of previous versions
194 (which should, if there were any, be listed in the History section
195 of the Document). You may use the same title as a previous version
196 if the original publisher of that version gives permission.
197B. List on the Title Page, as authors, one or more persons or entities
198 responsible for authorship of the modifications in the Modified
199 Version, together with at least five of the principal authors of the
200 Document (all of its principal authors, if it has less than five).
201C. State on the Title page the name of the publisher of the
202 Modified Version, as the publisher.
203D. Preserve all the copyright notices of the Document.
204E. Add an appropriate copyright notice for your modifications
205 adjacent to the other copyright notices.
206F. Include, immediately after the copyright notices, a license notice
207 giving the public permission to use the Modified Version under the
208 terms of this License, in the form shown in the Addendum below.
209G. Preserve in that license notice the full lists of Invariant Sections
210 and required Cover Texts given in the Document's license notice.
211H. Include an unaltered copy of this License.
212I. Preserve the section entitled "History", and its title, and add to
213 it an item stating at least the title, year, new authors, and
214 publisher of the Modified Version as given on the Title Page. If
215 there is no section entitled "History" in the Document, create one
216 stating the title, year, authors, and publisher of the Document as
217 given on its Title Page, then add an item describing the Modified
218 Version as stated in the previous sentence.
219J. Preserve the network location, if any, given in the Document for
220 public access to a Transparent copy of the Document, and likewise
221 the network locations given in the Document for previous versions
222 it was based on. These may be placed in the "History" section.
223 You may omit a network location for a work that was published at
224 least four years before the Document itself, or if the original
225 publisher of the version it refers to gives permission.
226K. In any section entitled "Acknowledgements" or "Dedications",
227 preserve the section's title, and preserve in the section all the
228 substance and tone of each of the contributor acknowledgements
229 and/or dedications given therein.
230L. Preserve all the Invariant Sections of the Document,
231 unaltered in their text and in their titles. Section numbers
232 or the equivalent are not considered part of the section titles.
233M. Delete any section entitled "Endorsements". Such a section
234 may not be included in the Modified Version.
235N. Do not retitle any existing section as "Endorsements"
236 or to conflict in title with any Invariant Section.
237
238If the Modified Version includes new front-matter sections or
239appendices that qualify as Secondary Sections and contain no material
240copied from the Document, you may at your option designate some or all
241of these sections as invariant. To do this, add their titles to the
242list of Invariant Sections in the Modified Version's license notice.
243These titles must be distinct from any other section titles.
244
245You may add a section entitled "Endorsements", provided it contains
246nothing but endorsements of your Modified Version by various
247parties--for example, statements of peer review or that the text has
248been approved by an organization as the authoritative definition of a
249standard.
250
251You may add a passage of up to five words as a Front-Cover Text, and a
252passage of up to 25 words as a Back-Cover Text, to the end of the list
253of Cover Texts in the Modified Version. Only one passage of
254Front-Cover Text and one of Back-Cover Text may be added by (or
255through arrangements made by) any one entity. If the Document already
256includes a cover text for the same cover, previously added by you or
257by arrangement made by the same entity you are acting on behalf of,
258you may not add another; but you may replace the old one, on explicit
259permission from the previous publisher that added the old one.
260
261The author(s) and publisher(s) of the Document do not by this License
262give permission to use their names for publicity for or to assert or
263imply endorsement of any Modified Version.
264
265
2665. COMBINING DOCUMENTS
267
268You may combine the Document with other documents released under this
269License, under the terms defined in section 4 above for modified
270versions, provided that you include in the combination all of the
271Invariant Sections of all of the original documents, unmodified, and
272list them all as Invariant Sections of your combined work in its
273license notice.
274
275The combined work need only contain one copy of this License, and
276multiple identical Invariant Sections may be replaced with a single
277copy. If there are multiple Invariant Sections with the same name but
278different contents, make the title of each such section unique by
279adding at the end of it, in parentheses, the name of the original
280author or publisher of that section if known, or else a unique number.
281Make the same adjustment to the section titles in the list of
282Invariant Sections in the license notice of the combined work.
283
284In the combination, you must combine any sections entitled "History"
285in the various original documents, forming one section entitled
286"History"; likewise combine any sections entitled "Acknowledgements",
287and any sections entitled "Dedications". You must delete all sections
288entitled "Endorsements."
289
290
2916. COLLECTIONS OF DOCUMENTS
292
293You may make a collection consisting of the Document and other documents
294released under this License, and replace the individual copies of this
295License in the various documents with a single copy that is included in
296the collection, provided that you follow the rules of this License for
297verbatim copying of each of the documents in all other respects.
298
299You may extract a single document from such a collection, and distribute
300it individually under this License, provided you insert a copy of this
301License into the extracted document, and follow this License in all
302other respects regarding verbatim copying of that document.
303
304
3057. AGGREGATION WITH INDEPENDENT WORKS
306
307A compilation of the Document or its derivatives with other separate
308and independent documents or works, in or on a volume of a storage or
309distribution medium, does not as a whole count as a Modified Version
310of the Document, provided no compilation copyright is claimed for the
311compilation. Such a compilation is called an "aggregate", and this
312License does not apply to the other self-contained works thus compiled
313with the Document, on account of their being thus compiled, if they
314are not themselves derivative works of the Document.
315
316If the Cover Text requirement of section 3 is applicable to these
317copies of the Document, then if the Document is less than one quarter
318of the entire aggregate, the Document's Cover Texts may be placed on
319covers that surround only the Document within the aggregate.
320Otherwise they must appear on covers around the whole aggregate.
321
322
3238. TRANSLATION
324
325Translation is considered a kind of modification, so you may
326distribute translations of the Document under the terms of section 4.
327Replacing Invariant Sections with translations requires special
328permission from their copyright holders, but you may include
329translations of some or all Invariant Sections in addition to the
330original versions of these Invariant Sections. You may include a
331translation of this License provided that you also include the
332original English version of this License. In case of a disagreement
333between the translation and the original English version of this
334License, the original English version will prevail.
335
336
3379. TERMINATION
338
339You may not copy, modify, sublicense, or distribute the Document except
340as expressly provided for under this License. Any other attempt to
341copy, modify, sublicense or distribute the Document is void, and will
342automatically terminate your rights under this License. However,
343parties who have received copies, or rights, from you under this
344License will not have their licenses terminated so long as such
345parties remain in full compliance.
346
347
34810. FUTURE REVISIONS OF THIS LICENSE
349
350The Free Software Foundation may publish new, revised versions
351of the GNU Free Documentation License from time to time. Such new
352versions will be similar in spirit to the present version, but may
353differ in detail to address new problems or concerns. See
354http://www.gnu.org/copyleft/.
355
356Each version of the License is given a distinguishing version number.
357If the Document specifies that a particular numbered version of this
358License "or any later version" applies to it, you have the option of
359following the terms and conditions either of that specified version or
360of any later version that has been published (not as a draft) by the
361Free Software Foundation. If the Document does not specify a version
362number of this License, you may choose any version ever published (not
363as a draft) by the Free Software Foundation.
364
365
366ADDENDUM: How to use this License for your documents
367
368To use this License in a document you have written, include a copy of
369the License in the document and put the following copyright and
370license notices just after the title page:
371
372 Copyright (c) YEAR YOUR NAME.
373 Permission is granted to copy, distribute and/or modify this document
374 under the terms of the GNU Free Documentation License, Version 1.1
375 or any later version published by the Free Software Foundation;
376 with the Invariant Sections being LIST THEIR TITLES, with the
377 Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
378 A copy of the license is included in the section entitled "GNU
379 Free Documentation License".
380
381If you have no Invariant Sections, write "with no Invariant Sections"
382instead of saying which ones are invariant. If you have no
383Front-Cover Texts, write "no Front-Cover Texts" instead of
384"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
385
386If your document contains nontrivial examples of program code, we
387recommend releasing these examples in parallel under your choice of
388free software license, such as the GNU General Public License,
389to permit their use in free software.
390104
=== added file 'debian/patches/01_nomenu.patch'
--- debian/patches/01_nomenu.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/01_nomenu.patch 2011-01-15 23:03:57 +0000
@@ -0,0 +1,12 @@
1Index: seahorse-plugins-2.30.1/plugins/nautilus/seahorse-pgp-preferences.desktop.in
2===================================================================
3--- seahorse-plugins-2.30.1.orig/plugins/nautilus/seahorse-pgp-preferences.desktop.in 2010-05-07 22:17:29.912895325 +0200
4+++ seahorse-plugins-2.30.1/plugins/nautilus/seahorse-pgp-preferences.desktop.in 2010-05-07 22:17:49.624396709 +0200
5@@ -7,6 +7,7 @@ Type=Application
6 Icon=seahorse-preferences
7 Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
8 StartupNotify=true
9+NoDisplay=true
10 X-GNOME-Bugzilla-Bugzilla=GNOME
11 X-GNOME-Bugzilla-Product=seahorse
12 X-GNOME-Bugzilla-Component=general
013
=== modified file 'debian/patches/01_ubuntu_keyserver.patch'
--- debian/patches/01_ubuntu_keyserver.patch 2009-03-16 02:11:36 +0000
+++ debian/patches/01_ubuntu_keyserver.patch 2011-01-15 23:03:57 +0000
@@ -1,3 +1,8 @@
1Description: Added ubuntu keyserver to the defaults.
2Bug-Ubuntu: https://launchpad.net/bugs/86796
3Forwarded: not-needed
4Author: Andrew Starr-Bochicchio (andrewsomething) <a.starr.b@gmail.com>
5
1diff -r 26d5db3010fc data/seahorse-plugins.schemas.in6diff -r 26d5db3010fc data/seahorse-plugins.schemas.in
2--- a/data/seahorse-plugins.schemas.in Thu Mar 05 16:43:19 2009 -05007--- a/data/seahorse-plugins.schemas.in Thu Mar 05 16:43:19 2009 -0500
3+++ b/data/seahorse-plugins.schemas.in Thu Mar 05 16:44:48 2009 -05008+++ b/data/seahorse-plugins.schemas.in Thu Mar 05 16:44:48 2009 -0500
49
=== modified file 'debian/patches/02_copy_gpg_conf_skeleton.patch'
--- debian/patches/02_copy_gpg_conf_skeleton.patch 2009-03-20 07:18:39 +0000
+++ debian/patches/02_copy_gpg_conf_skeleton.patch 2011-01-15 23:03:57 +0000
@@ -1,3 +1,9 @@
1From: Mackenzie Morgan <maco.m@ubuntu.com>
2Description: Copy gpg.conf skel instead of creating blank file.
3Bug: https://bugzilla.gnome.org/585535
4Bug-Ubuntu: https://launchpad.net/bugs/345727
5Forwarded: yes
6
1--- seahorse-plugins-2.26.0.orig/libseahorse/seahorse-gpg-options.c7--- seahorse-plugins-2.26.0.orig/libseahorse/seahorse-gpg-options.c
2+++ seahorse-plugins-2.26.0/libseahorse/seahorse-gpg-options.c8+++ seahorse-plugins-2.26.0/libseahorse/seahorse-gpg-options.c
3@@ -30,6 +30,7 @@9@@ -30,6 +30,7 @@
410
=== modified file 'debian/patches/03_dont_crash_on_exit.patch'
--- debian/patches/03_dont_crash_on_exit.patch 2010-01-25 09:28:28 +0000
+++ debian/patches/03_dont_crash_on_exit.patch 2011-01-15 23:03:57 +0000
@@ -6,7 +6,7 @@
6registered inside liborbit, leading to a crash6registered inside liborbit, leading to a crash
77
8Bug-Ubuntu: https://launchpad.net/bugs/4293228Bug-Ubuntu: https://launchpad.net/bugs/429322
9Bug: http://bugzilla.gnome.org/show_bug.cgi?id=5797389Bug: http://bugzilla.gnome.org/579738
10Forwarded: yes10Forwarded: yes
1111
12Index: seahorse-plugins-2.28.1/agent/seahorse-agent-main.c12Index: seahorse-plugins-2.28.1/agent/seahorse-agent-main.c
1313
=== added file 'debian/patches/10_gpgme_crash.patch'
--- debian/patches/10_gpgme_crash.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/10_gpgme_crash.patch 2011-01-15 23:03:57 +0000
@@ -0,0 +1,69 @@
1From e99fc5839deb86868fa4fdfbfc2fcadef2a83755 Mon Sep 17 00:00:00 2001
2From: Adam Schreiber <sadam@gnome.org>
3Date: Sun, 20 Jun 2010 21:12:54 +0000
4Subject: Fix build with -DGSEAL
5
6---
7diff --git a/agent/seahorse-agent-cache.c b/agent/seahorse-agent-cache.c
8index a4371d8..5bf42a4 100644
9--- a/agent/seahorse-agent-cache.c
10+++ b/agent/seahorse-agent-cache.c
11@@ -237,6 +237,7 @@ seahorse_agent_cache_init ()
12 g_cache =
13 g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
14
15+ gpgme_check_version (NULL);
16 err = gpgme_engine_check_version (proto);
17 g_return_if_fail (GPG_IS_OK (err));
18
19diff --git a/libseahorse/seahorse-pgp-operation.c b/libseahorse/seahorse-pgp-operation.c
20index fd2a6f8..d842383 100644
21--- a/libseahorse/seahorse-pgp-operation.c
22+++ b/libseahorse/seahorse-pgp-operation.c
23@@ -323,6 +323,7 @@ seahorse_pgp_operation_init (SeahorsePGPOperation *pop)
24 gpgme_error_t err;
25 gpgme_ctx_t ctx;
26
27+ gpgme_check_version (NULL);
28 err = gpgme_engine_check_version (proto);
29 g_return_if_fail (GPG_IS_OK (err));
30
31diff --git a/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c
32index b15d53e..3fb9e5a 100644
33--- a/libseahorse/seahorse-widget.c
34+++ b/libseahorse/seahorse-widget.c
35@@ -200,7 +200,6 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
36 gtk_builder_connect_signals (swidget->gtkbuilder, swidget);
37
38 w = GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name));
39- GTK_WIDGET_SET_FLAGS (GTK_WINDOW (w), GTK_TOPLEVEL);
40 /*TODO: glade_xml_ensure_accel (swidget->gtkbuilder);*/
41
42 gtk_window_set_icon_name (GTK_WINDOW (w), "seahorse");
43diff --git a/plugins/nautilus/seahorse-tool.c b/plugins/nautilus/seahorse-tool.c
44index 87968ff..ea727d8 100644
45--- a/plugins/nautilus/seahorse-tool.c
46+++ b/plugins/nautilus/seahorse-tool.c
47@@ -170,6 +170,9 @@ prompt_recipients (gpgme_key_t *signkey)
48 recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer);
49
50 if (recips) {
51+ gpgme_check_version (NULL);
52+ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
53+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
54
55 gerr = gpgme_new (&ctx);
56 g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
57@@ -328,6 +331,10 @@ prompt_signer ()
58 id = cryptui_keyset_key_raw_keyid (keyset, signer);
59 g_free (signer);
60
61+ gpgme_check_version (NULL);
62+ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
63+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
64+
65 gerr = gpgme_new (&ctx);
66 g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
67
68--
69cgit v0.8.3.1
070
=== modified file 'debian/patches/series'
--- debian/patches/series 2010-04-08 00:47:42 +0000
+++ debian/patches/series 2011-01-15 23:03:57 +0000
@@ -1,5 +1,5 @@
101_nomenu.patch
101_ubuntu_keyserver.patch201_ubuntu_keyserver.patch
202_copy_gpg_conf_skeleton.patch302_copy_gpg_conf_skeleton.patch
303_dont_crash_on_exit.patch403_dont_crash_on_exit.patch
406_gpgme_check_version.patch510_gpgme_crash.patch
5
66
=== modified file 'debian/rules'
--- debian/rules 2009-10-20 11:58:09 +0000
+++ debian/rules 2011-01-15 23:03:57 +0000
@@ -2,7 +2,6 @@
22
3include /usr/share/cdbs/1/rules/debhelper.mk3include /usr/share/cdbs/1/rules/debhelper.mk
4include /usr/share/cdbs/1/class/gnome.mk4include /usr/share/cdbs/1/class/gnome.mk
5include /usr/share/cdbs/1/rules/patchsys-quilt.mk
6include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk5include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
7-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk6-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
87
98
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2011-01-15 23:03:57 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== modified file 'debian/watch'
--- debian/watch 2009-02-15 19:14:28 +0000
+++ debian/watch 2011-01-15 23:03:57 +0000
@@ -1,2 +1,3 @@
1version=21version=2
2http://ftp.gnome.org/pub/gnome/sources/seahorse-plugins/([\d\.]+)/seahorse-plugins-([\d\.]+)\.tar\.gz2http://ftp.gnome.org/pub/gnome/sources/seahorse-plugins/([\d\.]+)[02468]/ \
3seahorse-plugins-([\d\.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches

to all changes: