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

Proposed by Jackson Doak on 2014-06-13
Status: Merged
Merged at revision: 123
Proposed branch: lp:~noskcaj/yelp/merge
Merge into: lp:~ubuntu-desktop/yelp/ubuntu
Diff against target: 56 lines (+25/-2)
3 files modified
debian/changelog (+23/-0)
debian/control (+1/-1)
debian/control.in (+1/-1)
To merge this branch: bzr merge lp:~noskcaj/yelp/merge
Reviewer Review Type Date Requested Status
Sebastien Bacher 2014-06-13 Approve on 2014-06-18
Review via email: mp+223124@code.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks for the work there, looks good, uploaded

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1yelp (3.12.0-1ubuntu1) utopic; urgency=medium
2
3 * Merge from Debian unstable, remaining changes:
4 - Use dh-autoreconf for current libtool.
5 - debian/control{,.in}: Drop Recommends on ttf-dejavu; not used by Ubuntu.
6 - debian/patches/05_menu_tooltip.patch: Change comment in .desktop file to
7 refer to Unity instead of GNOME.
8 - debian/patches/06_make_ubuntu_docs_default.patch: On Unity, use
9 ubuntu-docs by default.
10 - debian/patches/07_disable_package_search.patch: Remove "Search for
11 packages" feature since it doesn't work with Ubuntu's default install.
12 - debian/source_yelp.py: Install apport hook
13 - debian/watch: Track unstable versions too
14
15 -- Jackson Doak <noskcaj@ubuntu.com> Sat, 14 Jun 2014 06:58:35 +1000
16
17yelp (3.12.0-1) unstable; urgency=medium
18
19 * New upstream release.
20 * Bump build-dependency on gtk+ to >= 3.8.0 according to configure.ac
21
22 -- Andreas Henriksson <andreas@fatal.se> Fri, 04 Apr 2014 21:13:42 +0200
23
1yelp (3.10.2-0ubuntu1) trusty; urgency=medium24yelp (3.10.2-0ubuntu1) trusty; urgency=medium
225
3 * New upstream release.26 * New upstream release.
427
=== 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 @@
20 libglib2.0-doc,20 libglib2.0-doc,
21 libgtk-3-doc,21 libgtk-3-doc,
22 libglib2.0-dev (>= 2.25.11),22 libglib2.0-dev (>= 2.25.11),
23 libgtk-3-dev (>= 3.0.0),23 libgtk-3-dev (>= 3.8.0),
24 libxml2-dev (>= 2.6.5),24 libxml2-dev (>= 2.6.5),
25 libxslt1-dev (>= 1.1.4),25 libxslt1-dev (>= 1.1.4),
26 zlib1g-dev,26 zlib1g-dev,
2727
=== 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 @@
16 libglib2.0-doc,16 libglib2.0-doc,
17 libgtk-3-doc,17 libgtk-3-doc,
18 libglib2.0-dev (>= 2.25.11),18 libglib2.0-dev (>= 2.25.11),
19 libgtk-3-dev (>= 3.0.0),19 libgtk-3-dev (>= 3.8.0),
20 libxml2-dev (>= 2.6.5),20 libxml2-dev (>= 2.6.5),
21 libxslt1-dev (>= 1.1.4),21 libxslt1-dev (>= 1.1.4),
22 zlib1g-dev,22 zlib1g-dev,

Subscribers

People subscribed via source and target branches

to all changes: