lp://qastaging/~noskcaj/ubuntu/utopic/meld/3.11.4

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntu/utopic/meld

Sebastien Bacher: Approve on 2014-09-25

Diff: 10223 lines (+4790/-2289)

27 files modified

.pc/01_skip_compile_schema_and_icon_cache_update.patch/meld/build_helpers.py (+15/-0)
.pc/02_remove_install_layout.patch/setup.py (+0/-72)
.pc/applied-patches (+0/-1)
NEWS (+25/-0)
PKG-INFO (+1/-1)
data/org.gnome.meld.gschema.xml (+1/-1)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/control.in (+2/-1)
debian/patches/02_remove_install_layout.patch (+0/-18)
debian/patches/series (+0/-1)
meld/build_helpers.py (+15/-0)
meld/conf.py (+1/-1)
meld/filediff.py (+1/-0)
meld/meldapp.py (+3/-1)
meld/melddoc.py (+7/-2)
meld/meldwindow.py (+3/-1)
po/LINGUAS (+1/-0)
po/cs.po (+38/-37)
po/es.po (+42/-42)
po/fi.po (+332/-262)
po/he.po (+2160/-0)
po/id.po (+407/-258)
po/pl.po (+42/-41)
po/sv.po (+1659/-1543)
setup.py (+1/-2)
setup_win32.py (+25/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

25. By Jackson Doak on 2014-09-19

* New upstream bugfix release.
* Drop 02_remove_install_layout.patch, fixed upstream

24. By Balint Reczey on 2014-08-23

New upstream development release

23. By Dmitry Shachnev on 2014-06-16

Add remove_install_layout.patch to fix FTBFS.

22. By Balint Reczey on 2014-05-26

* New upstream development release:
  - Features:
    * New (alpha) infrastructure for stand-alone Windows builds
      (Kai Willadsen)
    * Display renames and metadata in Bazaar repositories (Louis des Landes)
    * Improved tab labels in version control comparisons (Kai Willadsen)
    * New merge-order preference to accompany comparison-order (Kai Willadsen)
    * Added a prompt to mark a conflict as resolved from file comparison
      (Kai Willadsen)
  - Fixes:
    * Fix filtering for shallow folder comparisons (Casey)
    * Several install and distribution fixes (Kai Willadsen)
    * Sundry bug fixes (Dominique Leuenberger, Thomas Klausner,
      Louis des Landes, Kai Willadsen)
* Ship GSettings schema (Closes: #522015)
* Drop obsolete patch fixing meld's shebang. It is done automatically now.
* Drop obsoletely recommended gir1.2-gconf-2.0

21. By Balint Reczey on 2014-01-23

* New upstream development release:
  - Features:
    * Supporting hiding empty filtered folders in folder comparison
      (Gianni Trovisi, Kai Willadsen)
    * Notify user when files change externally in file comparison
      (Kai Willadsen)
    * Use standard GIO file trash handling when deleting files (Kai Willadsen)
    * Newly written Mallard-based help (Kai Willadsen)
  - User interface updates:
    * Support GNOME 3-style application menu (Kai Willadsen)
    * Visual improvements to several icons (Kai Willadsen)
    * Update Meld's colour scheme (Kai Willadsen)
    * Many visual styling updates, layout tweaks and UI polish (Kai Willadsen)
  - Internal changes:
    * Port to GObject introspection, GTK+ 3, GApplication, GSettings and other
      new things starting with 'G' (Kai Willadsen)
    * Port to distutils, based on python-distutils-extra (Kai Willadsen)
    * Move to using CSS for styling and colour definitions (Kai Willadsen)
    * Update to use more modern GTK widgets (Peter Tyser, Kai Willadsen)
    * Move a lot of extra UI construction into glade/UI files (Kai Willadsen)
    * Make several custom icons themeable (Kai Willadsen)
    * Make Meld a single-instance application, and add support for multiple
      windows (Kai Willadsen)
* Update dependencies to use GTK 3 libraries and GObject introspection,
  namely libgtk-3-0, python-gi, libgtksourceview-3.0-1,
  gir1.2-gtksource-3.0, python-gi-cairo and libcanberra-gtk3-module
* Depend on GtkSourceView instead of just recommending it
* Build depend on dh-python, itstool and libxml2-utils
* Drop obsolete empty-directory.patch and sourceview-package.patch patches

20. By Balint Reczey on 2013-09-01

* New upstream development snapshot release 1.7.5
* Drop Arch, Codeville and RCS as supported VCS-es in the package
  documentation
* Drop copyright-fsf-address.patch and man1-hyphen-to-minus.patch since
  they have been integrated upstream

19. By Balint Reczey on 2013-07-28

New upstream development snapshot release 1.7.4

18. By Balint Reczey on 2013-06-12

* New upstream development snapshot release 1.7.3
* Setting myself as the maintainer of the package with Ross's agreement
  Many thanks to Ross Burton for taking care of the package for long years!
* debian/control.in:
  - drop DM-Upload-Allowed field

17. By Balint Reczey on 2013-05-23

[Boruch Baum <email address hidden> ]
* New upstream development snapshot release
  I have to note here that Gianfranco Costamagna
  <email address hidden> sent me patches updating the Debian
  package in very similar ways, too.
* debian/control.in:
  - Standards-Version is 3.9.4, no changes needed.
  - debhelper updated to 9
  - expanded length of long description
* debian/compat
  - updated from 5 to 9
* debian/copyright
  - updated to format 1.0
  - added copyright and license details

16. By Balint Reczey on 2012-01-28

[ Balint Reczey ]
* New upstream development release
  - remove AUTHORS file
* debian/control.in:
  - Added the new homepage
* debian/rules
  - Don't ship NEWS file as changelog, too

[ Josselin Mouette ]
* Replace python-gobject by python-gobject-2.