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

[Jackson Doak]

merge from debian, adding a build-dep in gnupg2 that is needed to build.

[Robert Ancell (robert-ancell)]

Thanks Jackson!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-31 20:39:47 +0000
+++ debian/changelog	2015-10-27 20:47:18 +0000
@@ -1,3 +1,35 @@
+seahorse (3.18.0-2ubuntu1) xenial; urgency=low
+
+  * Merge from debian. 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.
+  * Add build-depend on gnupg2 to allow building
+
+ -- Jackson Doak <[e-mail]>  Wed, 28 Oct 2015 07:11:48 +1100
+
+seahorse (3.18.0-2) unstable; urgency=medium
+
+  * Depend on gnupg2 instead of gnupg
+    - since we need >= 2.0.12 (see previous upload).
+
+ -- Andreas Henriksson <[e-mail]>  Sat, 03 Oct 2015 11:39:57 +0200
+
+seahorse (3.18.0-1) unstable; urgency=medium
+
+  [ Michael Biebl ]
+  * Remove Debian menu entry.
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Updates according to configure.ac changes:
+    - bump dependency on gnupg to >= 2.0.12
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 02 Oct 2015 23:44:57 +0200
+
 seahorse (3.16.0-1ubuntu1) wily; urgency=medium
 
   * Merge from debian. Remaining changes:
@@ -1072,7 +1104,6 @@
     for seahorse-daemon.
 
  -- Jose Carlos Garcia Sogo <[e-mail]>  Sat, 25 Mar 2006 14:09:59 +0100
- 
 
 seahorse (0.8.0-1) unstable; urgency=low
 
@@ -1338,7 +1369,7 @@
   * I forgot to change Mantainer field in debian/control file. Sorry
 
  -- Jose Carlos Garcia Sogo <[e-mail]>  Fri,  8 Feb 2002 15:42:21 +0100
- 
+
 seahorse (0.5.0-3) unstable; urgency=low
 
   * I have adopted this package. (Closes: #132441)
@@ -1441,3 +1472,4 @@
   * Initial Release.
 
  -- Anthony Mulcahy <[e-mail]>  Mon, 10 Jan 2000 22:17:00 +0900
+

=== modified file 'debian/control'
--- debian/control	2015-05-31 20:39:47 +0000
+++ debian/control	2015-10-27 20:47:18 +0000
@@ -12,6 +12,7 @@
                debhelper (>= 9),
                dh-autoreconf,
                gnome-pkg-tools,
+               gnupg2,
                gtk-doc-tools (>= 1.9),
                intltool (>= 0.35),
                libavahi-client-dev (>= 0.6),
@@ -37,7 +38,7 @@
          ${shlibs:Depends},
          gcr (>= 3.4),
          gnome-keyring (>= 3.4),
-         gnupg (>= 1.4.7)
+         gnupg2 (>= 2.0.12)
 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	2015-05-31 20:39:47 +0000
+++ debian/control.in	2015-10-27 20:47:18 +0000
@@ -8,6 +8,7 @@
                debhelper (>= 9),
                dh-autoreconf,
                gnome-pkg-tools,
+               gnupg2,
                gtk-doc-tools (>= 1.9),
                intltool (>= 0.35),
                libavahi-client-dev (>= 0.6),
@@ -33,7 +34,7 @@
          ${shlibs:Depends},
          gcr (>= 3.4),
          gnome-keyring (>= 3.4),
-         gnupg (>= 1.4.7)
+         gnupg2 (>= 2.0.12)
 Recommends: openssh-client
 Description: GNOME front end for GnuPG
  Seahorse is a front end for GnuPG - the GNU Privacy Guard program -

=== removed file 'debian/menu'
--- debian/menu	2012-09-18 17:09:25 +0000
+++ debian/menu	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-?package(seahorse):needs="X11" \
-  section="Applications/System/Security" \
-  hints="Gnome" \
-  title="Seahorse" \
-  longtitle="GNOME frontend for managing GnuPG and SSH keys" \
-  command="/usr/bin/seahorse" \
-  icon="/usr/share/pixmaps/seahorse.xpm"

=== removed file 'debian/seahorse.install'
--- debian/seahorse.install	2012-09-18 17:09:25 +0000
+++ debian/seahorse.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/seahorse.xpm /usr/share/pixmaps

=== removed file 'debian/seahorse.xpm'
--- debian/seahorse.xpm	2009-10-19 03:16:33 +0000
+++ debian/seahorse.xpm	1970-01-01 00:00:00 +0000
@@ -1,222 +0,0 @@
-/* XPM */
-static char *seahorse[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 184 2",
-"   c black",
-".  c #3D3D3D",
-"X  c #2C344E",
-"o  c #743700",
-"O  c #5B4900",
-"+  c #614713",
-"@  c #6F581D",
-"#  c #756324",
-"$  c #7A6625",
-"%  c #796B26",
-"&  c #7E6A2B",
-"*  c #7D702E",
-"=  c #7F7035",
-"-  c #4C4C4C",
-";  c #555555",
-":  c #55565C",
-">  c #5C5C5C",
-",  c #626054",
-"<  c #716744",
-"1  c #776D43",
-"2  c #746B49",
-"3  c #7B6F43",
-"4  c #636363",
-"5  c #6B6B6B",
-"6  c #7B7667",
-"7  c #737272",
-"8  c #797876",
-"9  c #7B7B7B",
-"0  c #8E6500",
-"q  c #8A711D",
-"w  c #906300",
-"e  c #926A00",
-"r  c #9A7500",
-"t  c #9A7C00",
-"y  c #9E7E09",
-"u  c #977E1E",
-"i  c #856C2E",
-"p  c #826B30",
-"a  c #8B6B39",
-"s  c #8B762E",
-"d  c #8D7A2A",
-"f  c #847333",
-"g  c #867836",
-"h  c #887635",
-"j  c #8C7C3B",
-"k  c #937B20",
-"l  c #A27E00",
-"z  c #907F40",
-"x  c #817A60",
-"c  c #9D800D",
-"v  c #9E8216",
-"b  c #9E8219",
-"n  c #9B842D",
-"m  c #90803E",
-"M  c #9E8B3D",
-"N  c #A58304",
-"B  c #A3840D",
-"V  c #A58C07",
-"C  c #A98405",
-"Z  c #A98509",
-"A  c #AC8B0C",
-"S  c #A28513",
-"D  c #AC8C12",
-"F  c #AA8E1F",
-"G  c #AD9816",
-"H  c #B08D0D",
-"J  c #B18D10",
-"K  c #B2910F",
-"L  c #B9970D",
-"P  c #B39212",
-"I  c #B79817",
-"U  c #B7991B",
-"Y  c #BE9D14",
-"T  c #BA9B1A",
-"R  c #A78B20",
-"E  c #AA8F21",
-"W  c #B19627",
-"Q  c #BB9E22",
-"!  c #B09B3D",
-"~  c #AAAA00",
-"^  c #BFA020",
-"/  c #B9A032",
-"(  c #928341",
-")  c #91834A",
-"_  c #9E8C42",
-"`  c #9A8B4A",
-"'  c #91875A",
-"]  c #968A5B",
-"[  c #87816C",
-"{  c #868271",
-"}  c #87857A",
-"|  c #908967",
-" . c #948B6B",
-".. c #9E9571",
-"X. c #A49241",
-"o. c #A99541",
-"O. c #AD9A4D",
-"+. c #A29352",
-"@. c #A0945C",
-"#. c #A79954",
-"$. c #AB9D56",
-"%. c #A99B59",
-"&. c #B09E4E",
-"*. c #B4905E",
-"=. c #A19561",
-"-. c #A69B62",
-";. c #A0997B",
-":. c #AEA05C",
-">. c #B3A45B",
-",. c #AEA162",
-"<. c #AFA36A",
-"1. c #B3A663",
-"2. c #B6A965",
-"3. c #B7A969",
-"4. c #BBAE67",
-"5. c #BAAD6A",
-"6. c #BDB16C",
-"7. c #C09F18",
-"8. c #C3992A",
-"9. c #C5A312",
-"0. c #C3A41C",
-"q. c #C9A615",
-"w. c #CAA61D",
-"e. c #CCAA1C",
-"r. c #C3A521",
-"t. c #C6AA25",
-"y. c #C6A929",
-"u. c #CDAD23",
-"i. c #CAAD2B",
-"p. c #C6AB32",
-"a. c #C3AB3B",
-"s. c #CAAF32",
-"d. c #C8AF39",
-"f. c #CFB025",
-"g. c #CFB12B",
-"h. c #CCB133",
-"j. c #CCB33E",
-"k. c #D0B126",
-"l. c #D2B32B",
-"z. c #D4B92C",
-"x. c #D3B633",
-"c. c #D6B934",
-"v. c #D5BA3A",
-"b. c #D9BC36",
-"n. c #D9BE3A",
-"m. c #C3AB41",
-"M. c #C0AC4D",
-"N. c #CFB640",
-"B. c #C3B055",
-"V. c #D5BD45",
-"C. c #C1B66E",
-"Z. c #C4BA71",
-"A. c #C7BC7A",
-"S. c #C8BB74",
-"D. c #DBC032",
-"F. c #DBC13D",
-"G. c #E0C63F",
-"H. c #E3CA3C",
-"J. c #DDC443",
-"K. c #DDC54B",
-"L. c #E0C646",
-"P. c #E3CA43",
-"I. c #E2CA4C",
-"U. c #E4CE54",
-"Y. c #E9D242",
-"T. c #EBD44A",
-"R. c #EFD948",
-"E. c #E7D157",
-"W. c #E6D25B",
-"Q. c #E9D45C",
-"!. c #EBD760",
-"~. c #EDDA66",
-"^. c #EFDD6A",
-"/. c #F0DE6B",
-"(. c #838383",
-"). c #888783",
-"_. c #8C8C8C",
-"`. c #9C9786",
-"'. c #929292",
-"]. c #9B9B9B",
-"[. c #A59F8A",
-"{. c #A2A2A3",
-"}. c #ABA9A2",
-"|. c None",
-/* pixels */
-"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.; ; 4 4 4 4 > ; (.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.; 4 8 _.{.{.].9 4 > |.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.: 4 (.`.......[.}.].5 > |.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.X > 6 ] _ O.>.5.<.-.;.'.5 - |.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.: 2 n W p.d.h.a.B.A.-. .8 4 4 4 4 4 4 4 4 4 4 4 4 4 > > |.",
-"|.|.|.d E i.F.J.K.U.U.V.a.S.-.[ (.(.).).)._.(.(.(.(.(.(.(.9 4 : ",
-"|.|.A I i.c.u.T T V.Q.~.U.m.C.' (._._.'.'._._.'._.'._.'.'._.5 > ",
-"|.C P w.e.I S N B Q U.Q.^.K.>.@.} _._._._._._._.9 ).(.(._.).5 > ",
-"|.D Y w.Y u < = v T I.Q.~.~.d.+.{ _.(._.].].].).5 (.9 5 ).8 > : ",
-"|.P 0.e.Y b f u I c.I.E.~.^.j.M x 7 4 7 (.(.(.5 5 5 5 4 4 > - |.",
-"|.K e.q.9.L L 9.u.b.J.E.!.~.j.! ) 3 1 > : > > 4 4 4 > ; .   |.|.",
-"|.P r.e.e.q.q.e.u.l.c.J.Q.~.h.&.2.$.( h q |.|.|.|.|.|.|.|.|.|.|.",
-"|.K w.e.e.e.e.e.u.l.x.b.I.Q.! >.1.6.>.+.j f $ |.|.|.|.|.|.|.|.|.",
-"|.A T u.e.e.u.u.k.l.z.c.n.s.o.2.2.1.4.6.1.` h f |.|.|.|.|.|.|.|.",
-"|.N P r.k.k.k.k.l.l.c.b.n.Q o.#.$.6.1.1.5.5.%.( h % |.|.|.|.|.|.",
-"|.|.C P r.l.l.l.z.x.c.F.F.g.F j ` Z.C.4.1.3.5.2.+.j p $ |.|.|.|.",
-"|.|.|.A P T r.t.t.x.b.F.F.H.0.S m #.6.Z.5.#.-.5.4.-.` j f |.|.|.",
-"|.|.|.|.C N A P P T D.H.F.H.D.I q g ( #.+.j 2.-.1.3.3.` f |.|.|.",
-"|.|.|.|.|.|.|.|.A K 9.z.F.F.H.t.A |.p f m m 1.` %.2.3.` f |.|.|.",
-"|.|.|.|.|.|.|.|.|.r K z.Y.F.F.F.I Z |.|.|.h h z %.,.+.m i |.|.|.",
-"|.|.|.|.|.|.|.|.|.O J z.R.P.F.P.g.A |.|.|.p i j j m f f g |.|.|.",
-"|.|.|.|.|.|.|.|.|.|.C T P.T.F.J.F.T N |.|.|.|.i $ # + |.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.A t.P.n.v.J.h.P |.|.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.N K P T i.J.J.T A |.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.c T y.J.n.L.h.P r |.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.|.P ^ i.i.F.J.r.A |.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.|.A A P v.F.J.h.A |.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.|.|.w P s.v.x.^ A |.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.A D T T A t |.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.0 l N A |.|.|.|.|.|.|.|.|.|.|.|.",
-"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|."
-};