lp:ubuntu/karmic/meld

Created by James Westby and last modified
Get this branch:
bzr branch lp:ubuntu/karmic/meld
Members of Ubuntu branches can upload to this branch. Log in for directions.

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Development

Recent revisions

17. By Emilio Pozuelo Monfort <email address hidden>

* debian/control.in:
  - Stop recommending python-gnome2-desktop, meld doesn't use any module
    from python-gnome-desktop. Closes: #541557.
  - Stop depending on python-gnome2, recommend it since meld may use
    the gnomevfs module, and recommend python-gconf for the config.
    Closes: #533748.
  - Standards-Version is 3.8.3, no changes needed.
  - Remove dh_scrollkeeper call, it's deprecated now.
  - Build depend on python rather than python-dev.

16. By Ross Burton

* New upstream release (Closes: #528327)
  - Copy/paste behaviour fixes (Closes: #523576)
  - Dotfiles and removals handled in darcs (Closes: #509069)
  - Can handle Mercurial repos (Closes: #428843)
  - Up/Down patch used to skip changes (Closes: #511027)
  - Handle last line when highlighting properly (Closes: #465804)
* Update message and depends for new python-gtksourceview2 package
* Resync makefile.patch
* Remove python-gnome dependency

15. By Michael Terry

[ Michael Terry ]
* Merge from debian unstable (LP: #373388), remaining changes:
  - debian/control.in: Add patch as a dependency
  - debian/copyright: Update email address of maintainer
  - debian/patches/only-ignore-fully-blank-changes.patch
* debian/patches/escape-paths.patch:
  - Removed, fixed upstream.

[ James Westby ]
* debian/patches/fix-fr-help-makefile.patch
  - Removed as the directory now exists.
* Added patch tags to the remaining Ubuntu patch.

14. By Michael Budde

* New upstream release. (LP: #283725)
* debian/copyright:
  - Updated email of upstream author to what is stated in MAINTAINERS.
* debian/control.in:
  - Bumped standards-version to 3.8.0.
* debian/patches/html_patch_by_kai_willadsen.patch:
  - Removed, fixed upstream.
* debian/patches/fix-fr-help-makefile.patch:
  - Ignore error when trying to install files from the non existent
    directory 'help/fr/figures'.
* debian/patches/only-ignore-fully-blank-changes.patch:
  - Do not jump to the last blank change in blank changes are ignored and
    do not jump over blank changes if they are not ignored. Fixes bug that
    caused some differences to be ignored when using 'Up and 'Down' buttons.
    Patch by Martin Renold. (LP: #234259)
* debian/patches/escape-paths.patch:
  - Escape paths so mime type is recoqnized correctly. Patch by Ivan
    Sergeyenko. Fixed in upstream development version. (LP: #152913)

13. By Thorsten Sick

debian/patches/html_patch_by_kai_willadsen.patch:
add patch by Kai Willadsen to escape html in search. (LP: #203033)
Fixed upstream in version 1.2.

12. By Mario Limonciello

* Merge from Debian unstable. Remaining Ubuntu Changes:
  - Keep patch in depends.

11. By Áron Sisak

New upstream release

10. By Lionel Porcheron

* debian/{control,control.in}: add patch as a Dependency. Thanks Adam
  Collard (Closes: LP #69689)
* Modify Maintainer value to match Debian-Maintainer-Field Spec

9. By Loïc Minier

* Add Debian GNOME Maintainers to Uploaders; build-dep on gnome-pkg-tools.
* Cleanups.
* Update URL in copyright.
* Wrap build-deps and deps.
* Use debian/meld.menu instead of debian/menu.
* Drop dangerous empty postinst.
* Install manpages via debian/meld.manpages instead of
  DEB_INSTALL_MANPAGES_meld.
* Bump up Debhelper compatibility level to 5.
* Update URL in watch file.
* Add a get-orig-source target to retrieve the upstream source.
* Add ${misc:Depends}.
* Set Python compatibility version to 2; add XS and XB-Python-Version.
* New upstream release.
  - Drop patch "plurals"; doesn't apply anymore and it seems to build fine
    without now.
  - Drop patch "scrollkeeper" and add a rule to drop installed scrollkeeper
    files; partially applied upstream and I don't understand what the
    reminder of the patch was meant to fix.

8. By Ross Burton

* Acknowledge NMU
* New upstream release (Closes: #382055)
  - Tab width fixes (Closes: #372587)

Branch metadata

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

Subscribers