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

[Jackson Doak]

Merge from debian

[Sebastien Bacher (seb128)]

thanks for the work there, looks good, uploaded

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-10 10:25:23 +0000
+++ debian/changelog	2014-06-13 21:06:58 +0000
@@ -1,3 +1,26 @@
+yelp (3.12.0-1ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Use dh-autoreconf for current libtool.
+    - debian/control{,.in}: Drop Recommends on ttf-dejavu; not used by Ubuntu.
+    - debian/patches/05_menu_tooltip.patch: Change comment in .desktop file to
+      refer to Unity instead of GNOME.
+    - debian/patches/06_make_ubuntu_docs_default.patch: On Unity, use
+      ubuntu-docs by default.
+    - debian/patches/07_disable_package_search.patch: Remove "Search for
+      packages" feature since it doesn't work with Ubuntu's default install.
+    - debian/source_yelp.py: Install apport hook
+    - debian/watch: Track unstable versions too
+
+ -- Jackson Doak <[e-mail]>  Sat, 14 Jun 2014 06:58:35 +1000
+
+yelp (3.12.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump build-dependency on gtk+ to >= 3.8.0 according to configure.ac
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 04 Apr 2014 21:13:42 +0200
+
 yelp (3.10.2-0ubuntu1) trusty; urgency=medium
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2014-01-15 07:07:20 +0000
+++ debian/control	2014-06-13 21:06:58 +0000
@@ -20,7 +20,7 @@
                libglib2.0-doc,
                libgtk-3-doc,
                libglib2.0-dev (>= 2.25.11),
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.8.0),
                libxml2-dev (>= 2.6.5),
                libxslt1-dev (>= 1.1.4),
                zlib1g-dev,
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-01-15 07:07:20 +0000
+++ debian/control.in	2014-06-13 21:06:58 +0000
@@ -16,7 +16,7 @@
                libglib2.0-doc,
                libgtk-3-doc,
                libglib2.0-dev (>= 2.25.11),
-               libgtk-3-dev (>= 3.0.0),
+               libgtk-3-dev (>= 3.8.0),
                libxml2-dev (>= 2.6.5),
                libxslt1-dev (>= 1.1.4),
                zlib1g-dev,