~ubuntu-branches/ubuntu/oneiric/gedit/oneiric-201106271708

Viewing all changes in revision 119.

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-27 00:34:24 UTC
  • mfrom: (2.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110127003424-njk4ublbba4bobh3
Tags: 2.30.4-2ubuntu1
* Merge from debian unstable.  Remaining changes: (LP: #708401)
  - debian/control.in:
    + Bump gedit-dev depends on libgtksourceview2.0-dev (>= 2.8.0)
    + Build-Depends on dh-autoreconf, gnome-common.
    + Build-Depends on liblaunchpad-integration-dev.
    + Don't recommends python-gnome2 it's not used nowadays.
  - debian/rules:
    + Run autoreconf on build.
  - debian/patches/01_lpi.patch:
    + Launchpad integration.
  - debian/patches/02_gconf_import.patch:
    + Correct gconf import.
  - debian/patches/05_menu_label.patch:
    + Don't display in menu as "gedit Text Editor".
  - debian/patches/06_lp_401692.patch:
    + Default name of a new document is now 'Untitled Document'.
  - debian/patches/07_intltool.patch:
    + Don't use both Intltool and GNU gettext build system.
  - debian/patches/90_autoreconf.patch:
    + Dropped, autoreconf now runs on build.
  - debian/watch:
    + Watch unstable series.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: