--- meld-1.3.1.orig/changelog +++ meld-1.3.1/changelog @@ -0,0 +1,642 @@ +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-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) + +2008-11-23 meld-1.2.1 +===================== + + * Pygtk version 2.8 now required + + * Port to gtk.UIManager (Kai Willadsen) + + * Handle spaces in svn paths (Neil Mayhew) + + * Command-line auto-compare all option on startup (Ondrej Novy) + + * Command-line can launch several comparisons (Brian Holmes) + + * Several UI tweaks (better focus behavior, better defaults) + +2008-06-26 meld-1.2 +======================= + + * Improve tab rendering (Kai Willadsen) + + * Speedup folder comparison massively for large directories. + + * Fix crasher i18n bug (Kai Willadsen) + + * UI tweaks and cleanups (Tom Baugis, Kai Willadsen) + + * Cleanup vc library redundancy (Vincent Legoll) + + * Various version control fixes. + + +2007-06-12 meld-1.1.5.1 +======================= + + * Do not ship .svn folders in tarball + +2007-06-09 meld-1.1.5 +===================== + + * Handle new version contol command line arguments. + + * CLI option to set the tab labels. Bug 138860. + + * Improve mime type detection from Tomasz Bury. Bug 156137. + + * Hold shift when scrolling to scroll the panes independently. + + * File & folder history now saved from Sam Jacobson. + + * Several small ui improvements. + +2006-06-10 meld-1.1.4 +===================== + + * Refresh and reload buttons. + + * Better context menu behaviour for vcview. + + * Allow escaping of shell patterns. (Patch from Jared Sulem) + + * Stop button sensitive only when needed. + + * Added ignore symlinks option for folder comparisons. + + * Various vc and other minor patches. + +2006-01-29 meld-1.1.3 +===================== + + * Arch support updates (Ali Afshar) + + * Sync scroll works, even with word wrap Bug 326648 + + * Use shutil.copy2 so [am]time is copied. + Suggestion from Eric Firing + + * Monotone support. Patch from Daniel Thompson. + + * Handle -h,-v command line options correctly. Bug 321634 + +2005-11-08 meld-1.1.2 +===================== + + * Add bzr support. Patch from Aaron Bentley. + + * Fix missing file attributes in dirdiff statusbar. + + * Hide pygtk 2.6 -> 2.8 deprecation warnings. + +2005-10-26 meld-1.1.1 +===================== + + * Now require pygtk-2.6+ and remove deprecation warnings + from previous versions. Use new filechooser. + + * New pluggable version control system. + + * New drawing code makes filediff much prettier. + + * Detect resolved cvs conflicts. Bug 308937 + +2005-10-25 meld-1.1.0 +===================== + + * Faulty release removed. + +2005-08-12 meld-1.0.1 +===================== + + * Translation plural form fixes. Bug 309408. + + * Hide deprecation warnings. Bug 310077. + + * Updated translations. + Takeshi AIHANA(jp.po) Miloslav Trmac(cs.po) + Dongsu Jang(ko.po) Alexander Shopov(bg.po) + Vincent van Adrighem(nl.po) + +2005-07-01 meld-1.0.0 +===================== + + * Added quick patch viewer via filediff context menu + + * Smarter abbreviation for tab labels. + + * Add svn directory hide rule. Bug 306093. + + * Fix inline highlighting for non-ascii encodings. Bug 304988. + + * Fix incorrect conflict detection. Bug 308833. + + * Fix some i18n issues in the source. Thanks to + Benoît DEJEAN, Danilo Segan and Christian Rose. + + * Many updated translations since 0.9.6 + Frank Arnold(de.po) Alexey Rusakov(ru.po) + Woodman Tuen(zh_TW.po) Jorge Gonzalez(es.po) + Christian Rose(sv.po) Adam Weinberger(en_CA.po) + Benoît DEJEAN(fr.po) Alexander Shopov(bg.po) + +2005-05-18 meld-0.9.6 +===================== + + * Disable dirdiff hiding when tree is being filled. Bug 160211. + + * Remove and disable multiline text filters. Bug 162688. + + * Updated to work with libglade2.4.1 + + * Fix svn parse error. Bug 165079. + + * Improve regex matching. Bug 172194. + + * "meld " works like cvs. Bug 169986. + + * Fix filediff line crossing. Bug 171788. + + * Fix "ignore blank lines" option breaks merge buttons. Bug 168010. + +2004-12-10 meld-0.9.5 +===================== + + * New docbook based user guide + + * Can use either pygtksourceview (preferred) or pysourceview + Fixed minor issues related to sourceview. + + * Can now compare files with different encodings + + * SVN browser is not confused by unversioned directories + + * SVN browser sorts by filename, not version number. + + * Minor cosmetic fixes and typos in strings fixed + +2004-07-15 meld-0.9.4 +===================== + + * Regular expression for ignore patterns in file diff. + + * Ignore blank lines option + + * Misc CVS and SVN fixes. + + * Compatibility restored for python2.2 + + * Up/Down buttons now work in directory/cvs/svn view. + + +2004-04-26 meld-0.9.3 +===================== + + * Added line numbers and syntax highlighting. (Requires pygtksourceview) + + * Subversion support. (Patch from Adam Muegge). + + * New status bar shows permissions and dates in dirdiff, shows + line/column in filediff. + + * Better focus behaviour when switching betweeen tabs. + + * Works with pygtk-2.3.92 + +2004-02-23 meld-0.9.2.1 +======================= + + * Bugfix release to fix broken install + + * Fix float->int conversion warning for python2.3 + +2004-02-11 meld-0.9.2 +===================== + + * Many translations added and updated. Thanks to the gnome translation + team. Benoît Dejean (French), Danilo Šegan (Serbian), Duarte Loreto + (Portuguese), Miloslav Trmac (Czech), Daniel van Eeden, Kees van den + Broek (Dutch), Dongsu Jang (Korean) + + * Differences within a line are now highlighted. + + * Meld can now launch an external editor. + + * CVS console state is remembered. + + * Text search now works for multibyte character sets. + + * Now using bugzilla.gnome.org for bug tracking + + * Added keyboard navigation for directory diffs. + + * Work around some pango/gtk font rendering issues where monospaced fonts + are not monospaced vertically. (Most noticibly non breaking spaces) + +2003-11-22 meld-0.9.1 +===================== + + * i18n support working, french translation added. Thanks to Benoit Dejean. + + * CVS 'all files appear modified' when LANG is set fixed. + + * Fix race condition which could lead to empty CVS patches. + + * Timestamp differences now ignored for directory diff. + + * Fix 'both horizontal' toolbar style. (GNOME changed the spelling) + + * CVS refresh now actually refreshes. + + * Filename filters used to treat *.x as *.x*. Fixed. + + * 'Filter New' button now works. + + * Universal newline support added (python2.3 only) + + * Text now saved with the same codec as it was loaded with. + + * App quit handling has changed to be more friendly. + + * Install and uninstall targets added to makefile. + + * CVS console scroll behaviour is better. + +2003-10-12 meld-0.9.0 +===================== + + * Completely reworked preferences. + + * Editor for file name filters + + * Editor for regular expression filters + + * New CVS options. + + * Added CVS console. + + * CVS view now uses .cvsignore and has a better Entries parser. + + * Allow long running operations to be interrupted. + +2003-08-31 meld-0.8.5 +===================== + + * Fix warnings for python2.3 + + * Add user definable dirdiff filters. (see manual) + + * CVS Context menu for common ops. + + * CVS Partial tree refreshing. + + * Better parsing of CVS/Entries + + * CVS updates status when files are edited. + + * Dirdiff now has case insensitive option. + + * CVS warns if the patch is empty. + + * Fix CVS modification times when UTC != localtime. + Thanks to and Martin Pool (report+patch) and Mike Grant (report) + + * Initial i18n support. + + * Dirdiff speedup by using filecmp instead of homegrown function. + Thanks to Benoit Dejean. + +2003-07-28 meld-0.8.4 +===================== + + * add missing pixmap from 0.8.3 release + + * add search function + +2003-07-24 meld-0.8.3 +===================== + + * Add margin clicking to directory view. + + * Consider files ending in '~' to be backups. RFE From Beniot Dejean. + + * Added margin diffmap guides + + * Add emblem for newest file in directory view + + * Add copy,cut,paste. + + * Modified files are checked to save by default. + + * Added context menu to save/save as from filediff + + * Add parent to dialogs. Improves window manager interaction. + + * Poup new.. now behaves like normal popups. + +2003-06-21 meld-0.8.2 +===================== + + * Added filters for directory view. + + * Added toolbar for directory view. + + * Added icons to notebook tabs. + + * Added coloured folder icons. + + * Fix bugs 746983 and 753815 recursive copy and delete. + + * Escape tree labels to avoid problems with filenames containing '&' + +2003-05-19 meld-0.8.1 +===================== + + * The interface has been made much more responsive using a new task + scheduler based on Python generators and idle callbacks. + + * Directory diff searches for all differences recursively for you. + + * Incremental filediff loader lets you see files as they load. + + * Filediff loader lets you choose the order of codecs tried. + + * Diffs now update as you type instead of after a small delay. + + * CVS browser now usable when the application current directory is not + inside the CVS tree. + + * meld 'file' now shows cvs diff without having to open a cvs browser + + * better focus behaviour for filediff. + + * Right click on a tab now brings up a tab menu. + + * Some Gnome HIG dialog alterations. + +2003-03-24 meld-0.8.0 +===================== + + * Never released. + +2003-03-24 meld-0.7.9 +===================== + + * Diff update is now incremental; That is updates happen on each + keypress instead of after a short timeout. This makes meld usable + on large files with many differences. + + * Much better loading interaction. The text is immediately visible + and scrollable - the diffs are computed in an idle callback. + + * CVS browser should now be considered beta not alpha. It works + with any location without needing to run 'meld .' + + * Right click on the tabs now pops up a tab menu. + + +2003-03-24 meld-0.7.1 +===================== + + * Added more colourful filediff. + + * Click in margin scrolls to that point. (suggestion from Alexander Dreweke) + + * Allow CVS diff for a single file from the command line. + + * Do not refresh filelist when launching diff. + + * Add a fallback font if 'monospace' is not available. (patch from Ross Burton) + + * Better handling of keyboard focus + + * Added version checking to main script. + + * Added --profile option. + +2003-03-24 meld-0.7.0 +===================== + + * cvsview: Added status, tag, rev, options and location fields. + + * cvsview: Hide location when not in recurse mode. + + * cvsview: Commit messages now work when containing shell metacharaters. + + * filediff: Load files lazily for quicker feedback + + * dirdiff: Added copy/delete/diff context menu. + + * dirdiff: Reworked how dirdiff is presented. + +2003-02-14 meld-0.6.6.1 +======================= + + * This fixes the bug where meld would fail to start if the toolbar + preferences were set to icons only. + +2003-02-12 meld-0.6.6 +===================== + + * Many updates to preferences. + + * You can now change font and tab size. Or use the default GNOME monospace font. + + * Toolbar style is now changeable or can follow GNOME default. + +2003-01-28 meld-0.6.4 +===================== + + * Fix bug where deep directories were not correctly handled + + * Dont refresh cvs view every time we open a diff. + + * Filebrowser focus now switches to next entry when an entry is activated. + + * Allow unnamed buffers ("cut and paste" diffs) + +2002-12-14 meld-0.6.3 +===================== + + * Meld can now edit non utf8 files by explicitly specifying the encoding. + + * CVS browser now cleans up temporary files correctly. + + * CVS browser shows currently executing actions. + + * CVS browser commit dialog added. + + * Added preferences dialog. + +2002-11-26 meld-0.6.2 +===================== + + * Add missing pixmaps for directory diff. + + * Set about dialog properties correctly. + + * Fail if new style pygtk not present. (pygtk.require()) + + * Remove #! from non executable files. + + * Set copyright correctly. + +2002-11-12 meld-0.6.1 +===================== + + * Added colouring for modified/missing files in dirdiff. + + * Added icons for dirdiff. + + * Added new simple draw style. + +2002-11-04 meld-0.6.0 +===================== + + * Ask to save modified files on exit. + + * Added settings menu for linkmap drawing style. + + * Added alpha directory differ. + + * Directory and file comparison can dynamically switch from 1,2,3 panes. + + * Toolbar made smaller. + +2002-10-01 meld-0.5.4 +===================== + + * Make cvsview work when not called from the command line. + + * Fix bug where deletes were not highlighted. Fix + bug where inserts were not clickable. + +2002-09-27 meld-0.5.3 +===================== + + * Now works with both latest and older pygtk (Ross Burton). + + * HIG patches (Ross Burton). + + * Smarten up notebook labels. + + * Fix bug where deletes were not highlighted. + + * Fix bug where inserts were not clickable. + +2002-08-18 meld-0.5.2 +===================== + + * diff3 now fully functional (merging buttons etc) + + * new cvs icons. Thanks to Jakub "Jimmac" Steiner for + the icons and to Ross Burton for the suggestion. + +2002-08-04 meld-0.5.1 +===================== + + * Allow for different font sizes. + +2002-08-04 meld-0.5 +=================== + + * No notes. + +2002-07-19 meld-0.4 +=================== + + * Remove test files from release + +2002-07-19 meld-0.4 +=================== + + * Edit files in place. Diffs update dynamically. + + * Middle column shows detailed changes, and allows merges + + * User friendly diff browsing + + * Margins show location of changes + + * Tabbed interface - open many diffs at once + + * Next/prev diff + + * Unlimited undo + + * Preliminary CVS integration. (meld.py -C) + + * Preliminary diff3 support. + +2002-06-14 meld-0.3 +=================== + + * remove some debugging code + +2002-06-12 meld-0.2 +=================== + + * Added file/save plus accelerators. + + * Allow app to be run from different directory. + + * Add groups to undo. Undo/redo works properly for merging. + + * Added undo/redo for single doc. Added timeouts for updating diff delay. + + * Added merge buttons. Added next/prev diff scrolling (mousewheel) + + * Added changed text highlight + + * Move common functionality into a base class + + * Improve performance for diff map of large files. + + * Diffcomponent now has 'files-changed' signal. Move main + to own function to avoid creating globals inadvertently. + + * Add new filediff2 dialog. Added refresh button. + +2002-05-18 meld-0.1 +=================== + + * Developers test release 1 --- meld-1.3.1.orig/debian/meld.menu +++ meld-1.3.1/debian/meld.menu @@ -0,0 +1,2 @@ +?package(meld):needs="X11" section="Applications/Programming" \ + title="Meld" command="/usr/bin/meld" --- meld-1.3.1.orig/debian/changelog +++ meld-1.3.1/debian/changelog @@ -0,0 +1,317 @@ +meld (1.3.1-0ubuntu1) lucid; urgency=low + + * Update from new upstream version + + -- Jeroen de Vries (CMF) Tue, 06 Apr 2010 22:28:40 +0200 + +meld (1.3.0-2ubuntu1) lucid; urgency=low + + * Backport fix from upstream GIT for UI glitches (LP: #505285) + - 01-invisible-merge-arrows-base.patch: changes required by next patch + - 02-invisible-merge-arrows.patch: fix missing arrows in a 3 way comparison + + -- Matthew James Wild Sat, 13 Mar 2010 15:53:05 +0000 + +meld (1.3.0-2) unstable; urgency=low + + * 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. + + -- Emilio Pozuelo Monfort Tue, 01 Sep 2009 20:16:33 +0200 + +meld (1.3.0-1) unstable; urgency=low + + * 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 + + -- Ross Burton Tue, 02 Jun 2009 10:00:20 +0100 + +meld (1.2.1-1) unstable; urgency=low + + * New upstream release (Closes: #513609, #500629, #473091, #456530, #473487) + * Refresh makefile.patch + * pythonpath.patch: prepend instead of append private path (Closes: #471154) + * Fix menu section + + -- Ross Burton Wed, 18 Feb 2009 17:42:15 +0000 + +meld (1.1.5.1-2) unstable; urgency=low + + * Really change python-gnome2-extras to -desktop (Closes: #444350) + * Also really recommend yelp. + + -- Ross Burton Fri, 28 Sep 2007 15:46:03 +0100 + +meld (1.1.5.1-1) unstable; urgency=low + + * New upstream release. + * Add Recommends to Yelp so that help works (Closes: #421832) + * When sourceview can't be found, tell the user what package to + install (Closes: #415683) + * Change python-gnome2-extras to python-gnome2-desktop + + -- Ross Burton Tue, 4 Sep 2007 09:20:43 +0100 + +meld (1.1.5-1) unstable; urgency=low + + * 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. + + -- Loic Minier Sat, 09 Jun 2007 20:35:36 +0200 + +meld (1.1.4-1) unstable; urgency=low + + * Acknowledge NMU + * New upstream release (Closes: #382055) + - Tab width fixes (Closes: #372587) + + -- Ross Burton Fri, 27 Apr 2007 10:02:37 +0100 + +meld (1.1.3-1.2) unstable; urgency=medium + + * Non-maintainer upload to fix build failure. + * Remove duplicate plurals for languages with only one nplurals; + fixes build failure with newer gettext (Closes: #385177). + + -- Thijs Kinkhorst Fri, 15 Sep 2006 14:09:05 +0200 + +meld (1.1.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update package to the new python policy (Closes: #380868): + + use dh_pysupport instead of dh_python. + + remove custom postinst. + * Bump Standards-Version to 3.7.2. + * Fix B-D versus B-D-I for cdbs, and debhelper. + + -- Pierre Habouzit Thu, 10 Aug 2006 19:02:41 +0200 + +meld (1.1.3-1) unstable; urgency=low + + * New upstream release (closes: #355022) + - remove fr.diff, fixed upstream + - add scrollkeeper.diff, to fix up Scrollkeeper + + -- Ross Burton Fri, 3 Mar 2006 10:26:17 +0000 + +meld (1.1.2-1) unstable; urgency=low + + * New upstream release (closes: #341184) + + -- Ross Burton Thu, 8 Dec 2005 11:25:19 +0000 + +meld (1.1.1-2) unstable; urgency=low + + * debian/copyright: Fix FSF address. + * debian/rules: Package upstream changelog (closes: #337665) + + -- Ross Burton Sun, 6 Nov 2005 13:13:40 +0000 + +meld (1.1.1-1) unstable; urgency=low + + * New upstream release. + * Increase Standards Version. + + -- Ross Burton Sat, 29 Oct 2005 14:33:08 +0100 + +meld (1.0.0-1) unstable; urgency=low + + * New upstream release (closes: #329628) + * Recommend python-gnome2-extras for pygtksourceview (closes: #310808) + * debian/patches/fr.diff: from upstream to fix French translation + + -- Ross Burton Fri, 23 Sep 2005 14:13:58 +0100 + +meld (0.9.4.1+20050125-4) unstable; urgency=low + + * Add debian/watch + * Fix typo in man page (closes: #298732) + + -- Ross Burton Thu, 31 Mar 2005 11:18:16 +0100 + +meld (0.9.4.1+20050125-3) unstable; urgency=low + + * Build-dep on scrollkeeper (closes: #292950) + + -- Ross Burton Mon, 31 Jan 2005 15:39:44 +0000 + +meld (0.9.4.1+20050125-2) unstable; urgency=low + + * Don't install meld.applications, GNOME currently doesn't support + registering against directory MIME types (closes: #292805) + + -- Ross Burton Sun, 30 Jan 2005 14:44:27 +0000 + +meld (0.9.4.1+20050125-1) unstable; urgency=low + + * Snapshot from CVS (closes: #291914) + - Depends on new libglade (closes: #287167) + * Move to CDBS + * Lower-case the synopsis + + -- Ross Burton Fri, 13 Aug 2004 18:31:01 +0100 + +meld (0.9.4.1-1) unstable; urgency=low + + * New upstream release (closes: #262632) + + -- Ross Burton Wed, 11 Aug 2004 08:10:28 +0100 + +meld (0.9.3-1) unstable; urgency=low + + * New upstream release (closes: #253113) + * Handles both_horiz and -horiz (closes: #218045) + + -- Ross Burton Mon, 7 Jun 2004 10:57:36 +0100 + +meld (0.9.2.1-2) unstable; urgency=low + + * Add Build-Depend on intltool (closes: #235090) + + -- Ross Burton Mon, 1 Mar 2004 12:15:44 +0000 + +meld (0.9.2.1-1) unstable; urgency=low + + * New upstream release + * debian/rules: rewrite now upstream makefile uses $DISTDIR + * debian/menu: add quotes + + -- Ross Burton Wed, 18 Feb 2004 08:57:29 +0000 + +meld (0.9.0-1) unstable; urgency=low + + * New upstream release + * Install upstream changelog + * Install documentation stylesheet + + -- Ross Burton Mon, 13 Oct 2003 17:37:08 +0100 + +meld (0.8.5-1) unstable; urgency=low + + * New upstream release + + -- Ross Burton Tue, 2 Sep 2003 19:01:26 +0100 + +meld (0.8.4-2) unstable; urgency=low + + * Rebuild for python 2.3 (closes: #204812) + * Move to Standard 3.6.0. + + -- Ross Burton Mon, 11 Aug 2003 11:18:17 +0100 + +meld (0.8.4-1) unstable; urgency=low + + * New upstream release + * Cut/Copy/Paste shortcuts now work (closes: #184290) + + -- Ross Burton Thu, 31 Jul 2003 12:42:08 +0100 + +meld (0.8.2-1) unstable; urgency=low + + * New upstream release + + -- Ross Burton Tue, 24 Jun 2003 08:58:17 +0100 + +meld (0.8.1-1) unstable; urgency=low + + * New upstream release + + -- Ross Burton Tue, 20 May 2003 15:38:33 +0100 + +meld (0.7.1-2) unstable; urgency=low + + * debian/control: Move to section 'gnome'. + + -- Ross Burton Tue, 29 Apr 2003 12:38:42 +0100 + +meld (0.7.1-1) unstable; urgency=low + + * New upstream release + * Updated debian/* for new debian.org email address. + + -- Ross Burton Tue, 29 Apr 2003 11:24:28 +0100 + +meld (0.7.0-1) unstable; urgency=low + + * New upstream release + + -- Ross Burton Thu, 27 Mar 2003 17:38:03 +0000 + +meld (0.6.6-2) unstable; urgency=low + + * Move Python code to /usr/lib/meld. + * Remove /usr/share/meld/*.py[co] in postinst. + + -- Ross Burton Fri, 28 Feb 2003 09:22:19 +0000 + +meld (0.6.6-1) unstable; urgency=low + + * New upstream release. + * Bump to debhelper version 4, Standards 3.5.8. + * Use dh_python. + + -- Ross Burton Fri, 14 Feb 2003 08:55:01 +0000 + +meld (0.6.4-1) unstable; urgency=low + + * New upstream release + + -- Ross Burton Thu, 30 Jan 2003 11:25:00 +0000 + +meld (0.6.3-2) unstable; urgency=low + + * Fix directory diff with a patch from upstream. (closes: #169875) + + -- Ross Burton Sat, 21 Dec 2002 15:18:12 +0000 + +meld (0.6.3-1) unstable; urgency=low + + * New upstream release + * Require a specific version of python-gtk2, as we expect the new + layout. (closes: #172048) + + -- Ross Burton Sun, 15 Dec 2002 16:55:56 +0000 + +meld (0.6.2-1) unstable; urgency=low + + * New upstream release (closes: #171018) + * This release has included some missing images (closes: #169875) + + -- Ross Burton Wed, 27 Nov 2002 12:37:17 +0000 + +meld (0.6.1-1) unstable; urgency=low + + * Initial Release. (closes: #163421) + + -- Ross Burton Wed, 13 Nov 2002 08:31:18 +0000 --- meld-1.3.1.orig/debian/compat +++ meld-1.3.1/debian/compat @@ -0,0 +1 @@ +5 --- meld-1.3.1.orig/debian/copyright +++ meld-1.3.1/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Ross Burton on +Fri, 20 Sep 2002 18:46:55 +0100. + +It was downloaded from: + + +Copyright (C) 2002 - 2008 Stephen Kennedy + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- meld-1.3.1.orig/debian/control.in +++ meld-1.3.1/debian/control.in @@ -0,0 +1,29 @@ +Source: meld +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Burton +Build-Depends: debhelper (>= 5), + cdbs, + gnome-pkg-tools +Build-Depends-Indep: python, + python-support (>= 0.4.0), + intltool, + scrollkeeper +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.3 +XS-Python-Version: >= 2.3 + +Package: meld +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gtk2 (>= 2.4), + python-glade2 (>= 2.4) +Recommends: yelp, + python-gnome2, + python-gconf +XB-Python-Version: ${python:Versions} +Description: graphical tool to diff and merge files + Meld is a tool which allows the user to see the changes in, and merge between, + either two files, two directories, or two files with a common ancestor. --- meld-1.3.1.orig/debian/watch +++ meld-1.3.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/meld/([\d\.]+)/meld-([\d\.]+)\.tar\.gz --- meld-1.3.1.orig/debian/pycompat +++ meld-1.3.1/debian/pycompat @@ -0,0 +1 @@ +2 --- meld-1.3.1.orig/debian/control +++ meld-1.3.1/debian/control @@ -0,0 +1,34 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: meld +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Burton +Build-Depends: debhelper (>= 5), + cdbs, + gnome-pkg-tools +Build-Depends-Indep: python, + python-support (>= 0.4.0), + intltool, + scrollkeeper +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Loic Minier , Ross Burton +Standards-Version: 3.8.3 +XS-Python-Version: >= 2.3 + +Package: meld +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, + python-gtk2 (>= 2.4), + python-glade2 (>= 2.4) +Recommends: yelp, + python-gnome2, + python-gconf +XB-Python-Version: ${python:Versions} +Description: graphical tool to diff and merge files + Meld is a tool which allows the user to see the changes in, and merge between, + either two files, two directories, or two files with a common ancestor. --- meld-1.3.1.orig/debian/meld.1 +++ meld-1.3.1/debian/meld.1 @@ -0,0 +1,31 @@ +.\" Hey, EMACS: -*- nroff -*- +.TH MELD 1 "September 20, 2002" +.SH NAME +meld \- compare and merge files +.SH SYNOPSIS +.B meld +.RI "directory" +.br +.B meld +.RI "file1 file2 [file3]" +.SH DESCRIPTION +This manual page documents briefly the +.B meld +command. +This manual page was written for the Debian distribution +because the original program does not have a manual page. +.PP +\fBmeld\fP is a program that graphically displays the difference +between two files, and allows the user to merge the changes +individually. It also does three-way merge, that is it shows the +differences between two files which have a common ancestor, and allows +the user to merge both sets of changes into a new file. +.PP +Meld can also be used with CVS, allowing you to view the changes +you have made locally and merge with the latest revision available. +.SH SEE ALSO +.BR diff (1), +.BR cvs (1). +.SH AUTHOR +This manual page was written by Ross Burton , for the +Debian GNU/Linux system (but may be used by others). --- meld-1.3.1.orig/debian/rules +++ meld-1.3.1/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_INSTALL_CHANGELOGS_ALL += changelog + +DEB_MAKE_INVOKE += prefix=/usr +DEB_MAKE_BUILD_TARGET := all +DEB_MAKE_INSTALL_TARGET := DESTDIR=$(CURDIR)/debian/meld install + +binary-install/meld:: + dh_pysupport -p$(cdbs_curpkg) + +binary-post-install/meld:: + rm -rf debian/$(cdbs_curpkg)/usr/share/application-registry --- meld-1.3.1.orig/debian/meld.manpages +++ meld-1.3.1/debian/meld.manpages @@ -0,0 +1 @@ +debian/meld.1 --- meld-1.3.1.orig/debian/patches/sourceview-package.patch +++ meld-1.3.1/debian/patches/sourceview-package.patch @@ -0,0 +1,13 @@ +=== modified file 'meldapp.py' +--- meldapp.py 2009-06-02 09:05:19 +0000 ++++ meldapp.py 2009-06-02 09:07:06 +0000 +@@ -218,7 +218,7 @@ + self.checkbutton_show_line_numbers.set_sensitive(False) + self.checkbutton_use_syntax_highlighting.set_sensitive(False) + if gtk.pygtk_version >= (2, 12, 0): +- no_sourceview_text = _("Only available if you have gnome-python-desktop installed") ++ no_sourceview_text = _("Only available if you have python-gtksourceview2 installed") + self.checkbutton_spaces_instead_of_tabs.set_tooltip_text(no_sourceview_text) + self.checkbutton_show_line_numbers.set_tooltip_text(no_sourceview_text) + self.checkbutton_use_syntax_highlighting.set_tooltip_text(no_sourceview_text) + --- meld-1.3.1.orig/debian/patches/01-invisible-merge-arrows-base.patch +++ meld-1.3.1/debian/patches/01-invisible-merge-arrows-base.patch @@ -0,0 +1,176 @@ +Backported to Meld 1.3.0 from Meld GIT +Author: Matthew Wild +Original-Author: Piotr Piastucki +Commit: 516cc2576abc49d32a7d1176467387e4ede7e714 + +diff -Nur -x '*.orig' -x '*~' meld-1.3.1/filediff.py meld-1.3.1.new/filediff.py +--- meld-1.3.1/filediff.py 2009-08-14 07:01:33.000000000 +0200 ++++ meld-1.3.1.new/filediff.py 2010-04-06 22:31:51.992992361 +0200 +@@ -1191,16 +1191,13 @@ + break + return lo,hi + +- # +- # linkmap drawing +- # +- def on_linkmap_expose_event(self, widget, event): +- wtotal, htotal = widget.allocation.width, widget.allocation.height +- context = widget.window.cairo_create() +- context.rectangle(event.area.x, event.area.y, event.area.width, event.area.height) +- context.clip() +- context.set_line_width(1.0) ++ def paint_pixbuf_at(self, context, pixbuf, x, y): ++ context.translate(x, y) ++ context.set_source_pixbuf(pixbuf, 0, 0) ++ context.paint() ++ context.identity_matrix() + ++ def _linkmap_draw_icon(self, context, which, change, x, f0, t0): + if self.keymask & MASK_SHIFT: + pix0 = self.pixbuf_delete + pix1 = self.pixbuf_delete +@@ -1210,6 +1207,21 @@ + else: # self.keymask == 0: + pix0 = self.pixbuf_apply0 + pix1 = self.pixbuf_apply1 ++ if change in ("insert", "replace"): ++ self.paint_pixbuf_at(context, pix1, x, t0) ++ if change in ("delete", "replace"): ++ self.paint_pixbuf_at(context, pix0, 0, f0) ++ ++ # ++ # linkmap drawing ++ # ++ def on_linkmap_expose_event(self, widget, event): ++ wtotal, htotal = widget.allocation.width, widget.allocation.height ++ yoffset = widget.allocation.y ++ context = widget.window.cairo_create() ++ context.rectangle(event.area.x, event.area.y, event.area.width, event.area.height) ++ context.clip() ++ context.set_line_width(1.0) + + which = self.linkmap.index(widget) + pix_start = [None] * self.num_panes +@@ -1223,12 +1235,6 @@ + # For bezier control points + x_steps = [-0.5, (1. / 3) * wtotal, (2. / 3) * wtotal, wtotal + 0.5] + +- def paint_pixbuf_at(pixbuf, x, y): +- context.translate(x, y) +- context.set_source_pixbuf(pixbuf, 0, 0) +- context.paint() +- context.identity_matrix() +- + for c in self.linediffer.pair_changes(which, which + 1): + c, skip = self._consume_blank_lines(c, which, which + 1) + if skip: +@@ -1261,10 +1267,7 @@ + context.stroke() + + x = wtotal-self.pixbuf_apply0.get_width() +- if c[0] in ("insert", "replace"): +- paint_pixbuf_at(pix1, x, t0) +- if c[0] in ("delete", "replace"): +- paint_pixbuf_at(pix0, 0, f0) ++ self._linkmap_draw_icon(context, which, c[0], x, f0, t0) + + # allow for scrollbar at end of textview + mid = int(0.5 * self.textview[0].allocation.height) + 0.5 +@@ -1276,6 +1279,23 @@ + def on_linkmap_scroll_event(self, area, event): + self.next_diff(event.direction) + ++ def _linkmap_process_event(self, event, which, side, htotal, rect_x, pix_width, pix_height): ++ src = which + side ++ dst = which + 1 - side ++ adj = self.scrolledwindow[src].get_vadjustment() ++ ++ for c in self.linediffer.pair_changes(src, dst, self._get_texts()): ++ if c[0] == "insert": ++ continue ++ h = self._line_to_pixel(src, c[1]) - adj.value ++ if h < 0: # find first visible chunk ++ continue ++ elif h > htotal: # we've gone past last visible ++ break ++ elif h < event.y and event.y < h + pix_height: ++ self.mouse_chunk = ((src, dst), (rect_x, h, pix_width, pix_height), c) ++ break ++ + def on_linkmap_button_press_event(self, area, event): + if event.button == 1: + self.focus_before_click = None +@@ -1302,24 +1322,7 @@ + rect_x = wtotal - pix_width + else: + return True +- src = which + side +- dst = which + 1 - side +- adj = self.scrolledwindow[src].get_vadjustment() +- +- for c in self.linediffer.pair_changes(src, dst): +- c, skip = self._consume_blank_lines(c, src, dst) +- if skip: +- continue +- if c[0] == "insert": +- continue +- h = self._line_to_pixel(src, c[1]) - adj.value +- if h < 0: # find first visible chunk +- continue +- elif h > htotal: # we've gone past last visible +- break +- elif h < event.y and event.y < h + pix_height: +- self.mouse_chunk = ( (src,dst), (rect_x, h, pix_width, pix_height), c) +- break ++ self._linkmap_process_event(event, which, side, htotal, rect_x, pix_width, pix_height) + #print self.mouse_chunk + return True + return False +diff -Nur -x '*.orig' -x '*~' meld-1.3.1/filediff.py.rej meld-1.3.1.new/filediff.py.rej +--- meld-1.3.1/filediff.py.rej 1970-01-01 01:00:00.000000000 +0100 ++++ meld-1.3.1.new/filediff.py.rej 2010-04-06 22:30:06.165456042 +0200 +@@ -0,0 +1,44 @@ ++--- filediff.py 2009-04-17 23:48:10.000000000 +0100 +++++ filediff.py 2010-03-13 15:28:55.000000000 +0000 ++@@ -1132,12 +1144,6 @@ ++ # For bezier control points ++ x_steps = [-0.5, (1. / 3) * wtotal, (2. / 3) * wtotal, wtotal + 0.5] ++ ++- def paint_pixbuf_at(pixbuf, x, y): ++- context.translate(x, y) ++- context.set_source_pixbuf(pixbuf, 0, 0) ++- context.paint() ++- context.identity_matrix() ++- ++ for c in self.linediffer.pair_changes(which, which+1, self._get_texts()): ++ if self.prefs.ignore_blank_lines: ++ c1,c2 = self._consume_blank_lines( self._get_texts()[which ][c[1]:c[2]] ) ++@@ -1233,27 +1253,7 @@ ++ rect_x = wtotal - pix_width ++ else: ++ return True ++- src = which + side ++- dst = which + 1 - side ++- adj = self.scrolledwindow[src].get_vadjustment() ++- ++- for c in self.linediffer.pair_changes(src, dst, self._get_texts()): ++- if self.prefs.ignore_blank_lines: ++- c1,c2 = self._consume_blank_lines( self._get_texts()[src][c[1]:c[2]] ) ++- c3,c4 = self._consume_blank_lines( self._get_texts()[dst][c[3]:c[4]] ) ++- c = c[0], c[1]+c1,c[2]-c2, c[3]+c3,c[4]-c4 ++- if c[1]==c[2] and c[3]==c[4]: ++- continue ++- if c[0] == "insert": ++- continue ++- h = self._line_to_pixel(src, c[1]) - adj.value ++- if h < 0: # find first visible chunk ++- continue ++- elif h > htotal: # we've gone past last visible ++- break ++- elif h < event.y and event.y < h + pix_height: ++- self.mouse_chunk = ( (src,dst), (rect_x, h, pix_width, pix_height), c) ++- break +++ self._linkmap_process_event(event, which, side, htotal, rect_x, pix_width, pix_height) ++ #print self.mouse_chunk ++ return True ++ return False --- meld-1.3.1.orig/debian/patches/pythonpath.patch +++ meld-1.3.1/debian/patches/pythonpath.patch @@ -0,0 +1,31 @@ +diff -Nur -x '*.orig' -x '*~' meld-1.3.1/meld meld-1.3.1.new/meld +--- meld-1.3.1/meld 2009-08-14 07:01:33.000000000 +0200 ++++ meld-1.3.1.new/meld 2010-04-06 22:35:55.448635774 +0200 +@@ -29,8 +29,8 @@ + # + # i18n support + # +-sys.path[0:0] = [ #LIBDIR# +-] ++sys.path.insert(0, #LIBDIR#) ++ + import paths + import gettext + _ = gettext.gettext +diff -Nur -x '*.orig' -x '*~' meld-1.3.1/meld.rej meld-1.3.1.new/meld.rej +--- meld-1.3.1/meld.rej 1970-01-01 01:00:00.000000000 +0100 ++++ meld-1.3.1.new/meld.rej 2010-04-06 22:33:14.712619844 +0200 +@@ -0,0 +1,13 @@ ++--- meld 2009-02-18 20:13:45.000000000 +0000 +++++ meld 2009-02-18 20:38:54.000000000 +0000 ++@@ -29,8 +29,8 @@ ++ # ++ # i18n support ++ # ++-sys.path += [ #LIBDIR# ++-] +++sys.path.insert(0, #LIBDIR#) +++ ++ import paths ++ import gettext ++ from gettext import gettext as _ --- meld-1.3.1.orig/debian/patches/02-invisible-merge-arrows.patch +++ meld-1.3.1/debian/patches/02-invisible-merge-arrows.patch @@ -0,0 +1,39 @@ +Backported to Meld 1.3.0 from Meld GIT +Author: Matthew Wild +Original-Author: Kai Willadsen +Commit: 4e3a717a6c4f97a17b9bae03f7f0618a170ade3c + +--- a/filediff.py 2010-03-13 14:57:09.000000000 +0000 ++++ b/filediff.py 2010-03-13 14:57:12.000000000 +0000 +@@ -1104,9 +1104,11 @@ + else: # self.keymask == 0: + pix0 = self.pixbuf_apply0 + pix1 = self.pixbuf_apply1 +- if change in ("insert", "replace"): ++ if change[0] in ("insert", "replace") or (change[0] == "conflict" and ++ change[3] - change[4] != 0): + self.paint_pixbuf_at(context, pix1, x, t0) +- if change in ("delete", "replace"): ++ if change[0] in ("delete", "replace") or (change[0] == "conflict" and ++ change[1] - change[2] != 0): + self.paint_pixbuf_at(context, pix0, 0, f0) + + # +@@ -1172,7 +1174,7 @@ + context.stroke() + + x = wtotal-self.pixbuf_apply0.get_width() +- self._linkmap_draw_icon(context, which, c[0], x, f0, t0) ++ self._linkmap_draw_icon(context, which, c, x, f0, t0) + + # allow for scrollbar at end of textview + mid = int(0.5 * self.textview[0].allocation.height) + 0.5 +@@ -1190,7 +1192,7 @@ + adj = self.scrolledwindow[src].get_vadjustment() + + for c in self.linediffer.pair_changes(src, dst, self._get_texts()): +- if c[0] == "insert": ++ if c[0] == "insert" or (c[0] == "conflict" and c[1] - c[2] == 0): + continue + h = self._line_to_pixel(src, c[1]) - adj.value + if h < 0: # find first visible chunk