Commit graph

63 commits

Author SHA1 Message Date
wiz
f9dd547d73 Update to 3.14.0:
2015-07-23 meld 3.14.0
======================

  Fixes:

   * Fix crash when starting folder comparison on Windows (Kai Willadsen)
   * Fix bad chunk action behaviour for middle-to-right actions in three
     pane conflicts (Kai Willadsen)
   * Documentation fixes (Anders Jonsson)


  Translations:

   * Josef Andersson (sv)
   * Marek Černocký (cs)
2015-07-26 23:01:11 +00:00
wiz
048b458b94 Update to 3.13.3:
2015-07-12 meld 3.13.3
======================

  Fixes:

   * Fix syntax highlighting under Windows (Kai Willadsen)
   * Update Windows build for newer pygi bundled libraries (Kai Willadsen)
   * Fixes for incorrect descriptions in manual (Anders Jonsson, Kai Willadsen)
2015-07-14 08:44:49 +00:00
wiz
cbf875e0e4 Update to 3.13.2:
2015-07-04 meld 3.13.2
======================

  Fixes:

   * Several fixes for argument handling and tab creation:
     * Create --diff created comparisons after args-created ones (Kai
       Willadsen)
     * Fix --label flag incorrectly applying to --diff created comparisons
       (Kai Willadsen)
     * Create --diff created comparisons after args-created ones (Kai
       Willadsen)
     * Fix relative path interpretation for --output when created from a
       secondary instance (Kai Willadsen)
     * Fix window presentation ordering when creating a secondary instance
       (Kai Willadsen)
   * Several fixes to unicode filename handling in git comparisons and
     manually-assigned labels (Kai Willadsen)
   * Fix incorrect comparison display caused by unicode (U+2028) newline (Kai
     Willadsen)
   * Fix not being able to activate some change bar actions by temporarily
     disabling overlay scrolling support on GTK+ 3.14 (Kai Willadsen)
   * Stop recreating duplicate recently-used file placeholders (Kai Willadsen)
   * Fix out-of-date man page documentation (Kai Willadsen)
   * Test fixes and testing improvements (Magnus Ihse Bursie)
   * Documentation fixes (Anders Jonsson)


  Translations:

   * Gábor Kelemen (hu)
   * Marek Černocký (cs)
   * Pedro Albuquerque (pt)
2015-07-05 18:20:13 +00:00
wiz
d36f99572e Update to 3.13.1:
2015-04-20 meld 3.13.1
======================

  Features:

   * Previously, Meld could show very different results in file vs. folder
     comparisons when the files differed in line endings. These are now much
     more consistent.

      * In folder comparisons, applying filters now also normalises line
        endings (Kai Willadsen)
      * In a file comparison, if the files-are-identical notification is shown
        when files differ in line endings, this now mentioned (Kai Willadsen)
      * There is a new preferences controlling whether to apply text filters
        during folder comparisons, defaulting to on, which also controls line
        ending normalisation (Kai Willadsen)
      * Help documentation has been updated with details of how text filters
        are applied in folder comparison (Kai Willadsen)

   * Folder comparisons will now show an identical notification similar to the
     one used in file comparison (Kai Willadsen)
   * The "New blank comparion" button now works for folder comparisons as well
     as file ones (Kai Willadsen)
   * In folder comparisons, the expansion state of the tree is now remembered
     when you collapse and re-expand a row (Kai Willadsen)

  Fixes:

   * Install fixes (oco)
   * Code style fixes (Sandro Bonazzola)
   * Better support RTL locales by flipping icons and panes consistently (Kai
     Willadsen)
   * Fixes for file encoding when saving with bad or missing encodings (Kai
     Willadsen)
   * More consistent dialog handling and appearance (Kai Willadsen)
   * Deprecation updates and compatibility fixes (Kai Willadsen)
   * Fix bad comparison offset when multiple line breaks occurred on a single
     line (don't ask) (Kai Willadsen)
   * Unicode fixes for file change notifications (Kai Willadsen)
   * Warnings (such as deprecation warnings) are now explicitly silenced in
     stable Meld (Kai Willadsen)
   * Folder actions are now disabled while Meld is still scanning folders (Kai
     Willadsen)
   * Fix some command line handling for ambiguous relative paths and invalid
     URIs (Kai Willadsen)
   * Fix updating the comparison map when a file is updated within Meld (Kai
     Willadsen)

  Translations:

   * Anders Jonsson (sv)
   * Cheng-Chia Tseng (zh_TW)
   * Christian Kirbach (de)
   * Daniel Mustieles (es)
   * Jordi Mas (ca)
   * Marek Černocký (cs)
   * Matej Urbančič (sl)
   * Piotr Drąg (pl)
   * Samir Ribic (bs)
   * Tibor Kaputa (sk)
2015-04-27 08:51:09 +00:00
tnn
255d0cb0b8 Recursive revbump following MesaLib update, categories a through f. 2015-04-25 14:20:17 +00:00
wiz
2528f0e567 Update to 3.13.0:
2014-12-31 meld 3.13.0
======================

  Features:

   * Make syntax highlighting style configurable (Mark Pariente)
   * Implemented incremental search, match highlighting and many other
     find-related fixes (Robert Roth)
   * Add support for GTK+ global dark theme setting (Kai Willadsen)
   * Add support for pushing change deletions (Kai Willadsen)
   * Remove cycle-pane action in favour of previous/next pane actions (Kai
     Willadsen)

  Fixes:

   * Handle Unicode filenames in a git tree correctly (Hasan Arous, Kai
     Willadsen)
   * Many fixes for recent GTK+ deprecation warnings (Kai Willadsen)
   * Fixing flickering inline highlighting on updates (Kai Willadsen)

   * Multiple work arounds for change colours not displaying on GTK+ 3.14 (Kai
     Willadsen)
   * Fix inconsistent file chooser when cancelling file selection (Kai
     Willadsen)
   * UTF-8 encode patches created from the patch dialog (Kai Willadsen)
   * Fix text-wrapping reset caused by the commit dialog (Kai Willadsen)
   * Fix text background display on certain themes (Kai Willadsen)
   * Fix for launching Meld with certain Git environment variables (Kai
     Willadsen)
   * Add GTK's settings.ini file for font blurriness fix on Windows (Kai
     Willadsen)
   * Fix display of change action buttons and line numbers when line numbers
     are shown (Kai Willadsen)
   * Fix positioning of the change action buttons (Kai Willadsen)
   * Fix tab width setting not working correctly (Kai Willadsen)
   * Fix starting comparison of Subversion checkouts from a subdirectory (Kai
     Willadsen)
   * Fix starting Meld from a differently-named symlink (Kai Willadsen)
   * Ignore errors when copying file metadata if the destination file system
     doesn't support it (Kai Willadsen)
   * Automatically recompile stale in-place gschemas (Kai Willadsen)
   * Handle SIGINT to support previous quit-on-Ctrl-C behaviour (Kai Willadsen)
   * Fix missing cache opcodes in some circumstances (Kai Willadsen)
   * Fix text view expansion when resizing patch dialog (Kai Willadsen)
   * Build fix to always include C locale when LINGUAS is set (Kai Willadsen)

  Translations:

   * Andika Triwidada (id)
   * Carles Ferrando (ca@valencia)
   * Gábor Kelemen (hu)
   * Jean Jordaan (cs, el, es)
   * Joan Coll (ca)
   * Jordi Mas (ca)
   * Marek Černocký (cs)
   * Maria  Mavridou (el)
   * Piotr Drąg (pl)
   * Мирослав Николић (sr, sr@latin)
2014-12-31 14:28:27 +00:00
wiz
db840ca498 Update to 3.12.2:
2014-11-25 meld 3.12.2
======================

  Fixes:

   * Fix display of change action buttons and line numbers when line numbers
     are shown (Kai Willadsen)
   * Fix positioning of the change action buttons (Kai Willadsen)
   * Fix tab width setting not working correctly (Kai Willadsen)
   * Fix starting comparison of Subversion checkouts from a subdirectory (Kai
     Willadsen)
   * Fix starting Meld from a differently-named symlink (Kai Willadsen)
   * Ignore errors when copying file metadata if the destination file system
     doesn't support it (Kai Willadsen)
   * Automatically recompile stale in-place gschemas (Kai Willadsen)
   * Handle SIGINT to support previous quit-on-Ctrl-C behaviour (Kai Willadsen)

  Translations:

   * Dimitris Spingos (el)
   * Marek Černocký (cs)
2014-11-27 11:19:42 +00:00
wiz
6779b74535 Update to 3.12.1:
2014-10-26 meld 3.12.1
======================

  Fixes:

   * Work around change colours not displaying on GTK+ 3.14 (Kai Willadsen)
   * Fix missing cache opcodes in some circumstances (Kai Willadsen)
   * Fix text view expansion when resizing patch dialog (Kai Willadsen)
   * Build fix to always include C locale when LINGUAS is set (Kai Willadsen)

  Translations:

   * Rafael Ferreira (pt_BR)
   * Мирослав Николић (sr, sr@latin)
2014-10-26 08:46:38 +00:00
wiz
b121d7b7b2 Update to 3.12.0, based on meld-devel with an update. Changes to meld-devel:
2014-09-27 meld 3.12.0
======================

  Fixes:

   * Ignore missing files when cleaning up our recently-used folder (Kai
     Willadsen)
   * Guard against dialogs missing properties they should definitely have (Kai
     Willadsen)
   * Remove old property from patch dialog (Kai Willadsen)

  Translations:

   * Andika Triwidada (id)
   * Marek Černocký (cs)
   * Piotr Drąg (pl)


2014-09-19 meld 3.11.4
======================

  Fixes:

   * Only apply the auto merge flag to the last comparison started (Kai
     Willadsen)
   * Fix install layout issues on Debian-based systems (Kai Willadsen)
   * Fix "Open External" for files on Windows (Kai Willadsen)
   * Record installation directory and executable location on Windows (Kai
     Willadsen)
   * Revert to using latin1 as a fallback encoding; this will be reverted in
     the next unstable series (Kai Willadsen)

  Translations:

   * Andika Triwidada (id)
   * Daniel Mustieles (es)
   * fr33domlover (he)
   * Jiri Grönroos (fi)
   * Josef Andersson (sv)
   * Marek Černocký (cs)
   * Piotr Drąg (pl)
2014-10-01 09:43:43 +00:00
wiz
50b4572112 Update to 1.8.6:
Meld 1.8.6 has been released.

  Fixes:

    * Handle spaces in filenames with external editor (Kai Willadsen)
    * Fix storing translated column names in configuration (Kai Willadsen)
    * Backport fix for "Open externally" sensitivity setting (Daniel Macks)
    * Fix support for fake comparisons in null VC (Kai Willadsen)
    * Fix "Same" filter for shallow comparison cases (Kai Willadsen)

  Translations:

    * Benjamin Steinwender(de)
    * Daniel Mustieles (es)
    * Inaki Larranaga Murgoitio (eu)
    * Lasse Liehu (fi)
2014-07-19 06:13:37 +00:00
wiz
bea9cd2f8b Update to 1.8.5:
Fixes:

    * Fix findbar crash with older pygtk (Kai Willadsen)

  Translations:

    * Daniel Mustieles (es)
    * Dimitris Spingos (el)
    * Facundo Dario Illanes (es)
    * Мирослав Николић (sr, sr@latin)
    * Tom Tryfonidis (el)
2014-05-20 08:44:14 +00:00
wiz
c1b44346cd Mark packages that are not ready for python-3.3 also not ready for 3.4,
until proven otherwise.
2014-05-09 07:36:53 +00:00
wiz
c4a7a0679e Mark as stable GTK 2 version. 2014-02-24 12:25:00 +00:00
wiz
aea510176b Update to 1.8.4:
2013-1-23 meld 1.8.4
====================

  Fixes:

    * Fix crash when scanning CVS-only folders (Kai Willadsen)
    * Fix crash on Windows when missing cdll.intl (Bartosz Dziewoński)
    * Fix crash with Italian (it_IT.utf8) locale (Balint Reczey)

  Translations:

    * Andika Triwidada (id)
    * Benjamin Steinwender (de)
    * Daniel Mustieles (es)
2014-01-27 20:04:40 +00:00
wiz
a1f0ff3f67 No need to have two variables for the same logic.
Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.
2014-01-25 10:45:15 +00:00
wiz
aa67e11089 Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE=  33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.

Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.

Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.

Whitespace cleanups and other nits corrected, where necessary.
2014-01-25 10:29:56 +00:00
wiz
43d0e67d75 Update to 1.8.3:
2013-12-15 meld 1.8.3
=====================

  Fixes:

    * Fix subdirectory comparisons for Subversion 1.6 (Ben Ross)
    * Fix git status parsing for some statuses (Tom Scytale)
    * Don't disable updating when syncpoints aren't yet active (Kai Willadsen)
    * Fix modifying column properties causing crashes when using .ini config
      backend (Kai Willadsen)

  Translations:

    * Andika Triwidada (id)
    * Milo Casagrande (it)
    * zodiac111 (zh_CN)
2013-12-31 18:03:51 +00:00
wiz
2676597179 Update to 1.8.2:
2013-10-18 meld 1.8.2
=====================

  Fixes:

    * Fix regression selecting Subversion 1.6 repositories (Kai Willadsen)
    * Fix for unicode usernames on Windows; note that this change also moves
      Meld config from the remote to the local app data folder (Kai Willadsen)
    * Add copyright string to appdata file (Kai Willadsen)

  Translations:

    * Fran Diéguez (gl)
    * Matej Urbančič (sl)
2013-10-18 21:40:54 +00:00
wiz
0683901d3e Update to 1.8.1:
2013-9-22 meld 1.8.1
====================

  Fixes:

    * Add AppData file (Kai Willadsen)
    * Change order of version control selection for CVS and old SVN (Kai
      Willadsen)
    * Fix escaped markup in folder comparisons (Kai Willadsen)

  Translations:

    * Daniel Mustieles (es)
    * Enrico Nicoletto (pt_BR)
    * Gabor Kelemen (hu)
    * Marek Černocký (cs)
    * Milo Casagrande (it)
    * Piotr Drąg (pl)
2013-09-30 18:23:21 +00:00
wiz
5b305006d9 Update to 1.8.0:
2013-9-15 meld 1.8.0
====================

  Fixes:

    * Minor fixes (Kai Willadsen)

  Translations:

    * Matej Urbančič (sl)
2013-09-15 17:20:46 +00:00
wiz
fc7e93235f Update to 1.7.5:
2013-9-1 meld 1.7.5
===================

  Features:

    * Open the version control console view when the exit code of a VC
      operation indicates that there was an error (Kai Willadsen)
    * Improve our handling of bad gconf setups, and add a file-system key
      to force a no-gconf fallback for persistent issues (Daniel Richard G)
    * Add a preference for whether to highlight the current line of a file
      comparison (Kai Willadsen)
    * Keyboard shortcut for the commit dialog (Kai Willadsen)

  Fixes:

    * Fix traversing symlink loops in version control comparisons (Kai
      Willadsen)
    * Minor fixes and cleanups (Boruch Baum, Sandro Bonazzola, Kai Willadsen)

  Translations:

    * Antonio Fernandes C. Neto (pt_BR)
    * Daniel Mustieles (es)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Rafael Ferreira (pt_BR)
    * Piotr Drąg (pl)
2013-09-02 16:11:43 +00:00
wiz
d12e0cf564 Pick up maintainership. 2013-08-20 22:37:06 +00:00
wiz
b73e42b207 Update to 1.7.4:
2013-7-28 meld 1.7.4
====================

  Features:

    * Commit dialog can now automatically wrap commit messages (Kai Willadsen)
    * Add Bazaar support for pushing changes, and improve sensitivity setting
      (Louis des Landes)
    * Support Subversion 1.8 (Yuri)
    * Type-ahead-find search now works in folder comparisons (Kai Willadsen)
    * Preference to swap pane order left = local (Kai Willadsen)

    * Arch, Codeville and RCS are no longer supported (Kai Willadsen)

  Fixes:

    * When opening new tabs from the command line, bring new tab to the front
      (Richard Simmons)
    * Current chunk highlight is now customisable using gtkrc (Louis des
      Landes)
    * Syncpoints now prevent chunks from being re-merged, syncpoints move with
      insertions, and disable automatic updating (Kai Willadsen)
    * Various version control updates and fixes (Louis des Landes, Kai
      Willadsen)
    * Sensitivity fixes (Kai Willadsen)
    * Translation string fixes (Marek Černocký)

  Translations:
    * Daniel Mustieles (es)
    * Dimitris Spingos (el)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Piotr Drąg (pl)
2013-07-28 09:23:20 +00:00
wiz
da4f3af2ae Update to 1.7.3:
2013-5-4 meld 1.7.3
====================

  Features:

    * Support launching conflict comparisons from Subversion (Louis des
      Landes)
    * The external text editor setting now supports opening files at a
      particular line number (Konstantin Starojitski)

    * A host of minor improvements to the version control UI, including:
      * Add a new Push action for VC modules, currently supported in Git (Kai
        Willadsen)
      * Show a summary of unpushed commits, currently supported in Git (Kai
        Willadsen)
      * Reworked commit dialog, including more details about files to be
        committed and more useful previous-log selection (Kai Willadsen)
      * Console output for VC comparisons is now formatted to better
        distinguish commands, output and errors (Kai Willadsen)
      * Support better sensitivity handling in VC comparisons, currently
        implemented by Git (Kai Willadsen)

    * Sundry minor UI improvements:
      * Much HIG-ification and better wording for actions, dialogs and
        labels (Kai Willadsen, with diligent bug reporting from Adam Dingle)
      * Make columns user-resizable in version control and folder comparisons
        (Kai Willadsen)
      * There is now a Save All action, to save all modified files in the
        current comparison (Kai Willadsen)
      * Rather than giving up on long inline-highlighting comparisons, Meld
        now prompts to continue the comparison (Kai Willadsen)
      * F5 is now a additional shortcut for Refresh (Kai Willadsen)
      * Reload has been renamed to Revert and its UI has been improved for
        file comparisons (Kai Willadsen)

  Fixes:

    * Version control updates and miscellaneous fixes (Dominique Leuenberger,
      Louis des Landes, Timothy Babych, Kai Willadsen)
    * When guessing file types for syntax highlighting, we now use file
      contents as well as extension (Kai Willadsen)
    * Prev/Next Change navigation now centres changes slightly more
      aggressively (Kai Willadsen)

  Translations:
    * Daniel Mustieles (es)
    * Gabor Kelemen (hu)
    * Inaki Larranaga Murgoitio (eu)
    * Jiro Matsuzawa (ja)
    * Marek Černocký (cs)
    * Martin Srebotnjak (sl)
    * Matej Urbančič (sl)
    * Pere Orga (ca)
    * Piotr Drąg (pl)
    * Rafael Ferreira (pt_BR)
    * Мирослав Николић (sr, sr@latin)
2013-06-04 18:51:59 +00:00
wiz
03e6109881 Update to 1.7.2:
2013-4-16 meld 1.7.2
====================

  Features:

    * In version control view, conflicts now open in a three-way merge mode
      for Bazaar and Git, with other VCs to follow (Louis des Landes)
    * Manual synchronisation of split points for comparisons (Piotr Piastucki,
      Kai Willadsen)
    * The "Ignore blank lines" setting is now used in folder comparisons, in
      same manner as text filters (Kai Willadsen)

  Fixes:

    * Many minor Windows compatibility fixes (Vincent Legoll, Robert Wahler,
      Kai Willadsen)
    * Version control compatibility updates and fixes (Manuel Siggen, Kai
      Willadsen)
    * Better handling of Unicode filenames (Kai Willadsen)
    * Better support for cross-platform newline behaviour, particularly on
      Windows (Kai Willadsen)
    * Sensitivity fixes for file and folder comparisons (Kai Willadsen)
    * Build and installation fixes (Kalev Lember, Kai Willadsen)

  Translations:

    * Daniel Mustieles (es)
    * Gabor Kelemen (hu)
    * Marek Černocký (cs)
    * Martin Srebotnjak (sl).
    * Matej Urbančič (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)
    * Rafael Ferreira (pt_BR)
2013-04-21 14:46:34 +00:00
wiz
5bdca21ee8 Update to 1.7.1:
2012-2-28 meld 1.7.1
====================

  Features:

    * Folder comparisons can now show extra information, such as file size and
      modification times. Column visibility and ordering are properly
      configurable. (Philipp Müller, Kai Willadsen)
    * Shallow comparison (i.e., based on size and timestamp) are now supported
      for folder comparisons, including timestamp resolution preferences for
      cross-filesystem comparisons. (Cristian Dinu)
    * The UI for launching new comparisons has been reworked to have a clearer
      workflow, and is now shown on startup if no other comparisons have been
      opened (Kai Willadsen)
    * Recently-used comparisons are now supported, allowing you to re-open
      previous comparisons directly. (Kai Willadsen)
    * Read-only files are now not editable by default, making merge actions
      clearer and more consistent. Individual read-only files can easily be set
      as editable as desired. (Kai Willadsen)

  Fixes:

    * New version control API, currently used by Git and Subversion (Kai
      Willadsen)
    * Version control compatibility updates and fixes (Cedric Le Dillau, Louis
      des Landes, Kai Willadsen)
    * Command line labelling options now apply to folder tabs (Kai Willadsen)
    * Regressions from parallel inline highlighting calculations have been
      fixed (Kai Willadsen)
    * Diff algorithm cleanups (Piotr Piastucki)
    * Compatibility fixes for Python 3; this does *not* mean that Meld works on
      Python 3 yet, just that 2to3 issues have been addressed (Kai Willadsen)

  Translations:
    * Daniel Mustieles (es)
    * Dominique Leuenberger (pt)
    * Enrico Nicoletto (pt_BR)
    * Florencio Neves (pt_BR)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)


2012-11-07 meld 1.7.0
=====================

  Features:

    * File comparisons are faster! Meld now has a smarter pre-processing step
      for inline highlighting of differences (Piotr Piastucki) and does its
      highlighting calculations asynchronously (Kai Willadsen), leading to
      better overall performance and interactivity.
    * Auto-merge mode is now available from the command-line (Piotr Piastucki)
    * Comparisons can be opened in new tabs (rather than in a new window) from
      the command line (Kacper Wysocki, Antoine, Kai Willadsen)
    * Custom colours can now be configured for all Meld drawing (Kai Willadsen)

  Fixes:

    * Improved behaviour when opening many tabs at once (Peter Tyser)
    * Notification of searches wrapping around the buffer (Philipp Müller)
    * Better compatibility with non-standard keyboard layouts (Stephan Hilb)
    * Better error reporting for failed VC comparisons (Kai Willadsen)
    * Version control compatibility updates and fixes (Jan Danielsson, Tim
      Babych, Kai Willadsen)
    * Other miscellaneous bug fixes (Jeff Oliver, Pacho Ramos, Rainer Suhm, Kai
      Willadsen)

  Translations:

    * Alexandre Franke (fr)
    * Daniel Mustieles (es)
    * Fran Diéguez (gl)
    * Gabor Kelemen (hu)
    * Matej Urbančič (sl)
    * Marek Černocký (cs)
    * Mario Blättermann (de)
    * Martin Srebotnjak (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)
