Last commit made on 2010-07-06
Get this branch:
git clone -b ubuntu/maverick https://git.launchpad.net/ubuntu/+source/yelp
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

0c44661... by Robert Ancell on 2010-07-06

Import patches-unapplied version 2.30.1-0ubuntu1 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 82a676e6c4aed0e23a9f6ec907817d372e95ccfc

New changelog entries:
  [ Didier Roche ]
  * New upstream release:
    - Support relocatable .gnome2 directory (Ray Strode)
    - Don't break on info pages with "/" in title (Edward Sheldrake)
    - Updated translations
  [ Robert Ancell ]
  * debian/control:
    - Use standards-version 3.9.0
    - Build-depend on gnome-common for autotools
  * debian/rules:
    - Run autotools on build
  * debian/patches/99_autoreconf.patch:
    - Obsolete, autotools now run on build

82a676e... by Sebastien Bacher on 2010-04-16

Import patches-unapplied version 2.30.0-0ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: f53e075cca4e69864e08206cba9b6fa50d5bba85

New changelog entries:
  * debian/patches/07_rosetta_translations_update.patch:
    - updated rosetta translations

f53e075... by Robert Ancell on 2010-03-30

Import patches-unapplied version 2.30.0-0ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 6324cec1d0f2ad9597ae06e585041ea7fac6c31f

New changelog entries:
  * New upstream release:
    - Updated translations

6324cec... by Chris Coulson on 2010-03-09

Import patches-unapplied version 2.29.5-0ubuntu3 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 81e95ca1e23a9bd2abeddba17fe7cf9439445054

New changelog entries:
  * Rebuild for xulrunner-1.9.2 transition
  * Automatically add correct xulrunner binary depends:
    - debian/rules: Call dh_xulrunner in binary-predeb target
    - debian/control:
      + Don't specify explicit binary depends on xulrunner
      + Bump xulrunner-dev build-depend to ensure we have dh_xulrunner

81e95ca... by Martin Pitt on 2010-03-01

Import patches-unapplied version 2.29.5-0ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 2179614970f382b7a25948b5b32f2a3cd72d92f3

New changelog entries:
  * debian/control.in: Add missing xulrunner-1.9.1 binary dependency, to fix
    yelp on Xubuntu. (LP: #527453)

2179614... by Didier Roche on 2010-02-23

Import patches-unapplied version 2.29.5-0ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 76291e77927c0ee640043a7f9651ec92958553a4

New changelog entries:
  * New upstream release using gecko branch:
    - Clean up GLib and GTK+ includes (Javier Jardón)
    - Fixed issues with xulrunner 1.9.2
    - Adapted to changes in gnome-doc-utils XSLT
    - Fixed admonition graphics
    - Upped gnome-doc-utils version for fancy new Mallard features
    - Use accessor functions instead direct access (Javier Jardón)
    - Use g_timeout_add_seconds to reduce wakeups, bug #581260 (Javier Jardón)
    - Removed debug output, bug #585829 (Vincent Untz)
    - Updated translations
  * take again upstream branch, diverging from debian webkit one:
    - debian/control.in:
      + remove libwebkit-dev build-dep and add xulrunner-dev
      + bump gnome-doc-utils and libgtk2.0-dev deps
      + bump Standards-Version
  * adapt debian/patches/01_lpi.patch
  * debian/patches/02_autoconf.patch:
    - refreshed

76291e7... by Didier Roche on 2010-02-06

Import patches-unapplied version 2.28.0+webkit-1ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 51047339957dfa44f688fa1c19d5e7242e56711c

New changelog entries:
  * debian/source_yelp.py: add an apport hook (LP: #418156)
    (Pedro Villavicencio)
  * debian/install: install the apport file

5104733... by Robert Ancell on 2009-12-08

Import patches-unapplied version 2.28.0+webkit-1ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 18194c3777c31e5b94d608bc845ae2c5d05d9137

New changelog entries:
  * Merge with Debian unstable, remaining changes:
  * debian/control.in:
    - Bump build-depend version for libglib2.0-dev
    - LP integration
    - Change recommend on ttf-dejavu to suggests
    - Add BZR link
  * debian/patches/01_lpi.patch:
  * debian/patches/02_autoconf.patch:
    - LP integration
  * debian/patches/03_info_crasher.patch:
    - Don't use this debian change since upstream indicated it creates issues
  * debian/patches/04_new_ubuntu_layout.patch:
    - Ubuntu index layout
  * debian/patches/05_menu_tooltip.patch:
    - Change tooltip from "Get help with GNOME" to "Get help with Ubuntu"
  * debian/patches/06_ubuntu_online_url.patch:
    - Use an Ubuntu online url
  * debian/watch:
    - Watch for unstable versions

18194c3... by Josselin Mouette <email address hidden> on 2009-09-23

Import patches-unapplied version 2.28.0+webkit-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c8e7a5ec3aee8ee5960f4eb09fd0538dd8d15656

New changelog entries:
  * New upstream release, based on the freshly merged webkit branch.
  * Update build-dependencies.
  * 06_text_plain.patch: removed, merged upstream.
  * 10_hurd_path-max.patch, 70_autotools.patch: removed, obsolete.
  * This upload is brought to you by the Cabalistic Lizard Hunting

c8e7a5e... by Emilio Pozuelo Monfort <email address hidden> on 2009-08-28

Import patches-unapplied version 2.26.0-3 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: 6872af7f0f6efb2ebd4c03cc02e05ea3958a125f

New changelog entries:
  [ Josselin Mouette ]
  * 10_hurd_path-max.patch: new patch. Fix build on hurd.
    Closes: #531073.
  [ Emilio Pozuelo Monfort ]
  * Standards-Version is 3.8.3, no chanes needed.