Merge lp:~bcurtiswx/ubuntu/oneiric/seahorse/3.0.0-1ubuntu1 into lp:~ubuntu-desktop/seahorse/ubuntu

[Brian Curtis]

seahorse (3.0.0-1ubuntu1) oneiric; urgency=low

  * Rebase on Debian unstable, remaining Ubuntu Changes:
  * debian/control.in:
    - Added Vcs-Bzr link
    - Updated dep to liblaunchpad-integration-3.0-dev
  * debian/rules:
    - Run autotools
    - Added a shlibs rule for libcryptui0a (>=3.0.0)
  * debian/seahorse.preinst:
    - Remove daemon autostart .desktop file on upgrade
  * debian/patches/01_lpi.patch
    - Launchpad Integration
  * debian/patches/11_ubuntu-keyserver.patch
    - Make ubuntu keyserver the default

 -- Brian Curtis <email address hidden> Wed, 18 May 2011 13:40:24 -0400

[Brian Curtis (bcurtiswx)]

hmm, should be stable not unstable i believe

[lp:~bcurtiswx/ubuntu/oneiric/seahorse/3.0.0-1ubuntu1]

38. By Brian Curtis on 2011-05-24

* Rebase on Debian stable, remaining Ubuntu changes:
* debian/control.in:
  - Bump libglib2.0-dev version
  - Make libcryptui-dev replace seahorse
  - Build-depend on liblaunchpadintegration-dev
  - Added Vcs-Bzr link
* debian/rules:
  - Add a shlibs rule for libcryptui0 (>= 2.25.4)
  - Run autotools on build
* debian/seahorse.preinst:
  - Remove daemon autostart .desktop file on upgrade.
* debian/patches/01_lpi.patch:
  - Launchpad integration
* debian/patches/11_ubuntu-keyserver.patch:
  - Make ubuntu keyserver the default
* debian/patches/90_autotools.patch:
  - Obsolete, now done in debian/rules
* debian/watch:
  - Watch for unstable versions

39. By Brian Curtis on 2011-05-24

changelog typo

40. By Brian Curtis on 2011-05-24

VCZ BZR from gnome3-team to ubuntu-desktop

=== modified file 'debian/NEWS'
--- debian/NEWS	2009-10-19 03:16:33 +0000
+++ debian/NEWS	2011-05-24 17:43:31 +0000
@@ -1,8 +1,8 @@
 seahorse (0.9.0-1) unstable; urgency=low
 
-  * From version 0.9.0 seahorse-agent has been renamed to seahorse-daemon.
-    For now, a convenient wrapper is provided, so old installations won't
-    break, but you should change your gnome-session settings, as this
-    wrapper will be dropped anytime.
+  From version 0.9.0 seahorse-agent has been renamed to seahorse-daemon.
+  For now, a convenient wrapper is provided, so old installations won't
+  break, but you should change your gnome-session settings, as this
+  wrapper will be dropped anytime.
 
  -- Jose Carlos Garcia Sogo <[e-mail]>  Tue, 21 March 2006 00:00:00 +0100

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-31 13:49:02 +0000
+++ debian/changelog	2011-05-24 17:43:31 +0000
@@ -1,3 +1,42 @@
+seahorse (3.0.0-1ubuntu1) oneiric; urgency=low
+
+  * Rebase on Debian stable, remaining Ubuntu Changes:
+  * debian/control.in:
+    - Added Vcs-Bzr link
+    - Updated dep to liblaunchpad-integration-3.0-dev
+  * debian/rules:
+    - Run autotools
+    - Added a shlibs rule for libcryptui0a (>=3.0.0)
+  * debian/seahorse.preinst:
+    - Remove daemon autostart .desktop file on upgrade
+  * debian/patches/01_lpi.patch
+    - Launchpad Integration
+  * debian/patches/11_ubuntu-keyserver.patch
+    - Make ubuntu keyserver the default
+
+ -- Brian Curtis <[e-mail]>  Wed, 18 May 2011 13:40:24 -0400
+
+seahorse (3.0.0-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Build with GTK+3 and require 3.0 versions of libgnome-keyring-dev and
+    libgcr-dev.
+  * Rename libcryptui0 to libcryptui0a, as it now links to GTK+3 but
+    didn't get a soname bump upstream.
+  * Refresh patches.
+  * Build-Depend on dh-autoreconf, and use it to replace 90_autotools.patch.
+  * Enable gobject-introspection support for libcryptui.
+  * Disable libnotify support temporarily, to avoid entangling the
+    gnome-keyring transition with libnotify's.
+  * Bump Standards-Version to 3.9.2 (no changes required).
+  * Add Vcs-* and Homepage fields.
+  * Add copyright notes for libcryptui, which is LGPL, and point to the
+    non-symlinked version of GPL-2.
+  * Adapt the format of debian/NEWS to something lintian wouldn't ever
+    bark about.
+
+ -- Jordi Mallach <[e-mail]>  Thu, 14 Apr 2011 23:26:01 +0200
+
 seahorse (2.32.0-0ubuntu3) natty; urgency=low
 
   * debian/patches/91_credentialview_use_cpu.patch: git commit, don't eat cpu

=== modified file 'debian/control'
--- debian/control	2010-05-31 12:39:52 +0000
+++ debian/control	2011-05-24 17:43:31 +0000
@@ -6,33 +6,37 @@
 Source: seahorse
 Section: gnome
 Priority: optional
+Uploaders: Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Jordi Mallach <[e-mail]>, Josselin Mouette <[e-mail]>, Sebastian Dröge <[e-mail]>
 Maintainer: Ubuntu Core Developers <[e-mail]>
 XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Sebastian Dröge <[e-mail]>
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
                scrollkeeper,
                libgpgme11-dev (>= 1.0.0),
                libgp11-dev (>= 2.29.4),
-               libgcr-dev (>= 2.25.5),
+               libgcr-3-dev (>= 3.0.0),
                intltool (>= 0.35),
                libsoup2.4-dev,
                libldap2-dev,
-               libnotify-dev,
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
-               libdbus-glib-1-dev,
+               libdbus-glib-1-dev (>= 0.35),
                gnome-doc-utils,
                gtk-doc-tools (>= 1.9),
-               libgnome-keyring-dev (>= 2.25.5),
-               libglib2.0-dev (>= 2.16.0),
-               libgtk2.0-dev (>= 2.18.0),
+               libgnome-keyring-dev (>= 3.0.0),
+               libglib2.0-dev (>= 2.10.0),
+               libgtk-3-dev (>= 2.90.0),
+#               libnotify-dev (>= 0.7),
                libgconf2-dev,
+               gobject-introspection (>= 0.6.4),
+               libgirepository1.0-dev (>= 0.6.4),
+               gir1.2-gtk-3.0,
                gnome-pkg-tools,
-               liblaunchpad-integration-dev (>= 0.1.17)
+               liblaunchpad-integration-3.0-dev
 Build-Conflicts: gnupg2
-Standards-Version: 3.8.4
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu
+Standards-Version: 3.9.2
+Vcs-Bzr: https://code.launchpad.net/~gnome3-team/seahorse/ubuntu
 
 Package: seahorse
 Architecture: any
@@ -45,39 +49,59 @@
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
  that integrates to the GNOME desktop. It is a tool for secure
  communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key  Management
+ creation can easily be performed through a GUI and Key Management
  operations can easily be carried out through an intuitive interface.
 
-Package: libcryptui0
+Package: libcryptui0a
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Section: libs
 Replaces: seahorse (<< 2.23.6-0ubuntu2)
+Conflicts: libcryptui0
 Description: the UI library for DBUS functions exported by seahorse
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
  that integrates to the GNOME desktop. It is a tool for secure
  communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key  Management
+ creation can easily be performed through a GUI and Key Management
  operations can easily be carried out through an intuitive interface.
  .
  This package contains the shared library.
 
 Package: libcryptui-dev
 Architecture: any
+Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libglib2.0-dev (>= 2.16.0),
-         libgtk2.0-dev (>= 2.18.0),
+         libglib2.0-dev (>= 2.10.0),
+         libgtk-3-dev (>= 2.90.0),
          libgconf2-dev,
-         libcryptui0 (= ${binary:Version})
-Section: libdevel
+         libcryptui0a (= ${binary:Version}),
+         gir1.2-cryptui-0.0 (= ${binary:Version})
 Replaces: seahorse (<< 2.25.90-0ubuntu2)
 Description: the UI library for DBUS functions exported by seahorse (development)
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
  that integrates to the GNOME desktop. It is a tool for secure
  communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key  Management
- operations can easily be carried out through an intuitive interface.
- .
- This package contains the development files for the library
+ creation can easily be performed through a GUI and Key Management
+ operations can easily be carried out through an intuitive interface.
+ .
+ This package contains the development files for the library.
+
+Package: gir1.2-cryptui-0.0
+Architecture: any
+Section: libs
+Depends: ${gir:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the Seahorse CryptUI library
+ Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
+ that integrates to the GNOME desktop. It is a tool for secure
+ communications and data storage.  Data encryption and digital signature
+ creation can easily be performed through a GUI and Key Management
+ operations can easily be carried out through an intuitive interface.
+ .
+ This package contains introspection data for the Seahorse CryptUI
+ library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.

=== modified file 'debian/control.in'
--- debian/control.in	2010-05-31 12:39:52 +0000
+++ debian/control.in	2011-05-24 17:43:31 +0000
@@ -6,27 +6,31 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                cdbs (>= 0.4.41),
+               dh-autoreconf,
                scrollkeeper,
                libgpgme11-dev (>= 1.0.0),
                libgp11-dev (>= 2.29.4),
-               libgcr-dev (>= 2.25.5),
+               libgcr-3-dev (>= 3.0.0),
                intltool (>= 0.35),
                libsoup2.4-dev,
                libldap2-dev,
-               libnotify-dev,
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
-               libdbus-glib-1-dev,
+               libdbus-glib-1-dev (>= 0.35),
                gnome-doc-utils,
                gtk-doc-tools (>= 1.9),
-               libgnome-keyring-dev (>= 2.25.5),
-               libglib2.0-dev (>= 2.16.0),
-               libgtk2.0-dev (>= 2.18.0),
+               libgnome-keyring-dev (>= 3.0.0),
+               libglib2.0-dev (>= 2.10.0),
+               libgtk-3-dev (>= 2.90.0),
+#               libnotify-dev (>= 0.7),
                libgconf2-dev,
+               gobject-introspection (>= 0.6.4),
+               libgirepository1.0-dev (>= 0.6.4),
+               gir1.2-gtk-3.0,
                gnome-pkg-tools,
-               liblaunchpad-integration-dev (>= 0.1.17)
+               liblaunchpad-integration-3.0-dev
 Build-Conflicts: gnupg2
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu
 
 Package: seahorse
@@ -40,39 +44,59 @@
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
  that integrates to the GNOME desktop. It is a tool for secure
  communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key  Management
+ creation can easily be performed through a GUI and Key Management
  operations can easily be carried out through an intuitive interface.
 
-Package: libcryptui0
+Package: libcryptui0a
 Architecture: any
+Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Section: libs
 Replaces: seahorse (<< 2.23.6-0ubuntu2)
+Conflicts: libcryptui0
 Description: the UI library for DBUS functions exported by seahorse
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
  that integrates to the GNOME desktop. It is a tool for secure
  communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key  Management
+ creation can easily be performed through a GUI and Key Management
  operations can easily be carried out through an intuitive interface.
  .
  This package contains the shared library.
 
 Package: libcryptui-dev
 Architecture: any
+Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libglib2.0-dev (>= 2.16.0),
-         libgtk2.0-dev (>= 2.18.0),
+         libglib2.0-dev (>= 2.10.0),
+         libgtk-3-dev (>= 2.90.0),
          libgconf2-dev,
-         libcryptui0 (= ${binary:Version})
-Section: libdevel
+         libcryptui0a (= ${binary:Version}),
+         gir1.2-cryptui-0.0 (= ${binary:Version})
 Replaces: seahorse (<< 2.25.90-0ubuntu2)
 Description: the UI library for DBUS functions exported by seahorse (development)
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
  that integrates to the GNOME desktop. It is a tool for secure
  communications and data storage.  Data encryption and digital signature
- creation can easily be performed through a GUI and Key  Management
- operations can easily be carried out through an intuitive interface.
- .
- This package contains the development files for the library
+ creation can easily be performed through a GUI and Key Management
+ operations can easily be carried out through an intuitive interface.
+ .
+ This package contains the development files for the library.
+
+Package: gir1.2-cryptui-0.0
+Architecture: any
+Section: libs
+Depends: ${gir:Depends},
+         ${misc:Depends}
+Description: GObject introspection data for the Seahorse CryptUI library
+ Seahorse is a front end for GnuPG - the GNU Privacy Guard program -
+ that integrates to the GNOME desktop. It is a tool for secure
+ communications and data storage.  Data encryption and digital signature
+ creation can easily be performed through a GUI and Key Management
+ operations can easily be carried out through an intuitive interface.
+ .
+ This package contains introspection data for the Seahorse CryptUI
+ library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.

=== modified file 'debian/copyright'
--- debian/copyright	2009-10-19 03:16:33 +0000
+++ debian/copyright	2011-05-24 17:43:31 +0000
@@ -9,7 +9,7 @@
 Copyright (C) 2002, 2003 Jacob Perkins
 Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber
 
-Main License (everything except docs):
+Main License (everything except docs and libcryptui):
 
     This package is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,9 +26,29 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-Documentation and help files are covered by GFDL license.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+The libcryptui code is covered by LGPL-2.1:
+
+   This program is free software; you can redistribute it and/or modify 
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+    
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+    
+   You should have received a copy of the GNU Lesser General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Documentation and help files are covered by GFDL 1.1 license.
 
 GFDL License:
 

=== added file 'debian/gir1.2-cryptui-0.0.install'
--- debian/gir1.2-cryptui-0.0.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.2-cryptui-0.0.install	2011-05-24 17:43:31 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/girepository-1.0/CryptUI-0.0.typelib

=== modified file 'debian/libcryptui-dev.install'
--- debian/libcryptui-dev.install	2010-05-31 12:39:52 +0000
+++ debian/libcryptui-dev.install	2011-05-24 17:43:31 +0000
@@ -2,3 +2,4 @@
 debian/tmp/usr/lib/*.so
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/share/gtk-doc
+debian/tmp/usr/share/gir-1.0/CryptUI-0.0.gir

=== removed file 'debian/libcryptui0.install'
--- debian/libcryptui0.install	2009-10-19 03:16:33 +0000
+++ debian/libcryptui0.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/tmp/usr/lib/libcryptui.so.*

=== added file 'debian/libcryptui0a.install'
--- debian/libcryptui0a.install	1970-01-01 00:00:00 +0000
+++ debian/libcryptui0a.install	2011-05-24 17:43:31 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/libcryptui.so.*

=== modified file 'debian/patches/01_autostart_path.patch'
--- debian/patches/01_autostart_path.patch	2010-05-31 12:39:52 +0000
+++ debian/patches/01_autostart_path.patch	2011-05-24 17:43:31 +0000
@@ -1,8 +1,8 @@
-Index: seahorse-2.26.1/daemon/Makefile.am
+Index: seahorse-3.0.0/daemon/Makefile.am
 ===================================================================
---- seahorse-2.26.1.orig/daemon/Makefile.am	2009-05-20 18:44:11.026450272 +0200
-+++ seahorse-2.26.1/daemon/Makefile.am	2009-05-20 18:44:48.634700182 +0200
-@@ -14,7 +14,7 @@ INCLUDES = -I$(top_builddir) \
+--- seahorse-3.0.0.orig/daemon/Makefile.am	2011-04-14 17:33:57.639294959 +0200
++++ seahorse-3.0.0/daemon/Makefile.am	2011-04-14 17:34:00.955294958 +0200
+@@ -12,7 +12,7 @@
  	-DLOCALEDIR=\""$(localedir)"\" \
  	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
  	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \

=== modified file 'debian/patches/01_lpi.patch'
--- debian/patches/01_lpi.patch	2010-04-29 00:05:45 +0000
+++ debian/patches/01_lpi.patch	2011-05-24 17:43:31 +0000
@@ -1,20 +1,20 @@
-Index: seahorse-2.30.1/configure.in
+Index: seahorse-2.91.2/configure.in
 ===================================================================
---- seahorse-2.30.1.orig/configure.in	2010-04-27 11:16:23.000000000 +1000
-+++ seahorse-2.30.1/configure.in	2010-04-29 09:57:13.422808183 +1000
-@@ -50,7 +50,7 @@
- AC_SUBST([GTK_CFLAGS])
-  
-   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0)
-+PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gconf-2.0 gthread-2.0 gtk+-2.0 >= 2.10.0 launchpad-integration)
+--- seahorse-2.91.2.orig/configure.in	2010-10-21 11:42:41.000000000 +1100
++++ seahorse-2.91.2/configure.in	2011-01-06 11:12:28.642069798 +1100
+@@ -75,7 +75,7 @@
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
  
+-PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gconf-2.0 gthread-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
++PKG_CHECK_MODULES(SEAHORSE, gmodule-2.0 gio-2.0 gconf-2.0 gthread-2.0 gtk+-$GTK_API_VERSION >= $GTK_REQUIRED launchpad-integration-3.0)
  
  AC_MSG_CHECKING([for some Win32 platform])
-Index: seahorse-2.30.1/src/seahorse-key-manager.ui
+ case "$host" in
+Index: seahorse-2.91.2/src/seahorse-key-manager.ui
 ===================================================================
---- seahorse-2.30.1.orig/src/seahorse-key-manager.ui	2010-04-27 11:16:23.000000000 +1000
-+++ seahorse-2.30.1/src/seahorse-key-manager.ui	2010-04-29 09:57:13.422808183 +1000
+--- seahorse-2.91.2.orig/src/seahorse-key-manager.ui	2009-04-18 13:22:13.000000000 +1000
++++ seahorse-2.91.2/src/seahorse-key-manager.ui	2011-01-06 11:12:07.526070993 +1100
 @@ -29,6 +29,7 @@
  		</menu>
  		<menu name="Help" action="help-menu">
@@ -23,10 +23,10 @@
  			<menuitem action="app-about"/>
  		</menu> 
  
-Index: seahorse-2.30.1/src/seahorse-viewer.c
+Index: seahorse-2.91.2/src/seahorse-viewer.c
 ===================================================================
---- seahorse-2.30.1.orig/src/seahorse-viewer.c	2010-04-27 11:16:23.000000000 +1000
-+++ seahorse-2.30.1/src/seahorse-viewer.c	2010-04-29 09:57:13.422808183 +1000
+--- seahorse-2.91.2.orig/src/seahorse-viewer.c	2010-10-07 07:15:51.000000000 +1100
++++ seahorse-2.91.2/src/seahorse-viewer.c	2011-01-06 11:12:07.526070993 +1100
 @@ -34,6 +34,7 @@
  
  #include <glib/gi18n-lib.h>
@@ -35,7 +35,7 @@
  
  enum {
  	PROP_0,
-@@ -701,6 +702,9 @@
+@@ -675,6 +676,9 @@
  			gtk_window_add_accel_group (GTK_WINDOW (win), 
  			                            gtk_ui_manager_get_accel_group (pv->ui_manager));
  

=== modified file 'debian/patches/08_force_ssh.patch'
--- debian/patches/08_force_ssh.patch	2010-04-29 00:05:45 +0000
+++ debian/patches/08_force_ssh.patch	2011-05-24 17:43:31 +0000
@@ -1,8 +1,8 @@
-Index: seahorse-2.30.1/configure.in
+Index: seahorse-3.0.0/configure.in
 ===================================================================
---- seahorse-2.30.1.orig/configure.in	2010-04-29 09:57:13.422808183 +1000
-+++ seahorse-2.30.1/configure.in	2010-04-29 09:57:17.252808788 +1000
-@@ -463,16 +463,16 @@
+--- seahorse-3.0.0.orig/configure.in	2011-04-14 17:33:56.859294959 +0200
++++ seahorse-3.0.0/configure.in	2011-04-14 17:34:06.623294976 +0200
+@@ -494,16 +494,16 @@
      echo "disabling ssh support"
  else
  

=== modified file 'debian/patches/99_ltmain_as-needed.patch'
--- debian/patches/99_ltmain_as-needed.patch	2010-04-29 00:05:45 +0000
+++ debian/patches/99_ltmain_as-needed.patch	2011-05-24 17:43:31 +0000
@@ -1,7 +1,7 @@
-Index: seahorse-2.30.1/ltmain.sh
+Index: seahorse-2.26.2/ltmain.sh
 ===================================================================
---- seahorse-2.30.1.orig/ltmain.sh	2010-04-29 09:57:37.605306450 +1000
-+++ seahorse-2.30.1/ltmain.sh	2010-04-29 09:57:48.842813940 +1000
+--- seahorse-2.26.2.orig/ltmain.sh	2009-08-24 21:41:38.000000000 +0200
++++ seahorse-2.26.2/ltmain.sh	2009-08-24 21:41:41.000000000 +0200
 @@ -4716,6 +4716,11 @@
  	arg=$func_stripname_result
  	;;

=== modified file 'debian/rules'
--- debian/rules	2010-05-31 12:39:52 +0000
+++ debian/rules	2011-05-24 17:43:31 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
@@ -14,9 +15,11 @@
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libcryptui0 += -V 'libcryptui0 (>= 2.27.5)'
+DEB_DH_MAKESHLIBS_ARGS_libcryptui0a += -V 'libcryptui0a (>= 3.0.0)'
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mime-database \
 			     --disable-schemas-install \
 			     --disable-scrollkeeper \
-			     --enable-pgp
+			     --disable-libnotify \
+			     --enable-pgp \
+			     --with-gtk=3.0

=== modified file 'debian/watch'
--- debian/watch	2010-05-31 12:39:52 +0000
+++ debian/watch	2011-05-24 17:43:31 +0000
@@ -1,2 +1,2 @@
 version=2
-http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+)\d/seahorse-([\d\.]+)\.tar\.gz
+http://ftp.gnome.org/pub/gnome/sources/seahorse/([\d\.]+)[02468]/seahorse-([\d\.]+)\.tar\.gz