Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2013-04-24 10:47:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meld", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2013-03-08 09:22:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2013-04-24 10:47:26.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Apr 16 17:14:56 UTC 2013 - [email protected] + +- Update to version 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. + - The "Ignore blank lines" setting is now used in folder + comparisons, in same manner as text filters. + + Fixes: + - Many minor Windows compatibility fixes. + - Version control compatibility updates and fixes. + - Better handling of Unicode filenames. + - Better support for cross-platform newline behaviour, + particularly on Windows. + - Sensitivity fixes for file and folder comparisons. + - Build and installation fixes. + + Updated translations. +- Drop meld-no-updates.patch: no longer needed when installing to + DESTDIR. + +------------------------------------------------------------------- Old: ---- meld-1.7.1.tar.xz meld-no-updates.patch New: ---- meld-1.7.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.WiMrS2/_old 2013-04-24 10:47:35.000000000 +0200 +++ /var/tmp/diff_new_pack.WiMrS2/_new 2013-04-24 10:47:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: meld -Version: 1.7.1 +Version: 1.7.2 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ @@ -26,8 +26,6 @@ Source: http://download.gnome.org/sources/meld/1.7/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch [email protected] -- don't use env Patch1: %{name}-1.3.0-env.patch -# PATCH-FIX-OPENSUSE meld-no-updates.patch [email protected] -- Do not execute mime-cache-update and desktop-database-update in the buildroot. We do not package the cache files -Patch2: meld-no-updates.patch BuildRequires: fdupes # Needed for highcolor macros BuildRequires: hicolor-icon-theme @@ -74,7 +72,6 @@ %setup -q translation-update-upstream %patch1 -%patch2 -p1 %build make prefix=%{_prefix} libdir=%{_datadir} @@ -84,7 +81,7 @@ # Remove scrollkeeper files rm -rf %{buildroot}%{_prefix}%{_localstatedir}/lib/scrollkeeper %find_lang %{name} %{?no_lang_C} -%suse_update_desktop_file -G "Diff Viewer" meld IDE +%suse_update_desktop_file meld IDE %fdupes %{buildroot}%{_datadir} %clean ++++++ meld-1.7.1.tar.xz -> meld-1.7.2.tar.xz ++++++ ++++ 10220 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
