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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-08 00:47:42 +0000
3+++ debian/changelog 2011-01-15 23:03:57 +0000
4@@ -1,3 +1,75 @@
5+seahorse-plugins (2.30.1-3ubuntu1) natty; urgency=low
6+
7+ * Merge from debian unstable. Remaining changes: (LP: #701670)
8+ - debian/control{.in}:
9+ + Replace Build-Depends intltool with libxml-parser-perl.
10+ + Add Vcs-Bzr link related to Ubuntu Desktop Team.
11+ + seahorse-plugins: Move seahorse from Depends to Recommends.
12+ - debian/menu: Add menu file.
13+ - debian/patches/01_ubuntu_keyserver.patch:
14+ + Added ubuntu keyserver to the defaults.
15+ - debian/patches/02_copy_gpg_conf_skeleton.patch:
16+ + Copy gpg.conf skel instead of creating blank file.
17+ - debian/patches/03_dont_crash_on_exit.patch:
18+ + Only clean up the socket dir on exit. Calling GConf functions
19+ in the atexit handler is bad, as it conflicts with a handler
20+ registered inside liborbit, leading to a crash.
21+ - debian/rules:
22+ + Remove DEB_DH_MAKESHLIBS_ARGS_seahorse-plugins.
23+ + Rename 60seahorse to 60seahorse-plugins.
24+ + Remove mime-type catalog, seahorse source package related.
25+ - debian/seahorse{-preferences.1, .Xsession, -plugins.manpages}:
26+ + Remove due to related with seahorse source package.
27+ - debian/seahorse-plugins.Xsession:
28+ + Start the seahorse-agent. Replaces debian/seahorse.Xsession.
29+ * debian/copyright: Restore from Debian. seahorse-plugins source
30+ has been uploaded in Debian after our initial upload.
31+ * debian/patches/06_gpgme_check_version.patch:
32+ - Dropped, applied upstream.
33+ * debian/rules: Drop quilt, Debian has switched to 3.0 source format.
34+ * debian/watch: Restore from Debian. There is no point to keep
35+ change longer.
36+
37+ -- Artur Rona <ari-tczew@ubuntu.com> Tue, 11 Jan 2011 15:13:36 +0100
38+
39+seahorse-plugins (2.30.1-3) unstable; urgency=low
40+
41+ * 10_gpgme_crash.patch: stolen upstream. Fix a crash caused by a
42+ change in gpgme. Closes: #581030, #587092.
43+
44+ -- Josselin Mouette <joss@debian.org> Fri, 25 Jun 2010 19:10:12 +0200
45+
46+seahorse-plugins (2.30.1-2) unstable; urgency=low
47+
48+ * Switch to 3.0 source format.
49+ * 01_nomenu.patch: new patch. Remove the preferences from the menu.
50+ The defaults are sane anyway, and that makes two encryption capplets
51+ in the preferences menu.
52+
53+ -- Josselin Mouette <joss@debian.org> Fri, 07 May 2010 22:18:49 +0200
54+
55+seahorse-plugins (2.30.1-1) unstable; urgency=low
56+
57+ * New upstream bugfix release.
58+
59+ -- Sebastian Dröge <slomo@debian.org> Wed, 28 Apr 2010 14:21:16 +0200
60+
61+seahorse-plugins (2.30.0-1) unstable; urgency=low
62+
63+ [ Emilio Pozuelo Monfort ]
64+ * debian/patches/01_maxpathlen_hurd.patch:
65+ - Fix build failure on the Hurd, use dynamic allocation rather than
66+ hardcoding the GPG homedir maximum length to MAXPATHLEN.
67+
68+ [ Sebastian Dröge ]
69+ * New upstream stable release:
70+ + debian/control.in:
71+ - Update build dependencies.
72+ + debian/patches/01_maxpathlen_hurd.patch:
73+ - Dropped, merged upstream.
74+
75+ -- Sebastian Dröge <slomo@debian.org> Mon, 12 Apr 2010 17:37:48 +0200
76+
77 seahorse-plugins (2.30.0-0ubuntu2) lucid; urgency=low
78
79 * debian/patches/06_gpgme_check_version.patch:
80@@ -55,6 +127,19 @@
81
82 -- Didier Roche <didrocks@ubuntu.com> Tue, 09 Feb 2010 14:55:30 +0100
83
84+seahorse-plugins (2.28.1-2) unstable; urgency=low
85+
86+ * Disable epiphany plugin, it doesn’t work at all since it’s still
87+ Gecko-based.
88+
89+ -- Josselin Mouette <joss@debian.org> Sat, 14 Nov 2009 14:49:11 +0100
90+
91+seahorse-plugins (2.28.1-1) unstable; urgency=low
92+
93+ * New upstream release.
94+
95+ -- Andrea Veri <andrea.veri89@gmail.com> Thu, 22 Oct 2009 21:45:01 +0200
96+
97 seahorse-plugins (2.28.1-0ubuntu5) lucid; urgency=low
98
99 * debian/seahorse-plugins.Xsession: Add support for session command
100@@ -94,6 +179,15 @@
101
102 -- Robert Ancell <robert.ancell@canonical.com> Mon, 19 Oct 2009 17:00:18 +1100
103
104+seahorse-plugins (2.28.0-1) unstable; urgency=low
105+
106+ * New upstream release.
107+ * ephipany's seahorse plugin it's disabled for now,
108+ it needs porting to the newer ephiphany-webkit package.
109+ (configure tests check gecko stuff only atm)
110+
111+ -- Andrea Veri <andrea.veri89@gmail.com> Thu, 15 Oct 2009 23:17:26 +0200
112+
113 seahorse-plugins (2.28.0-0ubuntu1) karmic; urgency=low
114
115 * New upstream release: (LP: #435562)
116@@ -112,6 +206,33 @@
117
118 -- Andreas Moog <amoog@ubuntu.com> Sat, 02 May 2009 01:30:06 +0200
119
120+seahorse-plugins (2.26.2-1) unstable; urgency=low
121+
122+ [ Andreas Moog ]
123+ * New upstream release. (Closes: #544345)
124+ * debian/control{.in}
125+ + bump standards version to 3.8.3, no changes needed
126+ + Fix spelling error in description (Gnu -> GNU)
127+ * debian/seahorse-preferences.1, debian/seahorse-plugins.manpages:
128+ + provide a man page for seahorse-preferences
129+
130+ [ Emilio Pozuelo Monfort ]
131+ * Update my email address.
132+
133+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 31 Aug 2009 00:51:44 +0200
134+
135+seahorse-plugins (2.26.1-1) unstable; urgency=low
136+
137+ [ Loic Minier ]
138+ * searhorse.Xsession: don't start seahorse-agent if $GPG_AGENT_INFO is set.
139+
140+ [ Josselin Mouette ]
141+ * New upstream release.
142+ + Fixes crash when gedit exits. Closes: #525590.
143+ * 10_ephyembed_api.patch: dropped, merged upstream.
144+
145+ -- Josselin Mouette <joss@debian.org> Wed, 20 May 2009 16:45:40 +0200
146+
147 seahorse-plugins (2.26.1-0ubuntu1) jaunty; urgency=low
148
149 * New upstream release: (LP: #360711)
150@@ -182,6 +303,50 @@
151
152 -- Christophe Sauthier <christophe.sauthier@gmail.com> Thu, 08 Jan 2009 18:24:20 +0100
153
154+seahorse-plugins (2.24.1-3) unstable; urgency=low
155+
156+ * Upload to unstable.
157+ + Don’t require the nautilus 2.22 version, so that the extension is
158+ built at the old place.
159+
160+ -- Josselin Mouette <joss@debian.org> Sun, 08 Mar 2009 19:58:52 +0100
161+
162+seahorse-plugins (2.24.1-2) experimental; urgency=low
163+
164+ * debian/copyright: Add Gaim developers due to
165+ libseahorse/seahorse-gtkstock.[ch]
166+
167+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com> Fri, 06 Mar 2009 20:34:19 +0100
168+
169+seahorse-plugins (2.24.1-1) experimental; urgency=low
170+
171+ [ Emilio Pozuelo Monfort ]
172+ * Initial upload to Debian (Closes: #506895).
173+ * debian/control.in: Update description, maintainer, add Vcs-* and
174+ Homepage fields, update build-dependencies.
175+ * Remove menu file, it references the seahorse binary which is in the
176+ seahorse package.
177+ * debian/rules: Add missing hack to remove the mime catalog, from the
178+ seahorse package.
179+
180+ [ Josselin Mouette ]
181+ * Rename 60seahorse-plugins to 60seahorse so that the file can be
182+ transparently replaced across packages. (We already replace seahorse
183+ < 2.24).
184+ * Require nautilus 2.22 and epiphany 2.24 to be sure to build the
185+ plugins for the correct versions.
186+ * Depend on seahorse.
187+ * Deactivate dh_makeshlibs.
188+ * Enable simple-patchsys.
189+ * 10_ephyembed_api.patch: taken from the old seahorse package.
190+ Necessary to make the epiphany plugin work.
191+ * copyright:
192+ + Don’t ship the full GFDL, only reference it.
193+ + Update authors list.
194+ + Add complete list of copyright holders.
195+
196+ -- Josselin Mouette <joss@debian.org> Tue, 09 Dec 2008 22:42:45 +0100
197+
198 seahorse-plugins (2.24.1-0ubuntu2) jaunty; urgency=low
199
200 * no changes upload for nss/nspr SONAME mini-transition
201
202=== modified file 'debian/control'
203--- debian/control 2010-02-09 13:47:04 +0000
204+++ debian/control 2011-01-15 23:03:57 +0000
205@@ -6,12 +6,11 @@
206 Source: seahorse-plugins
207 Section: gnome
208 Priority: optional
209-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
210-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
211-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
212+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
213+XSBC-Original-Maintainer: Emilio Pozuelo Monfort <pochu@debian.org>
214+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Josselin Mouette <joss@debian.org>, Sebastian Dröge <slomo@debian.org>
215 Build-Depends: debhelper (>= 5),
216 cdbs (>= 0.4.41),
217- quilt,
218 scrollkeeper,
219 libgpgme11-dev,
220 libxml-parser-perl,
221@@ -21,14 +20,16 @@
222 libgnome-keyring-dev,
223 libcryptui-dev,
224 libglib2.0-dev (>= 2.16),
225- libgtk2.0-dev (>= 2.10.0),
226+ libgtk2.0-dev (>= 2.18.0),
227 libpanel-applet2-dev,
228 gedit-dev,
229 libxml2-dev (>= 2.6.0),
230 libebook1.2-dev (>= 1.7.90),
231 gnome-pkg-tools,
232- libnautilus-extension-dev (>= 2.12.0)
233-Standards-Version: 3.8.0
234+ libnautilus-extension-dev (>= 2.12)
235+Standards-Version: 3.8.3
236+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
237+Homepage: http://live.gnome.org/Seahorse
238
239 Package: seahorse-plugins
240 Architecture: any
241@@ -45,4 +46,3 @@
242 .
243 In addition it includes an agent for storing private passphrases,
244 as well as a GnuPG and OpenSSH key manager.
245-
246
247=== modified file 'debian/control.in'
248--- debian/control.in 2010-02-09 13:47:04 +0000
249+++ debian/control.in 2011-01-15 23:03:57 +0000
250@@ -1,12 +1,11 @@
251 Source: seahorse-plugins
252 Section: gnome
253 Priority: optional
254-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
255+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
256+XSBC-Original-Maintainer: Emilio Pozuelo Monfort <pochu@debian.org>
257 Uploaders: @GNOME_TEAM@
258-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
259 Build-Depends: debhelper (>= 5),
260 cdbs (>= 0.4.41),
261- quilt,
262 scrollkeeper,
263 libgpgme11-dev,
264 libxml-parser-perl,
265@@ -16,14 +15,16 @@
266 libgnome-keyring-dev,
267 libcryptui-dev,
268 libglib2.0-dev (>= 2.16),
269- libgtk2.0-dev (>= 2.10.0),
270+ libgtk2.0-dev (>= 2.18.0),
271 libpanel-applet2-dev,
272 gedit-dev,
273 libxml2-dev (>= 2.6.0),
274 libebook1.2-dev (>= 1.7.90),
275 gnome-pkg-tools,
276- libnautilus-extension-dev (>= 2.12.0)
277-Standards-Version: 3.8.0
278+ libnautilus-extension-dev (>= 2.12)
279+Standards-Version: 3.8.3
280+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse-plugins/ubuntu
281+Homepage: http://live.gnome.org/Seahorse
282
283 Package: seahorse-plugins
284 Architecture: any
285@@ -40,4 +41,3 @@
286 .
287 In addition it includes an agent for storing private passphrases,
288 as well as a GnuPG and OpenSSH key manager.
289-
290
291=== modified file 'debian/copyright'
292--- debian/copyright 2009-02-15 19:14:28 +0000
293+++ debian/copyright 2011-01-15 23:03:57 +0000
294@@ -3,11 +3,63 @@
295
296 It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse
297
298-Upstream Authors: Nate Nielsen <nielsen@memberwebs.com>, Adam Schreiber <sadam@clemson.edu>
299-
300-Copyright (C) 2001, 2002 Jose Carlos Garcia Sogo
301-Copyright (C) 2002, 2003 Jacob Perkins
302-Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber
303+Upstream Authors: Jacob Perkins <jap1@users.sourceforge.net>
304+ Jose Carlos Garcia Sogo <jsogo@users.sourceforge.net>
305+ Jean Schurger <jk24@users.sourceforge.net>
306+ Stef Walter <stef@memberwebs.com>
307+ Adam Schreiber <sadam@clemson.edu>
308+
309+Copyright © 2004-2007 Stefan Walter
310+Copyright © 2004-2006 Adam Schreiber
311+Copyright © 2001-2003 Jose Carlos Garcia Sogo
312+Copyright © 2002, 2003 Jacob Perkins
313+Copyright © 2004, 2006 Nate Nielsen
314+Copyright © 2000-2004 Marco Pesenti Gritti
315+Copyright © 2003-2006 Christian Persch
316+Copyright © 2004, 2006 Jean-François Rameau
317+Copyright © 2000, 2001 Eazel, Inc.
318+Copyright © 2007, 2008 Jorge González
319+Copyright © 2007, 2008 Daniel Nylander
320+Copyright © 2004-2005 Shaun McCance
321+Copyright © 2007 Milo Casagrande
322+Copyright © 2007-2008 Claude Paroz
323+Copyright © 2007 GNOME i18n Project for Vietnamese
324+Copyright © 2008 Василий Фаронов
325+Copyright © 1992-2008 Free Software Foundation, Inc.
326+Copyright © 1999 Dave Camp
327+Copyright © 2005 Tecsidel S.A.
328+Copyright © 2004-2005 Adam Weinberger and the GNOME Foundation
329+Copyright © 2007, 2008 The GNOME Project
330+Copyright © 2007 Swecha Telugu Localisation Team
331+Copyright © 1995-1997 Ulrich Drepper
332+Copyright © 2004-2008 Rodney Dawes
333+Copyright © 1999, 2000 Anthony Mulcahy
334+Copyright © 2007 Ihar Hrachyshka
335+Copyright © 2004, 2005 Miloslav Trmac
336+Copyright © 2003 Péter Mátó
337+Copyright © 2004, 2005 Danijel Studen, Denis Lackovic, Ivan Jankovic
338+Copyright © 1994 X Consortium
339+Copyright © 2006 Alexander Larsson
340+Copyright © 2000-2003 Ximian Inc.
341+Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
342+Copyright © 1999, 2000 Robert Bihlmeyer
343+Copyright © Crispin Flowerday
344+Copyright © 2008 Frédéric Péters
345+Copyright © 2008 Lucas Lommer
346+Copyright © 2008 Mario Blättermann
347+Copyright © 2001-2004 Red Hat, Inc.
348+Copyright © 2004 Scott James Remnant
349+
350+
351+Gaim is the legal property of its developers, whose names are too numerous
352+to list here. Please refer to the COPYRIGHT file distributed with the gaim
353+source distribution.
354+
355+Copyright (C) 1998-2006 by the following:
356+
357+Dave 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
358+
359+
360
361 Main License (everything except docs):
362
363@@ -28,362 +80,24 @@
364 On Debian systems, the complete text of the GNU General
365 Public License can be found in `/usr/share/common-licenses/GPL'.
366
367-Documentation and help files are covered by GFDL license.
368-
369-GFDL License:
370-
371- GNU Free Documentation License
372- Version 1.1, March 2000
373-
374- Copyright (C) 2000 Free Software Foundation, Inc.
375- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
376- Everyone is permitted to copy and distribute verbatim copies
377- of this license document, but changing it is not allowed.
378-
379-
380-0. PREAMBLE
381-
382-The purpose of this License is to make a manual, textbook, or other
383-written document "free" in the sense of freedom: to assure everyone
384-the effective freedom to copy and redistribute it, with or without
385-modifying it, either commercially or noncommercially. Secondarily,
386-this License preserves for the author and publisher a way to get
387-credit for their work, while not being considered responsible for
388-modifications made by others.
389-
390-This License is a kind of "copyleft", which means that derivative
391-works of the document must themselves be free in the same sense. It
392-complements the GNU General Public License, which is a copyleft
393-license designed for free software.
394-
395-We have designed this License in order to use it for manuals for free
396-software, because free software needs free documentation: a free
397-program should come with manuals providing the same freedoms that the
398-software does. But this License is not limited to software manuals;
399-it can be used for any textual work, regardless of subject matter or
400-whether it is published as a printed book. We recommend this License
401-principally for works whose purpose is instruction or reference.
402-
403-
404-1. APPLICABILITY AND DEFINITIONS
405-
406-This License applies to any manual or other work that contains a
407-notice placed by the copyright holder saying it can be distributed
408-under the terms of this License. The "Document", below, refers to any
409-such manual or work. Any member of the public is a licensee, and is
410-addressed as "you".
411-
412-A "Modified Version" of the Document means any work containing the
413-Document or a portion of it, either copied verbatim, or with
414-modifications and/or translated into another language.
415-
416-A "Secondary Section" is a named appendix or a front-matter section of
417-the Document that deals exclusively with the relationship of the
418-publishers or authors of the Document to the Document's overall subject
419-(or to related matters) and contains nothing that could fall directly
420-within that overall subject. (For example, if the Document is in part a
421-textbook of mathematics, a Secondary Section may not explain any
422-mathematics.) The relationship could be a matter of historical
423-connection with the subject or with related matters, or of legal,
424-commercial, philosophical, ethical or political position regarding
425-them.
426-
427-The "Invariant Sections" are certain Secondary Sections whose titles
428-are designated, as being those of Invariant Sections, in the notice
429-that says that the Document is released under this License.
430-
431-The "Cover Texts" are certain short passages of text that are listed,
432-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
433-the Document is released under this License.
434-
435-A "Transparent" copy of the Document means a machine-readable copy,
436-represented in a format whose specification is available to the
437-general public, whose contents can be viewed and edited directly and
438-straightforwardly with generic text editors or (for images composed of
439-pixels) generic paint programs or (for drawings) some widely available
440-drawing editor, and that is suitable for input to text formatters or
441-for automatic translation to a variety of formats suitable for input
442-to text formatters. A copy made in an otherwise Transparent file
443-format whose markup has been designed to thwart or discourage
444-subsequent modification by readers is not Transparent. A copy that is
445-not "Transparent" is called "Opaque".
446-
447-Examples of suitable formats for Transparent copies include plain
448-ASCII without markup, Texinfo input format, LaTeX input format, SGML
449-or XML using a publicly available DTD, and standard-conforming simple
450-HTML designed for human modification. Opaque formats include
451-PostScript, PDF, proprietary formats that can be read and edited only
452-by proprietary word processors, SGML or XML for which the DTD and/or
453-processing tools are not generally available, and the
454-machine-generated HTML produced by some word processors for output
455-purposes only.
456-
457-The "Title Page" means, for a printed book, the title page itself,
458-plus such following pages as are needed to hold, legibly, the material
459-this License requires to appear in the title page. For works in
460-formats which do not have any title page as such, "Title Page" means
461-the text near the most prominent appearance of the work's title,
462-preceding the beginning of the body of the text.
463-
464-
465-2. VERBATIM COPYING
466-
467-You may copy and distribute the Document in any medium, either
468-commercially or noncommercially, provided that this License, the
469-copyright notices, and the license notice saying this License applies
470-to the Document are reproduced in all copies, and that you add no other
471-conditions whatsoever to those of this License. You may not use
472-technical measures to obstruct or control the reading or further
473-copying of the copies you make or distribute. However, you may accept
474-compensation in exchange for copies. If you distribute a large enough
475-number of copies you must also follow the conditions in section 3.
476-
477-You may also lend copies, under the same conditions stated above, and
478-you may publicly display copies.
479-
480-
481-3. COPYING IN QUANTITY
482-
483-If you publish printed copies of the Document numbering more than 100,
484-and the Document's license notice requires Cover Texts, you must enclose
485-the copies in covers that carry, clearly and legibly, all these Cover
486-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
487-the back cover. Both covers must also clearly and legibly identify
488-you as the publisher of these copies. The front cover must present
489-the full title with all words of the title equally prominent and
490-visible. You may add other material on the covers in addition.
491-Copying with changes limited to the covers, as long as they preserve
492-the title of the Document and satisfy these conditions, can be treated
493-as verbatim copying in other respects.
494-
495-If the required texts for either cover are too voluminous to fit
496-legibly, you should put the first ones listed (as many as fit
497-reasonably) on the actual cover, and continue the rest onto adjacent
498-pages.
499-
500-If you publish or distribute Opaque copies of the Document numbering
501-more than 100, you must either include a machine-readable Transparent
502-copy along with each Opaque copy, or state in or with each Opaque copy
503-a publicly-accessible computer-network location containing a complete
504-Transparent copy of the Document, free of added material, which the
505-general network-using public has access to download anonymously at no
506-charge using public-standard network protocols. If you use the latter
507-option, you must take reasonably prudent steps, when you begin
508-distribution of Opaque copies in quantity, to ensure that this
509-Transparent copy will remain thus accessible at the stated location
510-until at least one year after the last time you distribute an Opaque
511-copy (directly or through your agents or retailers) of that edition to
512-the public.
513-
514-It is requested, but not required, that you contact the authors of the
515-Document well before redistributing any large number of copies, to give
516-them a chance to provide you with an updated version of the Document.
517-
518-
519-4. MODIFICATIONS
520-
521-You may copy and distribute a Modified Version of the Document under
522-the conditions of sections 2 and 3 above, provided that you release
523-the Modified Version under precisely this License, with the Modified
524-Version filling the role of the Document, thus licensing distribution
525-and modification of the Modified Version to whoever possesses a copy
526-of it. In addition, you must do these things in the Modified Version:
527-
528-A. Use in the Title Page (and on the covers, if any) a title distinct
529- from that of the Document, and from those of previous versions
530- (which should, if there were any, be listed in the History section
531- of the Document). You may use the same title as a previous version
532- if the original publisher of that version gives permission.
533-B. List on the Title Page, as authors, one or more persons or entities
534- responsible for authorship of the modifications in the Modified
535- Version, together with at least five of the principal authors of the
536- Document (all of its principal authors, if it has less than five).
537-C. State on the Title page the name of the publisher of the
538- Modified Version, as the publisher.
539-D. Preserve all the copyright notices of the Document.
540-E. Add an appropriate copyright notice for your modifications
541- adjacent to the other copyright notices.
542-F. Include, immediately after the copyright notices, a license notice
543- giving the public permission to use the Modified Version under the
544- terms of this License, in the form shown in the Addendum below.
545-G. Preserve in that license notice the full lists of Invariant Sections
546- and required Cover Texts given in the Document's license notice.
547-H. Include an unaltered copy of this License.
548-I. Preserve the section entitled "History", and its title, and add to
549- it an item stating at least the title, year, new authors, and
550- publisher of the Modified Version as given on the Title Page. If
551- there is no section entitled "History" in the Document, create one
552- stating the title, year, authors, and publisher of the Document as
553- given on its Title Page, then add an item describing the Modified
554- Version as stated in the previous sentence.
555-J. Preserve the network location, if any, given in the Document for
556- public access to a Transparent copy of the Document, and likewise
557- the network locations given in the Document for previous versions
558- it was based on. These may be placed in the "History" section.
559- You may omit a network location for a work that was published at
560- least four years before the Document itself, or if the original
561- publisher of the version it refers to gives permission.
562-K. In any section entitled "Acknowledgements" or "Dedications",
563- preserve the section's title, and preserve in the section all the
564- substance and tone of each of the contributor acknowledgements
565- and/or dedications given therein.
566-L. Preserve all the Invariant Sections of the Document,
567- unaltered in their text and in their titles. Section numbers
568- or the equivalent are not considered part of the section titles.
569-M. Delete any section entitled "Endorsements". Such a section
570- may not be included in the Modified Version.
571-N. Do not retitle any existing section as "Endorsements"
572- or to conflict in title with any Invariant Section.
573-
574-If the Modified Version includes new front-matter sections or
575-appendices that qualify as Secondary Sections and contain no material
576-copied from the Document, you may at your option designate some or all
577-of these sections as invariant. To do this, add their titles to the
578-list of Invariant Sections in the Modified Version's license notice.
579-These titles must be distinct from any other section titles.
580-
581-You may add a section entitled "Endorsements", provided it contains
582-nothing but endorsements of your Modified Version by various
583-parties--for example, statements of peer review or that the text has
584-been approved by an organization as the authoritative definition of a
585-standard.
586-
587-You may add a passage of up to five words as a Front-Cover Text, and a
588-passage of up to 25 words as a Back-Cover Text, to the end of the list
589-of Cover Texts in the Modified Version. Only one passage of
590-Front-Cover Text and one of Back-Cover Text may be added by (or
591-through arrangements made by) any one entity. If the Document already
592-includes a cover text for the same cover, previously added by you or
593-by arrangement made by the same entity you are acting on behalf of,
594-you may not add another; but you may replace the old one, on explicit
595-permission from the previous publisher that added the old one.
596-
597-The author(s) and publisher(s) of the Document do not by this License
598-give permission to use their names for publicity for or to assert or
599-imply endorsement of any Modified Version.
600-
601-
602-5. COMBINING DOCUMENTS
603-
604-You may combine the Document with other documents released under this
605-License, under the terms defined in section 4 above for modified
606-versions, provided that you include in the combination all of the
607-Invariant Sections of all of the original documents, unmodified, and
608-list them all as Invariant Sections of your combined work in its
609-license notice.
610-
611-The combined work need only contain one copy of this License, and
612-multiple identical Invariant Sections may be replaced with a single
613-copy. If there are multiple Invariant Sections with the same name but
614-different contents, make the title of each such section unique by
615-adding at the end of it, in parentheses, the name of the original
616-author or publisher of that section if known, or else a unique number.
617-Make the same adjustment to the section titles in the list of
618-Invariant Sections in the license notice of the combined work.
619-
620-In the combination, you must combine any sections entitled "History"
621-in the various original documents, forming one section entitled
622-"History"; likewise combine any sections entitled "Acknowledgements",
623-and any sections entitled "Dedications". You must delete all sections
624-entitled "Endorsements."
625-
626-
627-6. COLLECTIONS OF DOCUMENTS
628-
629-You may make a collection consisting of the Document and other documents
630-released under this License, and replace the individual copies of this
631-License in the various documents with a single copy that is included in
632-the collection, provided that you follow the rules of this License for
633-verbatim copying of each of the documents in all other respects.
634-
635-You may extract a single document from such a collection, and distribute
636-it individually under this License, provided you insert a copy of this
637-License into the extracted document, and follow this License in all
638-other respects regarding verbatim copying of that document.
639-
640-
641-7. AGGREGATION WITH INDEPENDENT WORKS
642-
643-A compilation of the Document or its derivatives with other separate
644-and independent documents or works, in or on a volume of a storage or
645-distribution medium, does not as a whole count as a Modified Version
646-of the Document, provided no compilation copyright is claimed for the
647-compilation. Such a compilation is called an "aggregate", and this
648-License does not apply to the other self-contained works thus compiled
649-with the Document, on account of their being thus compiled, if they
650-are not themselves derivative works of the Document.
651-
652-If the Cover Text requirement of section 3 is applicable to these
653-copies of the Document, then if the Document is less than one quarter
654-of the entire aggregate, the Document's Cover Texts may be placed on
655-covers that surround only the Document within the aggregate.
656-Otherwise they must appear on covers around the whole aggregate.
657-
658-
659-8. TRANSLATION
660-
661-Translation is considered a kind of modification, so you may
662-distribute translations of the Document under the terms of section 4.
663-Replacing Invariant Sections with translations requires special
664-permission from their copyright holders, but you may include
665-translations of some or all Invariant Sections in addition to the
666-original versions of these Invariant Sections. You may include a
667-translation of this License provided that you also include the
668-original English version of this License. In case of a disagreement
669-between the translation and the original English version of this
670-License, the original English version will prevail.
671-
672-
673-9. TERMINATION
674-
675-You may not copy, modify, sublicense, or distribute the Document except
676-as expressly provided for under this License. Any other attempt to
677-copy, modify, sublicense or distribute the Document is void, and will
678-automatically terminate your rights under this License. However,
679-parties who have received copies, or rights, from you under this
680-License will not have their licenses terminated so long as such
681-parties remain in full compliance.
682-
683-
684-10. FUTURE REVISIONS OF THIS LICENSE
685-
686-The Free Software Foundation may publish new, revised versions
687-of the GNU Free Documentation License from time to time. Such new
688-versions will be similar in spirit to the present version, but may
689-differ in detail to address new problems or concerns. See
690-http://www.gnu.org/copyleft/.
691-
692-Each version of the License is given a distinguishing version number.
693-If the Document specifies that a particular numbered version of this
694-License "or any later version" applies to it, you have the option of
695-following the terms and conditions either of that specified version or
696-of any later version that has been published (not as a draft) by the
697-Free Software Foundation. If the Document does not specify a version
698-number of this License, you may choose any version ever published (not
699-as a draft) by the Free Software Foundation.
700-
701-
702-ADDENDUM: How to use this License for your documents
703-
704-To use this License in a document you have written, include a copy of
705-the License in the document and put the following copyright and
706-license notices just after the title page:
707-
708- Copyright (c) YEAR YOUR NAME.
709- Permission is granted to copy, distribute and/or modify this document
710- under the terms of the GNU Free Documentation License, Version 1.1
711- or any later version published by the Free Software Foundation;
712- with the Invariant Sections being LIST THEIR TITLES, with the
713- Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
714- A copy of the license is included in the section entitled "GNU
715- Free Documentation License".
716-
717-If you have no Invariant Sections, write "with no Invariant Sections"
718-instead of saying which ones are invariant. If you have no
719-Front-Cover Texts, write "no Front-Cover Texts" instead of
720-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
721-
722-If your document contains nontrivial examples of program code, we
723-recommend releasing these examples in parallel under your choice of
724-free software license, such as the GNU General Public License,
725-to permit their use in free software.
726+The Debian packaging is Copyright © 2008 Sébastien Bacher, Andreas
727+Moog, Emilio Pozuelo Monfort and Josselin Mouette. It is licensed under
728+the same conditions.
729+
730+
731+License for the documentation:
732+
733+ Permission is granted to copy, distribute and/or modify this
734+ document under the terms of the GNU Free Documentation
735+ License (GFDL), Version 1.1 or any later version published
736+ by the Free Software Foundation with no Invariant Sections,
737+ no Front-Cover Texts, and no Back-Cover Texts.
738+
739+ This manual is part of a collection of GNOME manuals
740+ distributed under the GFDL. If you want to distribute this
741+ manual separately from the collection, you can do so by
742+ adding a copy of the license to the manual, as described in
743+ section 6 of the license.
744+
745+On Debian systems, the complete text of the GNU Free Documentation
746+License can be found in `/usr/share/common-licenses/GFDL'.
747
748=== added file 'debian/patches/01_nomenu.patch'
749--- debian/patches/01_nomenu.patch 1970-01-01 00:00:00 +0000
750+++ debian/patches/01_nomenu.patch 2011-01-15 23:03:57 +0000
751@@ -0,0 +1,12 @@
752+Index: seahorse-plugins-2.30.1/plugins/nautilus/seahorse-pgp-preferences.desktop.in
753+===================================================================
754+--- seahorse-plugins-2.30.1.orig/plugins/nautilus/seahorse-pgp-preferences.desktop.in 2010-05-07 22:17:29.912895325 +0200
755++++ seahorse-plugins-2.30.1/plugins/nautilus/seahorse-pgp-preferences.desktop.in 2010-05-07 22:17:49.624396709 +0200
756+@@ -7,6 +7,7 @@ Type=Application
757+ Icon=seahorse-preferences
758+ Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
759+ StartupNotify=true
760++NoDisplay=true
761+ X-GNOME-Bugzilla-Bugzilla=GNOME
762+ X-GNOME-Bugzilla-Product=seahorse
763+ X-GNOME-Bugzilla-Component=general
764
765=== modified file 'debian/patches/01_ubuntu_keyserver.patch'
766--- debian/patches/01_ubuntu_keyserver.patch 2009-03-16 02:11:36 +0000
767+++ debian/patches/01_ubuntu_keyserver.patch 2011-01-15 23:03:57 +0000
768@@ -1,3 +1,8 @@
769+Description: Added ubuntu keyserver to the defaults.
770+Bug-Ubuntu: https://launchpad.net/bugs/86796
771+Forwarded: not-needed
772+Author: Andrew Starr-Bochicchio (andrewsomething) <a.starr.b@gmail.com>
773+
774 diff -r 26d5db3010fc data/seahorse-plugins.schemas.in
775 --- a/data/seahorse-plugins.schemas.in Thu Mar 05 16:43:19 2009 -0500
776 +++ b/data/seahorse-plugins.schemas.in Thu Mar 05 16:44:48 2009 -0500
777
778=== modified file 'debian/patches/02_copy_gpg_conf_skeleton.patch'
779--- debian/patches/02_copy_gpg_conf_skeleton.patch 2009-03-20 07:18:39 +0000
780+++ debian/patches/02_copy_gpg_conf_skeleton.patch 2011-01-15 23:03:57 +0000
781@@ -1,3 +1,9 @@
782+From: Mackenzie Morgan <maco.m@ubuntu.com>
783+Description: Copy gpg.conf skel instead of creating blank file.
784+Bug: https://bugzilla.gnome.org/585535
785+Bug-Ubuntu: https://launchpad.net/bugs/345727
786+Forwarded: yes
787+
788 --- seahorse-plugins-2.26.0.orig/libseahorse/seahorse-gpg-options.c
789 +++ seahorse-plugins-2.26.0/libseahorse/seahorse-gpg-options.c
790 @@ -30,6 +30,7 @@
791
792=== modified file 'debian/patches/03_dont_crash_on_exit.patch'
793--- debian/patches/03_dont_crash_on_exit.patch 2010-01-25 09:28:28 +0000
794+++ debian/patches/03_dont_crash_on_exit.patch 2011-01-15 23:03:57 +0000
795@@ -6,7 +6,7 @@
796 registered inside liborbit, leading to a crash
797
798 Bug-Ubuntu: https://launchpad.net/bugs/429322
799-Bug: http://bugzilla.gnome.org/show_bug.cgi?id=579738
800+Bug: http://bugzilla.gnome.org/579738
801 Forwarded: yes
802
803 Index: seahorse-plugins-2.28.1/agent/seahorse-agent-main.c
804
805=== added file 'debian/patches/10_gpgme_crash.patch'
806--- debian/patches/10_gpgme_crash.patch 1970-01-01 00:00:00 +0000
807+++ debian/patches/10_gpgme_crash.patch 2011-01-15 23:03:57 +0000
808@@ -0,0 +1,69 @@
809+From e99fc5839deb86868fa4fdfbfc2fcadef2a83755 Mon Sep 17 00:00:00 2001
810+From: Adam Schreiber <sadam@gnome.org>
811+Date: Sun, 20 Jun 2010 21:12:54 +0000
812+Subject: Fix build with -DGSEAL
813+
814+---
815+diff --git a/agent/seahorse-agent-cache.c b/agent/seahorse-agent-cache.c
816+index a4371d8..5bf42a4 100644
817+--- a/agent/seahorse-agent-cache.c
818++++ b/agent/seahorse-agent-cache.c
819+@@ -237,6 +237,7 @@ seahorse_agent_cache_init ()
820+ g_cache =
821+ g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item);
822+
823++ gpgme_check_version (NULL);
824+ err = gpgme_engine_check_version (proto);
825+ g_return_if_fail (GPG_IS_OK (err));
826+
827+diff --git a/libseahorse/seahorse-pgp-operation.c b/libseahorse/seahorse-pgp-operation.c
828+index fd2a6f8..d842383 100644
829+--- a/libseahorse/seahorse-pgp-operation.c
830++++ b/libseahorse/seahorse-pgp-operation.c
831+@@ -323,6 +323,7 @@ seahorse_pgp_operation_init (SeahorsePGPOperation *pop)
832+ gpgme_error_t err;
833+ gpgme_ctx_t ctx;
834+
835++ gpgme_check_version (NULL);
836+ err = gpgme_engine_check_version (proto);
837+ g_return_if_fail (GPG_IS_OK (err));
838+
839+diff --git a/libseahorse/seahorse-widget.c b/libseahorse/seahorse-widget.c
840+index b15d53e..3fb9e5a 100644
841+--- a/libseahorse/seahorse-widget.c
842++++ b/libseahorse/seahorse-widget.c
843+@@ -200,7 +200,6 @@ object_set_property (GObject *object, guint prop_id, const GValue *value, GParam
844+ gtk_builder_connect_signals (swidget->gtkbuilder, swidget);
845+
846+ w = GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name));
847+- GTK_WIDGET_SET_FLAGS (GTK_WINDOW (w), GTK_TOPLEVEL);
848+ /*TODO: glade_xml_ensure_accel (swidget->gtkbuilder);*/
849+
850+ gtk_window_set_icon_name (GTK_WINDOW (w), "seahorse");
851+diff --git a/plugins/nautilus/seahorse-tool.c b/plugins/nautilus/seahorse-tool.c
852+index 87968ff..ea727d8 100644
853+--- a/plugins/nautilus/seahorse-tool.c
854++++ b/plugins/nautilus/seahorse-tool.c
855+@@ -170,6 +170,9 @@ prompt_recipients (gpgme_key_t *signkey)
856+ recips = cryptui_prompt_recipients (keyset, _("Choose Recipients"), &signer);
857+
858+ if (recips) {
859++ gpgme_check_version (NULL);
860++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
861++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
862+
863+ gerr = gpgme_new (&ctx);
864+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
865+@@ -328,6 +331,10 @@ prompt_signer ()
866+ id = cryptui_keyset_key_raw_keyid (keyset, signer);
867+ g_free (signer);
868+
869++ gpgme_check_version (NULL);
870++ gerr = gpgme_engine_check_version (GPGME_PROTOCOL_OpenPGP);
871++ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
872++
873+ gerr = gpgme_new (&ctx);
874+ g_return_val_if_fail (GPG_IS_OK (gerr), NULL);
875+
876+--
877+cgit v0.8.3.1
878
879=== modified file 'debian/patches/series'
880--- debian/patches/series 2010-04-08 00:47:42 +0000
881+++ debian/patches/series 2011-01-15 23:03:57 +0000
882@@ -1,5 +1,5 @@
883+01_nomenu.patch
884 01_ubuntu_keyserver.patch
885 02_copy_gpg_conf_skeleton.patch
886 03_dont_crash_on_exit.patch
887-06_gpgme_check_version.patch
888-
889+10_gpgme_crash.patch
890
891=== modified file 'debian/rules'
892--- debian/rules 2009-10-20 11:58:09 +0000
893+++ debian/rules 2011-01-15 23:03:57 +0000
894@@ -2,7 +2,6 @@
895
896 include /usr/share/cdbs/1/rules/debhelper.mk
897 include /usr/share/cdbs/1/class/gnome.mk
898-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
899 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
900 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
901
902
903=== added directory 'debian/source'
904=== added file 'debian/source/format'
905--- debian/source/format 1970-01-01 00:00:00 +0000
906+++ debian/source/format 2011-01-15 23:03:57 +0000
907@@ -0,0 +1,1 @@
908+3.0 (quilt)
909
910=== modified file 'debian/watch'
911--- debian/watch 2009-02-15 19:14:28 +0000
912+++ debian/watch 2011-01-15 23:03:57 +0000
913@@ -1,2 +1,3 @@
914 version=2
915-http://ftp.gnome.org/pub/gnome/sources/seahorse-plugins/([\d\.]+)/seahorse-plugins-([\d\.]+)\.tar\.gz
916+http://ftp.gnome.org/pub/gnome/sources/seahorse-plugins/([\d\.]+)[02468]/ \
917+seahorse-plugins-([\d\.]+)\.tar\.gz

Subscribers

People subscribed via source and target branches

to all changes: