Merge lp:~noskcaj/seahorse/merge into lp:~ubuntu-desktop/seahorse/ubuntu

[Jackson Doak]

Merge from debian

[Robert Ancell (robert-ancell)]

Looks great, thanks Jackson!

review: Approve

[Robert Ancell (robert-ancell)]

Sorry, this was meant on the gnome-themes-standard review, reviewing this now...

[Robert Ancell (robert-ancell)]

This looks great too :)

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-08 16:29:07 +0000
+++ debian/changelog	2014-06-13 21:47:22 +0000
@@ -1,3 +1,45 @@
+seahorse (3.12.2-1ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/use-stable-libsecret.patch:
+      + Use the stable libsecret.
+    - debian/patches/use_valid_help_url:
+      + Let help buttons point to valid documentation references.
+    - debian/control: Update Vcs-* field.
+
+ -- Jackson Doak <[e-mail]>  Sat, 14 Jun 2014 07:32:29 +1000
+
+seahorse (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 16 May 2014 19:53:51 +0200
+
+seahorse (3.12.0-1) unstable; urgency=low
+
+  [ Jeremy Bicha ]
+  * debian/control.in:
+    - Update homepage
+    - Drop obsolete build-depends on gnome-doc-utils and libgnome-keyring
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - bump libgck-1-dev to (>= 3.11.91)
+    - bump libgcr-3-dev to (>= 3.11.91)
+    - bump libsecret-1-dev to (>= 0.16)
+    - bump libsoup2.4-dev to (>= 2.33.92)
+    - add valac (>= 0.22)
+  * debian/rules: set DEB_LDFLAGS_MAINT_APPEND instead of LDFLAGS
+  * Bump Standards-Version to 3.9.5
+  * Drop debian/patches/30_preferences_menu.patch
+    - doesn't apply and likely of negliable use these days anyway.
+  * Add debian/patches/fix-desktop-path.patch
+    - work around broken desktop file generation while trying to figure
+      out the real cause/solution.
+
+ -- Andreas Henriksson <[e-mail]>  Mon, 24 Mar 2014 20:34:51 +0100
+
 seahorse (3.10.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream version, fix pgp/ssh key export and SSH key generation
@@ -1323,4 +1365,3 @@
   * Initial Release.
 
  -- Anthony Mulcahy <[e-mail]>  Mon, 10 Jan 2000 22:17:00 +0900
-

=== modified file 'debian/control'
--- debian/control	2013-12-16 04:57:30 +0000
+++ debian/control	2014-06-13 21:47:22 +0000
@@ -2,42 +2,43 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: seahorse
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>
+Uploaders: Andreas Henriksson <[e-mail]>, Jordi Mallach <[e-mail]>, Michael Biebl <[e-mail]>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
-               valac (>= 0.18.0),               
-               libgpgme11-dev (>= 1.0.0),
-               libgck-1-dev (>= 3.3.4),
-               libgcr-3-dev (>= 3.9.1),
+               gnome-pkg-tools,
+               gtk-doc-tools (>= 1.9),
                intltool (>= 0.35),
-               libsoup2.4-dev (>= 2.33.92),
-               libldap2-dev,
+               libavahi-client-dev (>= 0.6),
                libavahi-glib-dev (>= 0.6),
-               libavahi-client-dev (>= 0.6),
-               gtk-doc-tools (>= 1.9),
+               libgck-1-dev (>= 3.11.91),
+               libgcr-3-dev (>= 3.11.91),
                libglib2.0-dev (>= 2.10.0),
+               libgpgme11-dev (>= 1.0.0),
                libgtk-3-dev (>= 3.4.0),
+               libldap2-dev,
                libsecret-1-dev (>= 0.16),
-               gnome-pkg-tools,
+               libsoup2.4-dev (>= 2.33.92),
                openssh-client,
+               valac (>= 0.22),
                yelp-tools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu
-Homepage: http://live.gnome.org/Seahorse
+Homepage: https://wiki.gnome.org/Seahorse
 
 Package: seahorse
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gcr (>= 3.9.1),
-         gnupg (>= 1.4.7),
-         gnome-keyring (>= 3.4)
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         gcr (>= 3.4),
+         gnome-keyring (>= 3.4),
+         gnupg (>= 1.4.7)
 Recommends: openssh-client
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -

=== modified file 'debian/control.in'
--- debian/control.in	2013-12-16 04:57:30 +0000
+++ debian/control.in	2014-06-13 21:47:22 +0000
@@ -7,33 +7,33 @@
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),
                dh-autoreconf,
-               valac (>= 0.18.0),               
-               libgpgme11-dev (>= 1.0.0),
-               libgck-1-dev (>= 3.3.4),
-               libgcr-3-dev (>= 3.9.1),
+               gnome-pkg-tools,
+               gtk-doc-tools (>= 1.9),
                intltool (>= 0.35),
-               libsoup2.4-dev (>= 2.33.92),
-               libldap2-dev,
+               libavahi-client-dev (>= 0.6),
                libavahi-glib-dev (>= 0.6),
-               libavahi-client-dev (>= 0.6),
-               gtk-doc-tools (>= 1.9),
+               libgck-1-dev (>= 3.11.91),
+               libgcr-3-dev (>= 3.11.91),
                libglib2.0-dev (>= 2.10.0),
+               libgpgme11-dev (>= 1.0.0),
                libgtk-3-dev (>= 3.4.0),
+               libldap2-dev,
                libsecret-1-dev (>= 0.16),
-               gnome-pkg-tools,
+               libsoup2.4-dev (>= 2.33.92),
                openssh-client,
+               valac (>= 0.22),
                yelp-tools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/seahorse/ubuntu
-Homepage: http://live.gnome.org/Seahorse
+Homepage: https://wiki.gnome.org/Seahorse
 
 Package: seahorse
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         gcr (>= 3.9.1),
-         gnupg (>= 1.4.7),
-         gnome-keyring (>= 3.4)
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         gcr (>= 3.4),
+         gnome-keyring (>= 3.4),
+         gnupg (>= 1.4.7)
 Recommends: openssh-client
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -

=== removed file 'debian/patches/30_preferences_menu.patch'
--- debian/patches/30_preferences_menu.patch	2013-12-16 04:57:30 +0000
+++ debian/patches/30_preferences_menu.patch	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: seahorse-3.8.2/src/seahorse.desktop.in.in
-===================================================================
---- seahorse-3.8.2.orig/src/seahorse.desktop.in.in	2013-05-21 13:27:58.782407458 +0200
-+++ seahorse-3.8.2/src/seahorse.desktop.in.in	2013-05-21 13:27:58.778407458 +0200
-@@ -6,7 +6,7 @@
- Terminal=false
- Type=Application
- Icon=seahorse
--Categories=GNOME;GTK;Security;Utility;DesktopSettings;X-XFCE-SettingsDialog;
-+Categories=GNOME;GTK;Security;Settings;DesktopSettings;X-XFCE-SettingsDialog;
- StartupNotify=true
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=seahorse

=== added file 'debian/patches/fix-desktop-path.patch'
--- debian/patches/fix-desktop-path.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-desktop-path.patch	2014-06-13 21:47:22 +0000
@@ -0,0 +1,21 @@
+From: Andreas Henriksson <[e-mail]>
+Subject: hack around broken variable expansion
+
+The final desktop file ended up with Exec=${exec_prefix}/bin/seahorse
+and I could not figure out why the variable expansion didn't
+expand fully.
+
+Added this patch until we figure it out to avoid generating
+broken desktop files....
+
+--- a/src/seahorse.desktop.in.in
++++ b/src/seahorse.desktop.in.in
+@@ -2,7 +2,7 @@
+ _Name=Passwords and Keys
+ _Comment=Manage your passwords and encryption keys
+ _Keywords=keyring;encryption;security;sign;ssh;
+-Exec=@bindir@/seahorse
++Exec=/usr/bin/seahorse
+ Terminal=false
+ Type=Application
+ Icon=seahorse

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-15 01:04:29 +0000
+++ debian/patches/series	2014-06-13 21:47:22 +0000
@@ -1,3 +1,3 @@
-30_preferences_menu.patch
+fix-desktop-path.patch
 use-stable-libsecret.patch
 use_valid_help_url.patch

=== modified file 'debian/rules'
--- debian/rules	2013-12-15 01:04:29 +0000
+++ debian/rules	2014-06-13 21:47:22 +0000
@@ -7,7 +7,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-LDFLAGS += -Wl,-O1 -Wl,--as-needed
+DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
                              --enable-pgp