Created by Jackson Doak on 2014-06-13 and last modified on 2014-06-13
Get this branch:
bzr branch lp:~noskcaj/yelp/merge
Only Jackson Doak can upload to this branch. If you are Jackson Doak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Jackson Doak

Recent revisions

123. By Jackson Doak on 2014-06-13

* 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

122. By Sebastien Bacher on 2014-03-10

releasing package yelp version 3.10.2-0ubuntu1

121. By Jackson Doak on 2014-03-10

* New upstream release.
  - Drop git_signal_handler.patch, fixed upstream

120. By Sebastien Bacher on 2014-02-27

releasing package yelp version 3.10.1-1ubuntu2

119. By Sebastien Bacher on 2014-02-27

* debian/patches/git_signal_handler.patch:
  - Don't use g_source_remove for signal handlers (lp: #1276306)

118. By Steve Langasek on 2014-01-15

Merge version 3.10.1-1 from Debian unstable

117. By Robert Ancell on 2013-12-18

* Use dh-autoreconf for current libtool.
* New upstream release:
  - Correctly detect Unity for conditional processing
  - Fixed build issue with intltool and gettext
  - Various updates for deprecated APIs in GLib and GTK
  - Added support for DocBook conditional processing on desktop environment
* debian/control.in:
  - Use Standards-Version to 3.9.4
* debian/libyelp0.symbols:
  - Removed private symbol that is no longer generated
* debian/patches/10_correctly_detect_unity.patch:
  - Applied upstream

116. By Marc Deslauriers on 2013-09-05

debian/patches/10_correctly_detect_unity.patch: properly detect Unity
by changing the testing order since Unity also provides org.gnome.Shell
and yelp was assuming it was GNOME Shell.

115. By Sebastien Bacher on 2013-05-30

releasing version 3.8.1-0ubuntu1

114. By Robert Ancell on 2012-11-12

New upstream release

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.