2013-03-15 22:00:57 +00:00
asau
e1ab7079b6 Drop superfluous PKG_DESTDIR_SUPPORT, "user-destdir" is default these days. 2012-10-31 11:16:30 +00:00
wiz
d9bef21248 Update to 1.6.1:
2012-10-21 meld 1.6.1
=====================

  Fixes:

    * Fix traceback from invalid tree cursor paths (Kai Willadsen) (closes
      rhbz#832969 and rhbz#837133)
    * Fix traceback when popping up right-click menus in empty tree sections
      (Kai Willadsen) (closes rhbz#843879)
    * Fix Bazaar comparisons including exec bit changes (Kai Willadsen) (closes
      bgo#682852)
    * Avoid spurious listings in Bazaar with shelved items (Per Ångström)
    * Fix copying symlinks in directories (Rainer Suhm) (closes rhbz#836606)
    * Support newer Fossil VC (Jan Danielsson) (closes bgo#683969)
    * Fix compatibility with Python 2.5 (Gianni Trovisi)
2012-10-21 20:41:25 +00:00
wiz
63e7735f95 Update to 1.6.0:
2012-4-28 meld 1.6.0
====================

  Fixes:

    * Fix cursor location handling when our tree models change (Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Daniel Mustieles (es)
    * Daniel Șerbănescu (ro)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Piotr Drąg (pl)
2012-05-03 22:58:01 +00:00
wiz
b73e9f341d Update to 1.5.4:
2012-4-3 meld 1.5.4
====================

  Fixes:

    * Slightly faster diff calculation (Piotr Piastucki)
    * Avoid too-tall commit dialogues (Nguyễn Hồng Quân)
    * Minor bug fixes and performance improvments (Kai Willadsen)

  Translation updates:

    * Alexander Shopov (bg)
    * Fran Diéguez (gl)
    * Kjartan Maraas (nb)
    * Kristjan SCHMIDT (eo)
    * Nguyễn Thái Ngọc Duy (vi)
    * Toshiharu Kudoh (ja)
    * Trương Ứng Minh (vi)
    * Мирослав Николић (sr) (sr@latin)
2012-04-15 15:50:14 +00:00
wiz
aada88e659 Remove python24 and all traces of it from pkgsrc.
Remove devel/py-ctypes (only needed by and supporting python24).
Remove PYTHON_VERSIONS_ACCEPTED and PYTHON_VERSIONS_INCOMPATIBLE
lines that just mirror defaults now.
Miscellaneous cleanup while editing all these files.
2012-04-08 19:08:44 +00:00
obache
2cd654bab6 Bump PKGREVISION from default python to 2.7. 2012-03-15 11:53:20 +00:00
wiz
d0e047e6cf Update to 1.5.3, update HOMEPAGE.
2012-1-27 meld 1.5.3
====================

  New features:

    * Add simple animations for chunk actions to make it easier to follow the
      result of insertion and deletion actions (Kai Willadsen)
    * Show the currently displayed page area in the side bars (Kai Willadsen)

  Fixes:

    * Don't show links between chunks where one of the chunks is completely
      off-screen, reducing visual clutter (Kai Willadsen)
    * Syntax highlighting will now assume that all files in a comparison are
      of the same type if we can't determine otherwise (Kai Willadsen)
    * Some fixes to colour usage and legibility for dark themes, with more
      theme fixes coming soon (Kai Willadsen)
    * Remember active filters across sessions in directory and VC comparions
      (Kai Willadsen)
    * Guess which version control system a user is most likely to want to see,
      in the event of multiple VCs in a single working copy (Kai Willadsen)
    * Work with Subversion 1.7 (Kai Willadsen)
    * Many sundry bug fixes (Aaron Schrab, Julian Taylor, Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Christian Kirbach (de)
    * Daniel Mustieles (es)
    * Fran Dieguez (gl)
    * Gabriel Speckhahn (pt_BR)
    * Jiro Matsuzawa (ja)
    * Jorge González (es)
    * Marcin Floryan (pl)
    * Marek Černocký (cs)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Petr Kovar (cs)
    * Piotr Drąg (pl)
    * Takeshi AIHANA (ja)
    * Yuri Myasoedov (ru)
2012-03-03 13:00:24 +00:00
wiz
e0b0395cd2 Update to 1.5.2:
2011-7-24 meld 1.5.2
=====================

  New features:

    * Add a new menu item and shortcut for switching between panes in
      file comparisons (Kai Willadsen)
    * Support type-ahead search in version control views (Oliver Gerlich)

  Fixes:

    * Non-editable files are now handled properly when doing sensitivity
      setting of change actions, and actions on the central change bar are
      presented accordingly (Piotr Piastucki, Kai Willadsen)
    * Fix incorrect comparison display in files containing FF or NEL linebreak
      literals (Kai Willadsen)
    * Updates to the Fossil version control support (Jan Danielsson)
    * Use faster validity check for Bazaar repositories (Kai Willadsen)
    * Many minor updates and other fixes (Tomasz Bury, Alan Horkan,
      Julian Taylor, Kai Willadsen)

  Translation updates
2011-08-06 10:45:21 +00:00
wiz
dcdb411a9a Remove unneeded patch after update. 2011-04-07 07:36:05 +00:00
wiz
b340602987 Update to 1.5.1:
2011-3-20 meld 1.5.1
=====================

  New features:

    * Add menu items and keyboard shortcuts for version control and directory
      comparison actions (Kai Willadsen)
    * Add support for the Fossil SCM (Jan Danielsson)
    * Add a menu for switching between tabs (Kai Willadsen)
    * Add a menu item to unlock scrolling (Kai Willadsen)

  Code changes and fixes:

    * Improve filter handling with inline error reporting in the preference
      pane, and correct refreshing of file and directory comparisons on filter
      changes (Kai Willadsen)
    * Make line number display work with GtkSourceView 2.10+ (Piotr Piastucki)
    * Support external diff tools in subversion (Cedric Le Dillau)
    * Support CVSNT as a CVS alternative (Kai Willadsen)
    * Performance fixes for subversion and bazaar (Tristan Hill, Kirill Müller)
    * Correctly update a modified file's status in git and svn version control
      views (Peter Tyser)
    * Make temporary files unwritable to avoid unintentionally editing them
      (Peter Tyser)
    * Clean up diff results for cleaner comparisons (Piotr Piastucki)
    * Improve symlink and binary handling, and error cases for directory
      comparisons (Kai Willadsen)
    * Improve copy semantics for directories and symlinks (Kai Willadsen)
    * Show case insensitivity and file encoding errors less intrusively (Kai
      Willadsen)
    * Sundry bug fixes (Kai Willadsen, Piotr Piastucki)

  Translation updates:
    * Bruno Brouard (fr)
    * Claude Paroz (fr)
    * Daniel Mustieles (es)
    * Joe Hansen (da)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Miroslav Nikolić (sr)
    * Petr Kovar (cs)
    * Takeshi AIHANA (ja)


2010-12-27 meld 1.5.0
=====================

  New features:

    * Use MyersSequenceMatcher by default (matcher from Piotr Piastucki)
    * Add a "Show whitespace" preference (Jon Dufresne)
    * Add "Copy change above/below left/right" actions (Kai Willadsen)
    * Add Alt+Up/Down as shortcuts for previous/next change (Kai Willadsen)
    * Add previous/next conflict actions (Kai Willadsen)
    * Patch creation can now create reverse patches, and can choose between
      panes in a three-way comparison (Kai Willadsen)
    * Add a --output option for specifying where to save a merge result
      (Kai Willadsen)

  Code changes and fixes:

    * Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional)
    * Port to gtk.Builder and gtk.IconTheme (Kai Willadsen)
    * Remove gnome-vfs usage (Kai Willadsen)
    * Portability fixes (Thomas Klausner)
    * Build fixes (Helmut Jarausch)
    * Add a man page (Peter Tyser)
    * Put preferences fallback in XDG-compliant location (Kai Willadsen)
    * Fix Undo/Redo with unicode text (Kai Willadsen)
    * Handle unicode linebreaks (Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Carles Ferrando (ca@valencia)
    * Claude Paroz (fr)
    * Gabor Kelemen (hu)
    * Joe Hansen (da)
    * Jorge González (es)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Petr Kovar (cs)
2011-04-05 13:08:34 +00:00
wiz
29622b6b4b Update to 1.4.0. Send patch-ac upstream and add comment.
2010-09-27 meld-1.4.0
=====================

    * Fix committing with RCS (Iuri Diniz)

    * Fix compatibility with old PyGObject (Kai Willadsen)

    * Translation updates:
      hu (Gabor Kelemen)
2010-10-16 15:15:15 +00:00
wiz
4b4c4e6e90 Update to 1.3.3:
2010-09-09 meld-1.3.3
=====================

    * Highlight currently focused change (Kai Willadsen)

    * Add ability to check if version control repos are valid (Peter Tyser)

    * Support multiple-file undo/redo operations after save (Kai Willadsen)

    * Performance improvements, bug fixes and sundry contributions
      (Piotr Piastucki, Alexander Smishlajev, Robert Wahler, Kai Willadsen)

    * Translation updates:
      de (Mario Blättermann), es (Jorge González), fr (Bruno Brouard),
      ja (Takeshi AIHANA), sl (Matej Urbančič), zh_CN (Tao Wang)
2010-09-13 12:33:17 +00:00
drochner
afc07daa40 update to 1.3.2
changes:
-Add keyboard merging, bulk change merging, auto-merge with ancestor mode
-Updates to VC support, including lots of git fixes
-UI cleanups
-bug fixes
-Translation updates
2010-08-09 11:33:53 +00:00
joerg
3a06eb96bf Bump revision for PYTHON_VERSION_DEFAULT change. 2010-02-10 19:17:31 +00:00
joerg
e0d4ecdfc2 Retire Python 2.3 support. 2009-09-07 19:02:13 +00:00
wiz
eb543f6c9e Update to 1.3.1:
2009-08-14 meld-1.3.1
=====================

	* Add svk support (Vincent Legoll)

	* Add support for marking conflicts as resolved (Matthijs van de Water,
	  Vincent Legoll)

	* Warp the text cursor to the start of jumped-to diff chunks (Vincent
	  Legoll)

	* Allow toggling of toolbar and statusbar visibility, and add a fullscreen
	  option (Michael Budde, Stephen Kennedy, Kai Willadsen)

	* Improved change merging and conflict resolution (Piotr Piastucki)

	* Speed up file comparisons and highlighting, significantly improving
	  interactive editing performance (Kai Willadsen, Piotr Piastucki)

	* Meld has a shiny new application icon (Josef Vybíral)
2009-08-21 08:30:30 +00:00
wiz
d70523df21 Remove USE_DIRS from pkgsrc.
Shared directories can now be created independently by the pacakges
needing them and will be removed automatically by pkg_delete when empty.

Packages needing empty directories can use the @pkgdir command in PLIST.

Discussed and ok'd in thread starting at
http://mail-index.netbsd.org/tech-pkg/2009/06/30/msg003546.html
2009-07-22 09:01:16 +00:00
joerg
bacea7cad5 Remove @dirrm entries from PLISTs 2009-06-14 17:48:39 +00:00
wiz
60f460ab01 Use standard location for LICENSE line (in MAINTAINER/HOMEPAGE/COMMENT
block). Uncomment some commented out LICENSE lines while here.
2009-05-19 08:59:00 +00:00
wiz
c2b8d154c4 Update to 1.3.0:
2009-04-17 meld-1.3.0
=====================

        * Minimum requirements are pygobject 2.8 and python 2.4

        * Find dialog replaced with find bar with replace functionality

        * Remove gnome dependencies (Kai Willadsen, Vincent Legoll)
          Meld now runs on win32 (experimental).

        * Many ui tweaks and cleanups (Kai Willadsen, Vincent Legoll)

        * Support for multiple sourceview versions (Vincent Legoll)

        * Updated version control support
            * Multiple VCs in a single directory (Vincent Legoll)
            * Subversion 1.6.x (Vincent Legoll)
            * Add RCS support (Oliver Gerlich, Vincent Legoll)
            * Add Codeville support (Vincent Legoll)
2009-04-20 10:53:58 +00:00
wiz
78b7af7df5 Use mk/omf-scrollkeeper.mk instead of textproc/rarian/omf.mk. 2009-03-08 15:56:43 +00:00
joerg
3c645bb7fc Switch to Python 2.5 as default. Bump revision of all packages that have
changed runtime dependencies now.
2009-02-09 22:56:21 +00:00
ahoka
cf3163aa63 Remove the bogus requirement for python25, fix the offending line instead. 2009-01-18 12:31:07 +00:00
wiz
55fa90af5f Move scrollkeeper/omf.mk to rarian/omf.mk.
scrollkeeper is nowadays included in rarian, so the omf.mk file should
be there as well.
Adapt all references.
2009-01-04 18:00:58 +00:00