commit meld for openSUSE:Factory

2020-02-18 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2020-02-18 13:29:12

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new.26092 (New)


Package is "meld"

Tue Feb 18 13:29:12 2020 rev:70 rq:775015 version:3.20.2

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2020-01-27 
00:24:25.805553322 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new.26092/meld.changes 2020-02-18 
13:29:16.684687658 +0100
@@ -1,0 +2,14 @@
+Sun Feb 16 12:38:05 UTC 2020 - bjorn@gmail.com
+
+- Update to version 3.20.2:
+  + Fix display of large file sizes.
+  + Set file chooser encoding to autodetect by default.
+  + Fix ignoring blank lines on text-filtered files in folder
+comparison.
+  + Fix expand/collapse actions for missing folders.
+  + Fix some incorrect action sensitivity settings.
+  + Fix height of commit dialog.
+  + Fix install support for Python 3.8.
+  + Updated translations.
+
+---

Old:

  meld-3.20.1.tar.xz

New:

  meld-3.20.2.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.DdGeOt/_old  2020-02-18 13:29:17.172688607 +0100
+++ /var/tmp/diff_new_pack.DdGeOt/_new  2020-02-18 13:29:17.180688623 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.20.1
+Version:3.20.2
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0-or-later

++ meld-3.20.1.tar.xz -> meld-3.20.2.tar.xz ++
 8397 lines of diff (skipped)




commit meld for openSUSE:Factory

2020-01-26 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2020-01-27 00:24:06

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new.26092 (New)


Package is "meld"

Mon Jan 27 00:24:06 2020 rev:69 rq:767378 version:3.20.1

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2019-04-01 
12:40:10.893967526 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new.26092/meld.changes 2020-01-27 
00:24:25.805553322 +0100
@@ -1,0 +2,5 @@
+Sat Jan 25 14:18:08 UTC 2020 - Dominique Leuenberger 
+
+- No longer recommend -lang: supplements are in use
+
+---



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.4Udccp/_old  2020-01-27 00:24:26.765553775 +0100
+++ /var/tmp/diff_new_pack.4Udccp/_new  2020-01-27 00:24:26.765553775 +0100
@@ -43,7 +43,6 @@
 Requires:   patch
 Requires:   python3-cairo
 Requires:   python3-gobject-Gdk
-Recommends: %{name}-lang
 # Suggest various vcs that meld can handle
 Suggests:   bzr
 Suggests:   cvs




commit meld for openSUSE:Factory

2019-04-01 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2019-04-01 12:40:06

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new.25356 (New)


Package is "meld"

Mon Apr  1 12:40:06 2019 rev:68 rq:690201 version:3.20.1

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2019-01-21 
10:49:05.796111380 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new.25356/meld.changes 2019-04-01 
12:40:10.893967526 +0200
@@ -1,0 +2,12 @@
+Sun Mar 31 09:17:02 UTC 2019 - Michael Ströder 
+
+- Update to version 3.20.1:
+  + Fix bad comparison highlighting with VT characters.
+  + Fix folder comparison display with >2G files.
+  + Fix support for missing folders in folder comparison.
+  + Handle trash-related errors with NFS mounts.
+  + Add release metadata to appstream data.
+  + Issues fixed: glgo#GNOME/meld#268, glgo#GNOME/meld#295.
+  + Updated translations.
+
+---

Old:

  meld-3.20.0.tar.xz

New:

  meld-3.20.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.tXVQMK/_old  2019-04-01 12:40:11.893968011 +0200
+++ /var/tmp/diff_new_pack.tXVQMK/_new  2019-04-01 12:40:11.901968015 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.20.0
+Version:3.20.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0-or-later

++ meld-3.20.0.tar.xz -> meld-3.20.1.tar.xz ++
 9548 lines of diff (skipped)




commit meld for openSUSE:Factory

2019-01-21 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2019-01-21 10:48:25

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new.28833 (New)


Package is "meld"

Mon Jan 21 10:48:25 2019 rev:67 rq:664083 version:3.20.0

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2018-04-11 
13:56:34.802541101 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new.28833/meld.changes 2019-01-21 
10:49:05.796111380 +0100
@@ -1,0 +2,26 @@
+Sun Jan  6 00:51:20 UTC 2019 - bjorn@gmail.com
+
+- Update to version 3.20.0:
+  + Add Enter as a Compare accelerator in folder comparisons.
+  + Change entry and drag-n-drop file changes to confirm discarding
+modified files instead of offering to save, for simplicity.
+  + Fix menu sensitivity in folder comparisons.
+  + Avoid dconf writes of no-op window size allocations.
+  + Issues fixed: glgo#GNOME/meld#262, glgo#GNOME/meld#247.
+  + Updated translations.
+
+---
+Sun Dec 16 13:12:24 UTC 2018 - astie...@suse.com
+
+- Meld 3.19.1:
+  + Support comparing remote files
+  + Significantly improve folder comparison performance when
+comparing large trees
+  + Improve folder comparison IO and memory use
+  + Add recursive collapse/expand actions to folder comparisons
+  + Add OARS metadata for software management
+  + Support file drag-and-drop directly on to textviews
+  + Refresh the application icon and add a processing pipeline
+  + various bug fixes and translation updates
+
+---

Old:

  meld-3.19.0.tar.xz

New:

  meld-3.20.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.2CvSjU/_old  2019-01-21 10:49:06.572110433 +0100
+++ /var/tmp/diff_new_pack.2CvSjU/_new  2019-01-21 10:49:06.576110427 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +12,22 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   meld
-Version:3.19.0
+Version:3.20.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0-or-later
 Group:  Development/Tools/Other
 URL:http://meldmerge.org/
-Source: 
http://download.gnome.org/sources/meld/3.19/%{name}-%{version}.tar.xz
+Source0:
https://download.gnome.org/sources/meld/3.20/%{name}-%{version}.tar.xz
+
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
+
 BuildRequires:  fdupes
 # Needed for typelib() Requires
 BuildRequires:  gobject-introspection-devel
@@ -45,13 +47,13 @@
 # Suggest various vcs that meld can handle
 Suggests:   bzr
 Suggests:   cvs
+# Not in Factory, but still in OBS
+Suggests:   darcs
 Suggests:   fossil
 Suggests:   git
 Suggests:   mercurial
-Suggests:   subversion
-# Not in Factory, but still in OBS
-Suggests:   darcs
 Suggests:   monotone
+Suggests:   subversion
 Suggests:   tla
 #
 BuildArch:  noarch
@@ -71,8 +73,7 @@
 %lang_package
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 translation-update-upstream
 
 %build
@@ -84,7 +85,7 @@
 --no-compile-schemas \
 install --root %{buildroot} --prefix %{_prefix}
 %find_lang %{name} %{?no_lang_C}
-%suse_update_desktop_file meld IDE
+%suse_update_desktop_file org.gnome.meld IDE
 %fdupes %{buildroot}%{_datadir}
 
 %if 0%{?suse_version} < 1330
@@ -109,13 +110,13 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %dir %{_datadir}/metainfo/
-%{_datadir}/metainfo/meld.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/metainfo/org.gnome.meld.appdata.xml
+%{_datadir}/applications/org.gnome.meld.desktop
 %{_datadir}/glib-2.0/schemas/org.gnome.meld.gschema.xml
 %doc %{_datadir}/help/C/meld/
-%{_datadir}/icons/hicolor/*/*/%{name}*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/HighContrast/
-%{_datadir}/mime/packages/meld.xml
+%{_datadir}/mime/packages/org.gnome.meld.xml
 %{_mandir}/man1/meld.1%{?ext_man}
 %{python3_sitelib}/meld/
 %{python3_sitelib}/meld*egg-info*

++ meld-3.19.0.tar.xz -> meld-3.20.0.tar.xz ++
 26672 

commit meld for openSUSE:Factory

2018-04-11 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2018-04-11 13:56:31

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Wed Apr 11 13:56:31 2018 rev:66 rq:592380 version:3.19.0

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2018-03-24 
16:14:43.260923073 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2018-04-11 
13:56:34.802541101 +0200
@@ -1,0 +2,42 @@
+Wed Mar 28 03:42:15 UTC 2018 - luc1...@linuxmail.org
+
+- Update to version 3.19.0:
+  + Features:
+- Add new per-pane status bar with selectors for syntax
+  highlighting and text encoding;
+- Allow text encoding to be chosen from file selectors;
+- Add new go-to-line action and UI;
+- Folder comparison now explicitly indicates symlinks in the
+  tree, and shows the symlink target;
+- Inline highlighting now draws whitespace in any changes it
+  covers;
+- Navigating between changes in file comparison now briefly
+  animates the outline, to make it easier to keep track of the
+  focus in busy comparisons.
+  + Fixes:
+- Handle file deletion where we can't move to trash (e.g.,
+  network mounts);
+- Keybindings for notebook switching work again;
+- Threading fixes for more responsive highlighting and better
+  exit handling;
+- Memory and file handle leakage for closed comparisons;
+- Make the --auto-compare and multiple --diff command line
+  options work again;
+- Avoid a race condition that made the "Resolve conflict"
+  prompt unreliable;
+- Invalid-iter crash when refreshing version control view;
+- Make non-existent files writable by default;
+  + Bugs/issues fixed: bgo#589366, bgo#783989, bgo#785313,
+bgo#785630, bgo#786629, bgo#786867, bgo#787256, bgo#788455,
+bgo#788487, bgo#790335, bgo#791173, glgo#GNOME/meld#46,
+glgo#GNOME/meld#97, glgo#GNOME/meld#133, glgo#GNOME/meld#146,
+glgo#GNOME/meld#151, glgo#GNOME/meld#152, glgo#GNOME/meld#158,
+glgo#GNOME/meld#159, glgo#GNOME/meld#161, glgo#GNOME/meld#165.
+  + Updated translations.
+- Conditionalize shared-mime-info BuildRequires, glib2_gsettings_\
+  schema_requires macro, and desktop_database_*, mime_database_*,
+  glib2_gsettings_schema_* and icon_theme_cache_* post/postun
+  scriptlets: only distribution releases where RPM 4.13 is not
+  present still use them.
+
+---

Old:

  meld-3.18.0.tar.xz

New:

  meld-3.19.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.4LWQPf/_old  2018-04-11 13:56:35.274524034 +0200
+++ /var/tmp/diff_new_pack.4LWQPf/_new  2018-04-11 13:56:35.278523889 +0200
@@ -17,18 +17,16 @@
 
 
 Name:   meld
-Version:3.18.0
+Version:3.19.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0-or-later
 Group:  Development/Tools/Other
 URL:http://meldmerge.org/
-Source: 
https://download.gnome.org/sources/meld/3.18/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/3.19/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
 BuildRequires:  fdupes
-# Needed for glib2_gsettings_schema macros
-BuildRequires:  glib2-devel
 # Needed for typelib() Requires
 BuildRequires:  gobject-introspection-devel
 # Needed for highcolor macros
@@ -37,8 +35,6 @@
 BuildRequires:  itstool
 BuildRequires:  libxml2-tools
 BuildRequires:  python3 >= 3.3
-# Needed for shared-mime-info macros
-BuildRequires:  shared-mime-info
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 # needed for VCS diffs
@@ -49,15 +45,21 @@
 # Suggest various vcs that meld can handle
 Suggests:   bzr
 Suggests:   cvs
-# Not in Factory, but still in OBS
-Suggests:   darcs
 Suggests:   fossil
-Suggests:   git-core
+Suggests:   git
 Suggests:   mercurial
-Suggests:   monotone
 Suggests:   subversion
+# Not in Factory, but still in OBS
+Suggests:   darcs
+Suggests:   monotone
 Suggests:   tla
+#
 BuildArch:  noarch
+%if 0%{?suse_version} < 1330
+# Needed for shared-mime-info macros
+BuildRequires:  shared-mime-info
+%glib2_gsettings_schema_requires
+%endif
 
 %description
 Meld is a visual diff and merge tool. Two or three files can be
@@ -85,6 +87,7 @@
 %suse_update_desktop_file meld IDE
 %fdupes %{buildroot}%{_datadir}
 
+%if 0%{?suse_version} < 1330
 %post
 %desktop_database_post
 

commit meld for openSUSE:Factory

2018-03-24 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2018-03-24 16:14:42

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Sat Mar 24 16:14:42 2018 rev:65 rq:589974 version:3.18.0

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2018-03-08 
10:57:35.309142725 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2018-03-24 
16:14:43.260923073 +0100
@@ -1,0 +2,7 @@
+Tue Mar 20 16:58:33 UTC 2018 - dims...@opensuse.org
+
+- Unconditionally enable translation-update-upstream: on
+  Tumbleweed, this results in a NOP and for Leap in SLE paid
+  translations being used (boo#1086036).
+
+---



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.AbAi50/_old  2018-03-24 16:14:44.944862371 +0100
+++ /var/tmp/diff_new_pack.AbAi50/_new  2018-03-24 16:14:44.976861217 +0100
@@ -39,6 +39,7 @@
 BuildRequires:  python3 >= 3.3
 # Needed for shared-mime-info macros
 BuildRequires:  shared-mime-info
+BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 # needed for VCS diffs
 Requires:   patch
@@ -57,9 +58,6 @@
 Suggests:   subversion
 Suggests:   tla
 BuildArch:  noarch
-%if !0%{?is_opensuse}
-BuildRequires:  translation-update-upstream
-%endif
 
 %description
 Meld is a visual diff and merge tool. Two or three files can be
@@ -73,9 +71,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%if !0%{?is_opensuse}
 translation-update-upstream
-%endif
 
 %build
 python3 setup.py build




commit meld for openSUSE:Factory

2018-03-08 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2018-03-08 10:57:33

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Thu Mar  8 10:57:33 2018 rev:64 rq:582697 version:3.18.0

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2017-10-18 
10:51:59.332631703 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2018-03-08 
10:57:35.309142725 +0100
@@ -1,0 +2,5 @@
+Wed Feb 28 16:37:05 UTC 2018 - dims...@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+---



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.Te53SQ/_old  2018-03-08 10:57:36.897085324 +0100
+++ /var/tmp/diff_new_pack.Te53SQ/_new  2018-03-08 10:57:36.897085324 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
 Version:3.18.0
 Release:0
 Summary:Visual diff and merge tool
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  Development/Tools/Other
-Url:http://meldmerge.org/
+URL:http://meldmerge.org/
 Source: 
https://download.gnome.org/sources/meld/3.18/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
@@ -39,9 +39,6 @@
 BuildRequires:  python3 >= 3.3
 # Needed for shared-mime-info macros
 BuildRequires:  shared-mime-info
-%if !0%{?is_opensuse}
-BuildRequires:  translation-update-upstream
-%endif
 BuildRequires:  update-desktop-files
 # needed for VCS diffs
 Requires:   patch
@@ -51,15 +48,18 @@
 # Suggest various vcs that meld can handle
 Suggests:   bzr
 Suggests:   cvs
+# Not in Factory, but still in OBS
+Suggests:   darcs
+Suggests:   fossil
 Suggests:   git-core
 Suggests:   mercurial
 Suggests:   monotone
 Suggests:   subversion
-# Not in Factory, but still in OBS
-Suggests:   darcs
-Suggests:   fossil
 Suggests:   tla
 BuildArch:  noarch
+%if !0%{?is_opensuse}
+BuildRequires:  translation-update-upstream
+%endif
 
 %description
 Meld is a visual diff and merge tool. Two or three files can be
@@ -69,6 +69,7 @@
 Subversion, Bazaar-ng and Mercurial can be browsed and viewed.
 
 %lang_package
+
 %prep
 %setup -q
 %patch0 -p1
@@ -103,7 +104,8 @@
 %mime_database_postun
 
 %files
-%doc COPYING NEWS
+%license COPYING
+%doc NEWS
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %dir %{_datadir}/appdata/




commit meld for openSUSE:Factory

2017-10-18 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2017-10-18 10:51:53

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Wed Oct 18 10:51:53 2017 rev:63 rq:534314 version:3.18.0

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2017-09-11 
16:23:41.101168438 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2017-10-18 
10:51:59.332631703 +0200
@@ -1,0 +2,6 @@
+Mon Oct 16 14:31:54 UTC 2017 - dims...@opensuse.org
+
+- Add python3-cairo requires: Fix startup of the application
+  (boo#1062151).
+
+---



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.tnbPWH/_old  2017-10-18 10:52:00.404581413 +0200
+++ /var/tmp/diff_new_pack.tnbPWH/_new  2017-10-18 10:52:00.408581226 +0200
@@ -45,6 +45,7 @@
 BuildRequires:  update-desktop-files
 # needed for VCS diffs
 Requires:   patch
+Requires:   python3-cairo
 Requires:   python3-gobject-Gdk
 Recommends: %{name}-lang
 # Suggest various vcs that meld can handle




commit meld for openSUSE:Factory

2017-09-11 Thread root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2017-09-11 16:23:03

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Mon Sep 11 16:23:03 2017 rev:62 rq:523053 version:3.18.0

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-12-22 
15:56:56.427042260 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2017-09-11 
16:23:41.101168438 +0200
@@ -1,0 +2,132 @@
+Sun Sep 10 23:44:59 UTC 2017 - jeng...@inai.de
+
+- Rewrite description to put the package in focus.
+
+---
+Sat Sep  9 20:46:52 UTC 2017 - zai...@opensuse.org
+
+- Update to version 3.18.0:
+  + Fix VC status not updating in some situations non-flattened
+mode.
+  + Command line errors when invoking a secondary instance will no
+longer cause the second command to hang until the primary
+exits.
+  + Bugs fixed: bgo#786629.
+  + Updated translations.
+
+---
+Wed Aug 16 18:16:14 UTC 2017 - zai...@opensuse.org
+
+- Update to version 3.17.4:
+  + Rebuild source tarball without spurious files.
+- Drop obsolete clean section.
+- Conditionally apply translations-update-upstream BuildRequires
+  and macro for non-openSUSE only.
+
+---
+Mon Aug 14 14:14:56 UTC 2017 - zai...@opensuse.org
+
+- Update to version 3.17.3:
+  + Fix folder compare when using text filters.
+  + Make activity spinner show when inline comparisons are running.
+  + Migrate back from threads to multiprocessing for inline diffs;
+unusual CPU contention caused this to harm interactivity.
+  + Manually refreshing a file comparison sometimes caused diff
+navigation to break.
+  + Folder comparisons that update their state no longer break
+navigation.
+  + Version-control comparison on missing files now work again.
+  + Fix regression in initial focus for folder comparisons.
+  + Fix handling for added, partially staged files in git.
+  + Bugs fixed: bgo#784436, bgo#785603, bgo#785859, bgo#786043.
+  + Updated translations.
+
+---
+Sun Jun 11 10:23:35 UTC 2017 - zai...@opensuse.org
+
+- Update to version 3.17.2:
+  + UI changes:
+- Significantly improve synchronisation of scroll bars between
+  panes; we now try much harder to scroll all of a chunk on
+  screen at the top and bottom of comparisons, and handle
+  last-line-in-file cases better.
+- Place the cursor at the start of a replaced chunk instead of
+  after it; this change should improve keyboard ergonomics when
+  doing three-way merges, but does change our existing
+  behaviour.
+- Remove Shift-based scroll locking; this was already broken by
+  a GTK+ change, so this is just making it official.
+  + Fixes:
+- Show correct column offset in status bar for tab indents.
+- Fix installation with a prefix for Python 3 changes.
+- Fix initial scroll-to-first-difference behaviour to avoid a
+  race condition if the first change was on the first line.
+- Improve text wrapping behaviour in information bars, and
+  avoid too-large allocations with long labels.
+- Work around infinite re-allocation problems and silence GTK+
+  allocation warnings.
+- Fix bad UI state when closing a single-instance activated
+  window.
+- Fix bad function call when using internal git conflict
+  resolution.
+  + Updated translations.
+
+---
+Sat Mar 11 13:57:23 UTC 2017 - dims...@opensuse.org
+
+- Update to version 3.17.1:
+  + Features: Improve version checking, and try to show users a
+nice error dialog when  Meld's requirements aren't installed.
+  + Fixes:
+- Help and documentation fixes.
+- Re-silence GTK+ logging with glib 2.46 structured logging
+  changes.
+- Fix chunk deletion at EOF with CRLF endings.
+- Note filter performance effects in folder preferences.
+- Fix button alignment for new chunk action buttons.
+- Improve use of the newer emblem in folder comparison by
+  showing it only when meaningful.
+- Fix crash caused by bad colour theme lookup.
+  + Updated translations.
+
+---
+Mon Jan  9 13:25:53 UTC 2017 - dims...@opensuse.org
+
+- Update to version 3.17.0:
+  + Port to python3:
+- Python 3 support; we now require Python 3.3 as a minimum.
+- Python 3 compatibility fixes; too many cases of bytes/string
+  confusion, syntax changes and other miscellany to mention
+  individually.
+- Handle new 

commit meld for openSUSE:Factory

2016-09-28 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-09-28 11:31:05

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-08-05 
18:17:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-09-28 
11:31:07.0 +0200
@@ -1,0 +2,16 @@
+Sun Sep 25 21:30:07 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.16.3:
+  + Fix bad scroll syncing and inability to move between comparison
+chunks in file comparisons.
+  + Improve version control view behaviour when opening missing
+paths.
+  + Fix saving of text created in blank comparison.
+  + GTK+ 3.22 compatibility fixes for saving window size.
+  + Fix formatted patches missing newlines in certain cases.
+  + Silence GTK+ warning logging if not running in uninstalled
+(i.e. development) mode.
+  + Update AppData.
+  + Updated translations.
+
+---

Old:

  meld-3.16.2.tar.xz

New:

  meld-3.16.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.cVgoey/_old  2016-09-28 11:31:08.0 +0200
+++ /var/tmp/diff_new_pack.cVgoey/_new  2016-09-28 11:31:08.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.16.2
+Version:3.16.3
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-3.16.2.tar.xz -> meld-3.16.3.tar.xz ++
 7572 lines of diff (skipped)




commit meld for openSUSE:Factory

2016-08-05 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-08-05 18:17:23

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-07-01 
10:00:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-08-05 
18:17:29.0 +0200
@@ -1,0 +2,8 @@
+Sat Jul 30 09:13:18 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.16.2:
+  + Fix performance regression in text filtering.
+  + Fix regression in respecting custom text encoding.
+  + Updated translations.
+
+---

Old:

  meld-3.16.1.tar.xz

New:

  meld-3.16.2.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.15HezR/_old  2016-08-05 18:17:30.0 +0200
+++ /var/tmp/diff_new_pack.15HezR/_new  2016-08-05 18:17:30.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.16.1
+Version:3.16.2
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-3.16.1.tar.xz -> meld-3.16.2.tar.xz ++
 2656 lines of diff (skipped)




commit meld for openSUSE:Factory

2016-07-01 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-07-01 10:00:51

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-06-02 
09:39:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-07-01 
10:00:52.0 +0200
@@ -1,0 +2,12 @@
+Sun Jun 19 13:43:54 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.16.1:
+  + Fix regression in support for file comparisons from pipes.
+  + Add open build service directories to the version control
+filter.
+  + Add darcs to list of loaded plugins.
+  + Fix the dark style.
+  + Windows build fixes.
+- Drop meld-add_osc_to_vcs_list.patch: Fixed upstream.
+
+---

Old:

  meld-3.16.0.tar.xz
  meld-add_osc_to_vcs_list.patch

New:

  meld-3.16.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.CJvC9E/_old  2016-07-01 10:00:52.0 +0200
+++ /var/tmp/diff_new_pack.CJvC9E/_new  2016-07-01 10:00:52.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.16.0
+Version:3.16.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -26,8 +26,6 @@
 Source: 
http://download.gnome.org/sources/meld/3.16/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
-# PATCH-FEATURE-OPENSUSE meld-add_osc_to_vcs_list.patch bgo#766617 
mvet...@suse.com -- add .osc folder to the list of files ignored as VCS
-Patch1: meld-add_osc_to_vcs_list.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -75,7 +73,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 translation-update-upstream
 
 %build

++ meld-3.16.0.tar.xz -> meld-3.16.1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.16.0/NEWS new/meld-3.16.1/NEWS
--- old/meld-3.16.0/NEWS2016-04-30 23:34:44.0 +0200
+++ new/meld-3.16.1/NEWS2016-06-19 02:21:29.0 +0200
@@ -1,4 +1,17 @@
 
+2016-06-19 meld 3.16.1
+==
+
+  Fixes:
+
+   * Fix regression in support for file comparisons from pipes (Kai Willadsen)
+   * Add open build service directories to the version control filter
+ (Dominique Leuenberger)
+   * Add darcs to list of loaded plugins (pbgc)
+   * Fix the dark style (Kai Willadsen)
+   * Windows build fixes (Kai Willadsen)
+
+
 2016-05-01 meld 3.16.0
 ==
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.16.0/PKG-INFO new/meld-3.16.1/PKG-INFO
--- old/meld-3.16.0/PKG-INFO2016-04-30 23:34:59.0 +0200
+++ new/meld-3.16.1/PKG-INFO2016-06-19 02:22:05.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: meld
-Version: 3.16.0
+Version: 3.16.1
 Summary: Visual diff and merge tool
 Home-page: http://meldmerge.org
 Author: Kai Willadsen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.16.0/data/org.gnome.meld.gschema.xml 
new/meld-3.16.1/data/org.gnome.meld.gschema.xml
--- old/meld-3.16.0/data/org.gnome.meld.gschema.xml 2016-04-15 
22:43:53.0 +0200
+++ new/meld-3.16.1/data/org.gnome.meld.gschema.xml 2016-06-19 
02:15:56.0 +0200
@@ -220,7 +220,7 @@
 [
   ("Backups", true, "#*# .#* ~* *~ *.{orig,bak,swp}"),
   ("OS-specific metadata", true, ".DS_Store ._* .Spotlight-V100 
.Trashes Thumbs.db Desktop.ini"),
-  ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout 
_FOSSIL_ .fos CVS _darcs .git .svn"),
+  ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout 
_FOSSIL_ .fos CVS _darcs .git .svn .osc"),
   ("Binaries", true, "*.{pyc,a,obj,o,so,la,lib,dll,exe}"),
   ("Media", false, 
"*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}")
 ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.16.0/data/styles/meld-dark.xml 
new/meld-3.16.1/data/styles/meld-dark.xml
--- old/meld-3.16.0/data/styles/meld-dark.xml   2016-04-15 22:43:53.0 
+0200
+++ new/meld-3.16.1/data/styles/meld-dark.xml   2016-06-18 03:19:18.0 
+0200
@@ -11,7 +11,7 @@
   
   
   
-  
+  
   
   
   
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 

commit meld for openSUSE:Factory

2016-06-02 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-06-02 09:39:39

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-05-20 
11:56:06.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-06-02 
09:39:40.0 +0200
@@ -1,0 +2,5 @@
+Fri May 20 11:39:15 UTC 2016 - alarr...@suse.com
+
+- Update to GNOME 3.20.2 (Fate#318572) 
+
+---
@@ -29,0 +35,5 @@
+Fri Apr 15 16:46:27 UTC 2016 - mgo...@suse.com
+
+- Update to GNOME 3.20  Fate#318572
+
+---
@@ -164,0 +175,6 @@
+
+---
+Mon Jun  1 12:27:31 UTC 2015 - fcro...@suse.com
+
+- SLE12 SP1 package (FATE#318492).
+- Fix Url.



Other differences:
--



commit meld for openSUSE:Factory

2016-05-20 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-05-20 11:56:04

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-05-03 
10:17:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-05-20 
11:56:06.0 +0200
@@ -1,0 +2,6 @@
+Wed May 18 12:39:39 UTC 2016 - mvet...@suse.com
+
+- Add meld-add_osc_to_vcs_list.patch:
+  + Add .osc folder to the list of files ignored as option 'VCS'.
+
+---

New:

  meld-add_osc_to_vcs_list.patch



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.hWWKMj/_old  2016-05-20 11:56:07.0 +0200
+++ /var/tmp/diff_new_pack.hWWKMj/_new  2016-05-20 11:56:07.0 +0200
@@ -26,6 +26,8 @@
 Source: 
http://download.gnome.org/sources/meld/3.16/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
+# PATCH-FEATURE-OPENSUSE meld-add_osc_to_vcs_list.patch bgo#766617 
mvet...@suse.com -- add .osc folder to the list of files ignored as VCS
+Patch1: meld-add_osc_to_vcs_list.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -73,6 +75,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 translation-update-upstream
 
 %build

++ meld-add_osc_to_vcs_list.patch ++
diff -urEbwB meld-3.16.0/data/org.gnome.meld.gschema.xml 
meld-3.16.0.new/data/org.gnome.meld.gschema.xml
--- meld-3.16.0/data/org.gnome.meld.gschema.xml 2016-04-15 22:43:53.0 
+0200
+++ meld-3.16.0.new/data/org.gnome.meld.gschema.xml 2016-05-18 
14:32:36.543865925 +0200
@@ -220,7 +220,7 @@
 [
   ("Backups", true, "#*# .#* ~* *~ *.{orig,bak,swp}"),
   ("OS-specific metadata", true, ".DS_Store ._* .Spotlight-V100 
.Trashes Thumbs.db Desktop.ini"),
-  ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout 
_FOSSIL_ .fos CVS _darcs .git .svn"),
+  ("Version Control", true, "_MTN .bzr .svn .svn .hg .fslckout 
_FOSSIL_ .fos CVS _darcs .git .svn .osc"),
   ("Binaries", true, "*.{pyc,a,obj,o,so,la,lib,dll,exe}"),
   ("Media", false, 
"*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}")
 ]



commit meld for openSUSE:Factory

2016-05-03 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-05-03 09:37:40

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-04-28 
17:01:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-05-03 
10:17:02.0 +0200
@@ -1,0 +2,6 @@
+Sun May  1 14:21:14 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.16.0:
+  + Updated translations.
+
+---

Old:

  meld-3.15.3.tar.xz

New:

  meld-3.16.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.4TCHNx/_old  2016-05-03 10:17:03.0 +0200
+++ /var/tmp/diff_new_pack.4TCHNx/_new  2016-05-03 10:17:03.0 +0200
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:3.15.3
+Version:3.16.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meldmerge.org/
-Source: 
http://download.gnome.org/sources/meld/3.15/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/3.16/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
 BuildRequires:  fdupes

++ meld-3.15.3.tar.xz -> meld-3.16.0.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.3/NEWS new/meld-3.16.0/NEWS
--- old/meld-3.15.3/NEWS2016-04-19 21:47:52.0 +0200
+++ new/meld-3.16.0/NEWS2016-04-30 23:34:44.0 +0200
@@ -1,4 +1,12 @@
 
+2016-05-01 meld 3.16.0
+==
+
+  Translations:
+
+   * Josef Andersson (sv)
+
+
 2016-04-20 meld 3.15.3
 ==
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.3/PKG-INFO new/meld-3.16.0/PKG-INFO
--- old/meld-3.15.3/PKG-INFO2016-04-19 21:48:18.0 +0200
+++ new/meld-3.16.0/PKG-INFO2016-04-30 23:34:59.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: meld
-Version: 3.15.3
+Version: 3.16.0
 Summary: Visual diff and merge tool
 Home-page: http://meldmerge.org
 Author: Kai Willadsen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.3/meld/conf.py new/meld-3.16.0/meld/conf.py
--- old/meld-3.15.3/meld/conf.py2016-04-15 22:43:53.0 +0200
+++ new/meld-3.16.0/meld/conf.py2016-04-30 23:33:52.0 +0200
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.15.3"
+__version__ = "3.16.0"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.3/po/sv.po new/meld-3.16.0/po/sv.po
--- old/meld-3.15.3/po/sv.po2016-04-15 22:43:53.0 +0200
+++ new/meld-3.16.0/po/sv.po2016-04-24 23:52:09.0 +0200
@@ -1,24 +1,24 @@
 # Swedish messages for meld.
-# Copyright © 2005-2015 Free Software Foundation, Inc.
+# Copyright © 2005-2016 Free Software Foundation, Inc.
 # Christian Rose , 2005.
 # Daniel Nylander , 2006, 2007, 2008, 2009, 2011.
 # Sebastian Rasmussen , 2015.
-# Josef Andersson , 2014, 2015.
+# Josef Andersson , 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?;
 "product=meld=I18N+L10N=general\n"
-"POT-Creation-Date: 2016-01-27 13:29+\n"
-"PO-Revision-Date: 2016-01-27 22:56+0100\n"
-"Last-Translator: Anders Jonsson \n"
+"POT-Creation-Date: 2016-04-15 22:51+\n"
+"PO-Revision-Date: 2016-03-17 17:04+0100\n"
+"Last-Translator: Josef Andersson \n"
 "Language-Team: Swedish \n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.4\n"
 "X-Project-Style: gnome\n"
 
 #: ../bin/meld:144
@@ -526,10 +526,14 @@
 msgstr "_Hjälp"
 
 #: ../data/ui/application.ui.h:8
+msgid "Keyboard Shortcuts"
+msgstr "Tangentbordsgenvägar"
+
+#: ../data/ui/application.ui.h:9
 msgid "_About"
 msgstr "_Om"
 
-#: 

commit meld for openSUSE:Factory

2016-04-28 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-04-28 16:56:34

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2016-04-01 
13:03:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-04-28 
17:01:13.0 +0200
@@ -1,0 +2,16 @@
+Sat Apr 23 22:45:55 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.15.3:
+  + Handle unicode dates in non-UTF8 locales in folder comparison.
+  + Try to auto-detect when to use our dark theme highlighting.
+  + After undo/redo actions in file comparisons, place the cursor
+at the natural edit position and scroll it back onscreen.
+
+---
+Sat Apr 23 22:45:54 UTC 2016 - mich...@stroeder.com
+
+- Require python-gobject-Gdk: pygobject was further split in order
+  to be able to install it without X-dependencies. As meld is a
+  GUI application, the dependency on the X-stack is no issue.
+
+---

Old:

  meld-3.15.2.tar.xz

New:

  meld-3.15.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.ON9Tn2/_old  2016-04-28 17:01:16.0 +0200
+++ /var/tmp/diff_new_pack.ON9Tn2/_new  2016-04-28 17:01:16.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.15.2
+Version:3.15.3
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -44,6 +44,7 @@
 # needed for VCS diffs
 Requires:   patch
 Requires:   python-gconf
+Requires:   python-gobject-Gdk
 Requires:   python-gtk >= 2.8.0
 Recommends: %{name}-lang
 Recommends: python-gtksourceview

++ meld-3.15.2.tar.xz -> meld-3.15.3.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.2/NEWS new/meld-3.15.3/NEWS
--- old/meld-3.15.2/NEWS2016-03-27 23:38:57.0 +0200
+++ new/meld-3.15.3/NEWS2016-04-19 21:47:52.0 +0200
@@ -1,4 +1,16 @@
 
+2016-04-20 meld 3.15.3
+==
+
+  Fixes:
+
+   * Handle unicode dates in non-UTF8 locales in folder comparison (Kai
+ Willadsen)
+   * Try to auto-detect when to use our dark theme highlighting (Kai Willadsen)
+   * After undo/redo actions in file comparisons, place the cursor at the
+ natural edit position and scroll it back onscreen (Kai Willadsen)
+
+
 2016-03-28 meld 3.15.2
 ==
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.2/PKG-INFO new/meld-3.15.3/PKG-INFO
--- old/meld-3.15.2/PKG-INFO2016-03-27 23:39:15.0 +0200
+++ new/meld-3.15.3/PKG-INFO2016-04-19 21:48:18.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: meld
-Version: 3.15.2
+Version: 3.15.3
 Summary: Visual diff and merge tool
 Home-page: http://meldmerge.org
 Author: Kai Willadsen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.2/meld/conf.py new/meld-3.15.3/meld/conf.py
--- old/meld-3.15.2/meld/conf.py2016-03-05 23:51:32.0 +0100
+++ new/meld-3.15.3/meld/conf.py2016-04-15 22:43:53.0 +0200
@@ -3,7 +3,7 @@
 import sys
 
 __package__ = "meld"
-__version__ = "3.15.2"
+__version__ = "3.15.3"
 
 # START; these paths are clobbered on install by meld.build_helpers
 DATADIR = os.path.join(sys.prefix, "share", "meld")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.15.2/meld/dirdiff.py 
new/meld-3.15.3/meld/dirdiff.py
--- old/meld-3.15.2/meld/dirdiff.py 2016-03-14 22:02:55.0 +0100
+++ new/meld-3.15.3/meld/dirdiff.py 2016-04-16 00:48:51.0 +0200
@@ -21,6 +21,7 @@
 import datetime
 import errno
 import functools
+import locale
 import os
 import re
 import shutil
@@ -1319,6 +1320,7 @@
 all_present_same = self.file_compare(lof, regexes)
 different = 1
 one_isdir = [None for i in range(self.model.ntree)]
+locale_encoding = locale.getpreferredencoding()
 for j in range(self.model.ntree):
 if mod_times[j]:
 isdir = os.path.isdir( files[j] )
@@ -1346,6 +1348,7 @@
 TIME = self.model.column_index(COL_TIME, j)
 mod_datetime = datetime.datetime.fromtimestamp(mod_times[j])
 time_str = mod_datetime.strftime("%a %d %b %Y %H:%M:%S")
+time_str = time_str.decode(locale_encoding, errors='replace')
 

commit meld for openSUSE:Factory

2016-04-01 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2016-04-01 13:03:11

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-12-13 
09:40:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2016-04-01 
13:03:19.0 +0200
@@ -1,0 +2,63 @@
+Mon Mar 28 12:48:49 UTC 2016 - zai...@opensuse.org
+
+- Update to version 3.15.2:
+  + Port to use GtkSourceView's file loader and saver helpers,
+bringing several benefits.
+  + Loading and saving speed are significantly improved, and are
+asychronous.
+  + We try a wider range of locale-specific file encodings by
+default, and still support user-specified default encodings.
+  + We now support saving files with inconsistent newline types.
+  + Binary files will now be loaded on a best-effort basis.
+  + Reinstate support for Darcs; this is currently limited to very
+new (>2.10.3) versions.
+  + Folder comparisons now apply text filters in the same way as
+file comparisons.
+  + Add support for showing new shortcuts help dialog.
+  + Preliminary support for building Meld as an xdg-app.
+  + Fixes:
+- Many fixes for GTK+ 3.20 theming changes and widget
+  compatibility issues.
+- All accelerators should now consistently use the Primary key,
+  for better integration on OSX systems.
+- Significantly improve text filter performance.
+- Fix performance regression where scanning for missing files
+  was extremely slow, especially in large repositories.
+- Fix truncated line number display in short file.
+- Fix filter dropdown not appearing below button.
+- Add more documentation on setup and installation
+  requirements.
+- Update the AppData to spec version 0.7+.
+  + Updated translations.
+
+---
+Sun Dec 20 21:53:26 UTC 2015 - damjanovic@gmail.com
+
+- Update to version 3.15.1:
+  + Text ignored by filters is now dimmed to give some visual
+feedback that it's being ignored.
+  + Text filters now apply independently, improving consistency;
+note that this is a behaviour change as filter order no longer
+matters, and filters will always apply to the original
+(not the filtered) text.
+  + Recent menu items now show more detail in tooltips.
+  + Update dialog action area layout for GTK+ theme changes.
+  + Fixes:
+- Conflict resolution prompt now resolves properly again.
+- Silence some GTK+ assertions on window close.
+- Fix default filter issues from recent rework.
+- Percent-containing commit messages no longer corrupt
+  our recent commit messages store.
+- Fix some problems with unicode user directories on Windows.
+- Fix encoding issues when saving files with load errors.
+- Fix drawing corruption when scrolling horizontally.
+- Fix clicking on the diffmap scrolling to the wrong location.
+- Fix off-by-one drawing error for final line in file.
+- Fix introspection requires to silence startup warnings.
+- Fix clearing syncpoints.
+- Add manual appdata kudos markers.
+- PEP8 fixes.
+  + Updated translations.
+- Rebase meld-nodocs.patch.
+
+---

Old:

  meld-3.14.2.tar.xz

New:

  meld-3.15.2.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.H4hLMa/_old  2016-04-01 13:03:19.0 +0200
+++ /var/tmp/diff_new_pack.H4hLMa/_new  2016-04-01 13:03:19.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:3.14.2
+Version:3.15.2
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meldmerge.org/
-Source: 
http://download.gnome.org/sources/meld/3.14/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/3.15/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
 BuildRequires:  fdupes

++ meld-3.14.2.tar.xz -> meld-3.15.2.tar.xz ++
 38756 lines of diff (skipped)

++ meld-nodocs.patch ++
--- 

commit meld for openSUSE:Factory

2015-12-13 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-12-13 09:39:59

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-10-06 
13:27:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-12-13 
09:40:07.0 +0100
@@ -1,0 +2,9 @@
+Thu Dec 10 14:20:05 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.14.2:
+  + Fix some GTK+ assertions on window close.
+  + Fix commit error with unicode commit messages.
+  + Add manual appdata kudos markers.
+  + Updated translations.
+
+---

Old:

  meld-3.14.1.tar.xz

New:

  meld-3.14.2.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.f4HWYg/_old  2015-12-13 09:40:08.0 +0100
+++ /var/tmp/diff_new_pack.f4HWYg/_new  2015-12-13 09:40:08.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.14.1
+Version:3.14.2
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-3.14.1.tar.xz -> meld-3.14.2.tar.xz ++
 8684 lines of diff (skipped)




commit meld for openSUSE:Factory

2015-10-06 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-10-06 13:27:45

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is "meld"

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-07-24 
09:59:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-10-06 
13:27:49.0 +0200
@@ -1,0 +2,22 @@
+Sun Oct  4 10:20:20 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.14.1:
+  + Features:
+- Offer to open binary files externally.
+- Use locale-based default encodings.
+  + Fixes:
+- Fix crash with some GTK+ versions when using --output.
+- Fix merge-all action not working at all.
+- Fix creating patches with unicode path names.
+- Fix copy-to-clipboard option in patch dialog.
+- Fix diffmap alignment for new GTK+ allocation behaviour.
+- Improve float accuracy in folder comparison timestamp
+  resolution.
+- Fix default SVN keyword filter to escape $ characters.
+- Fix display of unicode --help from command line.
+- Fix keyboard shortcut docs.
+- Don't incorrectly show identical notification for changed
+  folder comparisons.
+  + Updated translations.
+
+---

Old:

  meld-3.14.0.tar.xz

New:

  meld-3.14.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.yXvj5I/_old  2015-10-06 13:27:50.0 +0200
+++ /var/tmp/diff_new_pack.yXvj5I/_new  2015-10-06 13:27:50.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.14.0
+Version:3.14.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-3.14.0.tar.xz -> meld-3.14.1.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.14.0/NEWS new/meld-3.14.1/NEWS
--- old/meld-3.14.0/NEWS2015-07-22 23:13:06.0 +0200
+++ new/meld-3.14.1/NEWS2015-10-03 23:02:47.0 +0200
@@ -1,3 +1,28 @@
+2015-10-04 meld 3.14.1
+==
+
+  Features:
+
+   * Offer to open binary files externally (Pratik Dayama)
+   * Use locale-based default encodings (Kai Willadsen)
+
+  Fixes:
+
+   * Fix crash with some GTK+ versions when using --output (Kai Willadsen)
+   * Fix merge-all action not working at all (Kai Willadsen)
+   * Fix creating patches with unicode path names (Kai Willadsen)
+   * Fix copy-to-clipboard option in patch dialog (Kai Willadsen)
+   * Fix diffmap alignment for new GTK+ allocation behaviour (Kai Willadsen)
+   * Improve float accuracy in folder comparison timestamp resolution (Kai 
Willadsen)
+   * Fix default SVN keyword filter to escape $ characters (Kai Willadsen)
+   * Fix display of unicode --help from command line (Kai Willadsen)
+   * Fix keyboard shortcut docs (Kai Willadsen)
+   * Don't incorrectly show identical notification for changed folder 
comparisons (Kai Willadsen)
+
+  Translations:
+
+   * Piotr Drąg (pl)
+
 
 2015-07-23 meld 3.14.0
 ==
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.14.0/PKG-INFO new/meld-3.14.1/PKG-INFO
--- old/meld-3.14.0/PKG-INFO2015-07-22 23:13:19.0 +0200
+++ new/meld-3.14.1/PKG-INFO2015-10-03 23:02:54.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: meld
-Version: 3.14.0
+Version: 3.14.1
 Summary: Visual diff and merge tool
 Home-page: http://meldmerge.org
 Author: Kai Willadsen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.14.0/data/org.gnome.meld.gschema.xml 
new/meld-3.14.1/data/org.gnome.meld.gschema.xml
--- old/meld-3.14.0/data/org.gnome.meld.gschema.xml 2015-07-19 
02:15:26.0 +0200
+++ new/meld-3.14.1/data/org.gnome.meld.gschema.xml 2015-09-04 
23:02:25.0 +0200
@@ -231,7 +231,7 @@
   
   
 [
-  ("CVS/SVN keywords", false, "\$\\w+(:[^\\n$]+)?\$"),
+  ("CVS/SVN keywords", false, "\\$\\w+(:[^\\n$]+)?\\$"),
   ("C++ comment", false, "//.*"),
   ("C comment", false, "/\\*.*?\\*/"),
   ("All whitespace", false, "[ \\t\\r\\f\\v]*"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.14.0/help/C/keyboard-shortcuts.page 
new/meld-3.14.1/help/C/keyboard-shortcuts.page
--- old/meld-3.14.0/help/C/keyboard-shortcuts.page  2014-12-28 
22:21:23.0 +0100
+++ new/meld-3.14.1/help/C/keyboard-shortcuts.page  2015-10-03 
22:43:35.0 +0200
@@ -87,7 +87,7 @@
   Find the 

commit meld for openSUSE:Factory

2015-07-24 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-07-24 09:59:02

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-07-14 
17:46:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-07-24 
09:59:04.0 +0200
@@ -1,0 +2,10 @@
+Thu Jul 23 07:14:20 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.14.0:
+  + Fix crash when starting folder comparison on Windows.
+  + Fix bad chunk action behaviour for middle-to-right actions in
+three pane conflicts.
+  + Documentation fixes.
+  + Updated translations.
+
+---

Old:

  meld-3.13.3.tar.xz

New:

  meld-3.14.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.3bLgD8/_old  2015-07-24 09:59:05.0 +0200
+++ /var/tmp/diff_new_pack.3bLgD8/_new  2015-07-24 09:59:05.0 +0200
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:3.13.3
+Version:3.14.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meldmerge.org/
-Source: 
http://download.gnome.org/sources/meld/3.13/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/3.14/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
 BuildRequires:  fdupes

++ meld-3.13.3.tar.xz - meld-3.14.0.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.13.3/NEWS new/meld-3.14.0/NEWS
--- old/meld-3.13.3/NEWS2015-07-12 04:28:22.0 +0200
+++ new/meld-3.14.0/NEWS2015-07-22 23:13:06.0 +0200
@@ -1,4 +1,21 @@
 
+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-12 meld 3.13.3
 ==
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.13.3/PKG-INFO new/meld-3.14.0/PKG-INFO
--- old/meld-3.13.3/PKG-INFO2015-07-12 04:28:28.0 +0200
+++ new/meld-3.14.0/PKG-INFO2015-07-22 23:13:19.0 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: meld
-Version: 3.13.3
+Version: 3.14.0
 Summary: Visual diff and merge tool
 Home-page: http://meldmerge.org
 Author: Kai Willadsen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.13.3/README new/meld-3.14.0/README
--- old/meld-3.13.3/README  2015-06-28 03:15:36.0 +0200
+++ new/meld-3.14.0/README  2015-07-22 23:09:07.0 +0200
@@ -17,10 +17,10 @@
 
 
 * Python 2.7
-* GTK+ 3.6
-* GLib 2.34
+* GTK+ 3.12
+* GLib 2.36
 * PyGObject 3.8
-* GtkSourceView 3.6
+* GtkSourceView 3.10
 
 
 Running
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.13.3/help/C/preferences.page 
new/meld-3.14.0/help/C/preferences.page
--- old/meld-3.13.3/help/C/preferences.page 2015-06-28 03:14:54.0 
+0200
+++ new/meld-3.14.0/help/C/preferences.page 2015-07-20 21:25:27.0 
+0200
@@ -41,7 +41,7 @@
 non-binary files into memory during the folder comparison. With large text
 files, this can be slow and may cause memory issues.
 /p
-pThis option only has an effect if if Compare files based only on size
+pThis option only has an effect if Compare files based only on size
 and timestamp is not enabled.
 /p
   /item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-3.13.3/help/cs/cs.po 
new/meld-3.14.0/help/cs/cs.po
--- old/meld-3.13.3/help/cs/cs.po   2015-06-28 03:15:57.0 +0200
+++ new/meld-3.14.0/help/cs/cs.po   2015-07-21 23:30:23.0 +0200
@@ -6,8 +6,8 @@
 msgid 
 msgstr 
 Project-Id-Version: meld master\n
-POT-Creation-Date: 2015-05-31 10:40+\n
-PO-Revision-Date: 2015-05-31 20:01+0200\n
+POT-Creation-Date: 2015-07-20 19:42+\n
+PO-Revision-Date: 2015-07-21 11:57+0200\n
 Last-Translator: Marek Černocký ma...@manet.cz\n
 Language-Team: Czech gnome-cs-l...@gnome.org\n
 Language: cs\n
@@ -709,10 +709,10 @@
 msgstr 
 

commit meld for openSUSE:Factory

2015-07-14 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-07-14 17:44:45

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-04-22 
01:19:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-07-14 
17:46:03.0 +0200
@@ -1,0 +2,33 @@
+Sun Jul 12 15:05:09 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.13.3:
+  + Fix syntax highlighting under Windows.
+  + Update Windows build for newer pygi bundled libraries.
+  + Fixes for incorrect descriptions in manual.
+
+---
+Mon Jul  6 19:48:42 UTC 2015 - zai...@opensuse.org
+
+- Update to version 3.13.2:
+  + Several fixes for argument handling and tab creation:
+- Create --diff created comparisons after args-created ones.
+- Fix --label flag incorrectly applying to --diff created
+  comparisons.
+- Create --diff created comparisons after args-created ones.
+- Fix relative path interpretation for --output when created
+  from a secondary instance.
+- Fix window presentation ordering when creating a secondary
+  instance.
+  + Several fixes to unicode filename handling in git comparisons
+and manually-assigned labels.
+  + Fix incorrect comparison display caused by unicode (U+2028)
+newline.
+  + Fix not being able to activate some change bar actions by
+temporarily disabling overlay scrolling support on GTK+ 3.14.
+  + Stop recreating duplicate recently-used file placeholders.
+  + Fix out-of-date man page documentation.
+  + Test fixes and testing improvements.
+  + Documentation fixes.
+  + Updated translations.
+
+---

Old:

  meld-3.13.1.tar.xz

New:

  meld-3.13.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.rjUHdU/_old  2015-07-14 17:46:04.0 +0200
+++ /var/tmp/diff_new_pack.rjUHdU/_new  2015-07-14 17:46:04.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.13.1
+Version:3.13.3
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-3.13.1.tar.xz - meld-3.13.3.tar.xz ++
 6620 lines of diff (skipped)




commit meld for openSUSE:Factory

2015-04-21 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-04-22 01:19:25

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-03-30 
19:11:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-04-22 
01:19:28.0 +0200
@@ -1,0 +2,31 @@
+Mon Apr 20 21:31:22 UTC 2015 - astie...@suse.com
+
+- Update to version 3.13.1:
+  + Features:
+- more consistent comparison output when line endings differ:
+  . Folder comparisons will now show an identical notification
+similar to the one used in file comparison.
+  . The New blank comparion button now works for folder
+comparisons as well as file ones.
+  . In folder comparisons, the expansion state of the tree is
+now remembered when you collapse and re-expand a row.
+  + Fixes:
+- Better support icons in RTL locales.
+- Fixes for file encoding when saving with bad or missing
+  encodings.
+- More consistent dialog handling and appearance.
+- Deprecation updates and compatibility fixes.
+- Fix bad comparison offset when multiple line breaks occurred
+  on a single  line.
+- Unicode fixes for file change notifications.
+- Warnings (such as deprecation warnings) are now explicitly
+  silenced in stable Meld.
+- Folder actions are now disabled while Meld is still scanning
+  folders.
+- Fix some command line handling for ambiguous relative paths
+  and invalid URIs.
+- Fix updating the comparison map when a file is updated within
+  Meld.
+- Rebase meld-nodocs.patch.
+
+---

Old:

  meld-3.13.0.tar.xz

New:

  meld-3.13.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.n3g12T/_old  2015-04-22 01:19:28.0 +0200
+++ /var/tmp/diff_new_pack.n3g12T/_new  2015-04-22 01:19:28.0 +0200
@@ -17,12 +17,12 @@
 
 
 Name:   meld
-Version:3.13.0
+Version:3.13.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
-Url:http://meld.sourceforge.net/
+Url:http://meldmerge.org/
 Source: 
http://download.gnome.org/sources/meld/3.13/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch

++ meld-3.13.0.tar.xz - meld-3.13.1.tar.xz ++
 20460 lines of diff (skipped)

++ meld-nodocs.patch ++
--- /var/tmp/diff_new_pack.n3g12T/_old  2015-04-22 01:19:28.0 +0200
+++ /var/tmp/diff_new_pack.n3g12T/_new  2015-04-22 01:19:28.0 +0200
@@ -1,8 +1,12 @@
-Index: meld-3.11.0/setup.py
+---
+ setup.py |3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: meld-3.13.1/setup.py
 ===
 meld-3.11.0.orig/setup.py
-+++ meld-3.11.0/setup.py
-@@ -39,9 +39,6 @@ setup(
+--- meld-3.13.1.orig/setup.py  2015-03-28 23:25:37.0 +0100
 meld-3.13.1/setup.py   2015-04-20 23:31:04.0 +0200
+@@ -40,9 +40,6 @@ setup(
  ('share/man/man1',
   ['meld.1']
   ),
@@ -10,5 +14,5 @@
 - ['COPYING', 'NEWS']
 - ),
  ('share/meld',
-  ['data/meld.css']
+  ['data/meld.css', 'data/meld-dark.css']
   ),




commit meld for openSUSE:Factory

2015-03-30 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-03-30 19:11:36

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2015-01-03 
22:00:50.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-03-30 
19:11:37.0 +0200
@@ -1,0 +2,42 @@
+Wed Dec 31 00:23:58 UTC 2014 - zai...@opensuse.org
+
+- Update to version 3.13.0:
+  + Features:
+- Make syntax highlighting style configurable.
+- Implemented incremental search, match highlighting and many
+  other find-related fixes.
+- Add support for GTK+ global dark theme setting.
+- Add support for pushing change deletions.
+- Remove cycle-pane action in favour of previous/next pane
+  actions.
+  + Fixes:
+- Handle Unicode filenames in a git tree correctly.
+- Many fixes for recent GTK+ deprecation warnings.
+- Fixing flickering inline highlighting on updates.
+- Multiple work arounds for change colours not displaying on
+  GTK+ 3.14.
+- Fix inconsistent file chooser when cancelling file selection.
+- UTF-8 encode patches created from the patch dialog.
+- Fix text-wrapping reset caused by the commit dialog.
+- Fix text background display on certain themes.
+- Fix for launching Meld with certain Git environment
+  variables.
+- Add GTK's settings.ini file for font blurriness fix on
+  Windows.
+- Fix display of change action buttons and line numbers when
+  line numbers are shown.
+- Fix positioning of the change action buttons.
+- Fix tab width setting not working correctly.
+- Fix starting comparison of Subversion checkouts from a
+  subdirectory.
+- Fix starting Meld from a differently-named symlink.
+- Ignore errors when copying file metadata if the destination
+  file system doesn't support it.
+- Automatically recompile stale in-place gschemas.
+- Handle SIGINT to support previous quit-on-Ctrl-C behaviour.
+- Fix missing cache opcodes in some circumstance.
+- Fix text view expansion when resizing patch dialog.
+- Build fix to always include C locale when LINGUAS is set.
+  + Updated translations.
+
+---

Old:

  meld-3.12.3.tar.xz

New:

  meld-3.13.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.40thyh/_old  2015-03-30 19:11:38.0 +0200
+++ /var/tmp/diff_new_pack.40thyh/_new  2015-03-30 19:11:38.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:3.12.3
+Version:3.13.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meld.sourceforge.net/
-Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/3.13/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
 BuildRequires:  fdupes

++ meld-3.12.3.tar.xz - meld-3.13.0.tar.xz ++
 16289 lines of diff (skipped)




commit meld for openSUSE:Factory

2015-01-03 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2015-01-03 22:00:49

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-12-23 
11:49:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2015-01-03 
22:00:50.0 +0100
@@ -1,0 +2,14 @@
+Tue Dec 30 11:57:36 UTC 2014 - zai...@opensuse.org
+
+- Update to version 3.12.3:
+  + Fix inconsistent file chooser when cancelling file selection.
+  + UTF-8 encode patches created from the patch dialog.
+  + Fix text-wrapping reset caused by the commit dialog.
+  + Fix text background display on certain themes.
+  + Fix for launching Meld with certain Git environment variables.
+  + Add GTK's settings.ini file for font blurriness fix on Windows.
+  + Updated translations.
+- Drop meld-Dont-pass-git-env-vars.patch and
+  meld-Repaint-TextView-background.patch: Fixed upstream.
+
+---

Old:

  meld-3.12.2.tar.xz
  meld-Dont-pass-git-env-vars.patch
  meld-Repaint-TextView-background.patch

New:

  meld-3.12.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.5oTqUT/_old  2015-01-03 22:00:51.0 +0100
+++ /var/tmp/diff_new_pack.5oTqUT/_new  2015-01-03 22:00:51.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.12.2
+Version:3.12.3
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -26,10 +26,6 @@
 Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
-# PATCH-FIX-UPSTREAM meld-Dont-pass-git-env-vars.patch zai...@opensuse.org 
bgo#741142 -- Don't pass git environment vars on to children, patch from 
upstream git
-Patch1: meld-Dont-pass-git-env-vars.patch
-# PATCH-FIX-UPSTREAM meld-Repaint-TextView-background.patch 
zai...@opensuse.org bgo#741287 boo#909824 -- Repaint TextView background for 
modified CSS. Patch from upstream git
-Patch2: meld-Repaint-TextView-background.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -76,8 +72,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 translation-update-upstream
 
 %build

++ meld-3.12.2.tar.xz - meld-3.12.3.tar.xz ++
 2431 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2014-12-23 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-12-23 11:50:50

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-11-18 
22:44:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-12-23 
11:49:26.0 +0100
@@ -1,0 +2,28 @@
+Thu Dec 18 00:45:56 UTC 2014 - zai...@opensuse.org
+
+- Add meld-Dont-pass-git-env-vars.patch and 
+  meld-Repaint-TextView-background.patch from upstream. Fixes
+  boo#909824.
+
+---
+Thu Nov 13 00:21:04 UTC 2014 - badshah...@gmail.com
+
+- Update to version 3.12.2:
+  + Fix display of change action buttons and line numbers when
+line numbers are shown
+  + Fix positioning of the change action buttons
+  + Fix tab width setting not working correctly
+  + Fix starting comparison of Subversion checkouts from a
+subdirectory
+  + Fix starting Meld from a differently-named symlink 
+  + Ignore errors when copying file metadata if the destination
+file system doesn't support it 
+  + Automatically recompile stale in-place gschemas 
+  + Handle SIGINT to support previous quit-on-Ctrl-C behaviour 
+  + Drop patches (incorporated upstream):
+- meld-ignore-error-when-copying-metadata.patch
+- meld-fix-tab-width-handling.patch
+- meld-starting-from-different-name-symlink.patch
+- meld-SIGINT-handler.patch.
+
+---

Old:

  meld-3.12.1.tar.xz
  meld-SIGINT-handler.patch
  meld-fix-tab-width-handling.patch
  meld-ignore-error-when-copying-metadata.patch
  meld-starting-from-different-name-symlink.patch

New:

  meld-3.12.2.tar.xz
  meld-Dont-pass-git-env-vars.patch
  meld-Repaint-TextView-background.patch



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.rsycqs/_old  2014-12-23 11:49:29.0 +0100
+++ /var/tmp/diff_new_pack.rsycqs/_new  2014-12-23 11:49:29.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.12.1
+Version:3.12.2
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -26,14 +26,10 @@
 Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
-#PATCH-FIX-UPSTREAM meld-fix-tab-width-handling.patch bgo#738001 
badshah...@gmail.com -- Fix GtkSourceView tab width property binding
-Patch1: meld-fix-tab-width-handling.patch
-#PATCH-FIX-UPSTREAM meld-ignore-error-when-copying-metadata.patch 
badshah...@gmail.com -- Ignore ENOTSUP when copying file metadata
-Patch2: meld-ignore-error-when-copying-metadata.patch
-#PATCH-FIX-UPSTREAM meld-SIGINT-handler.patch bgo#739719 badshah...@gmail.com 
-- Add a SIGINT signal handler for convenience
-Patch3: meld-SIGINT-handler.patch 
-#PATCH-FIX-UPSTREAM meld-starting-from-different-name-symlink.patch bgo#739399 
badshah...@gmail.com -- Allow starting Meld from differently-named symlink 
(bgo#739399)
-Patch4: meld-starting-from-different-name-symlink.patch
+# PATCH-FIX-UPSTREAM meld-Dont-pass-git-env-vars.patch zai...@opensuse.org 
bgo#741142 -- Don't pass git environment vars on to children, patch from 
upstream git
+Patch1: meld-Dont-pass-git-env-vars.patch
+# PATCH-FIX-UPSTREAM meld-Repaint-TextView-background.patch 
zai...@opensuse.org bgo#741287 boo#909824 -- Repaint TextView background for 
modified CSS. Patch from upstream git
+Patch2: meld-Repaint-TextView-background.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -82,8 +78,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 translation-update-upstream
 
 %build

++ meld-3.12.1.tar.xz - meld-3.12.2.tar.xz ++
 2400 lines of diff (skipped)

++ meld-Dont-pass-git-env-vars.patch ++
From fb085b23a4f3a22d051b8e6c0d2c5cf8a9a7ca20 Mon Sep 17 00:00:00 2001
From: Kai Willadsen kai.willad...@gmail.com
Date: Sat, 13 Dec 2014 06:21:43 +1000
Subject: bin/meld: Don't pass git environment vars on to children (bgo#741142)

GIT_DIR and GIT_WORK_TREE are somewhat-helpfully set by some helper
tools such as git-gui. However, since we are quite good about setting
the cwd everywhere we call our git helpers, this sometimes messes with
things for us when invoking from subdirectories and whatnot. Since
these vars aren't helping us anyway, we'll just unset them in Meld's

commit meld for openSUSE:Factory

2014-11-18 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-11-18 22:44:43

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-11-04 
17:29:52.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-11-18 
22:44:55.0 +0100
@@ -1,0 +2,13 @@
+Mon Nov  3 17:32:28 UTC 2014 - badshah...@gmail.com
+
+- Add patches from upstream:
+  + meld-fix-tab-width-handling.patch: fix GtkSourceView tab width
+property binding (bgo#738001)
+  + meld-ignore-error-when-copying-metadata.patch: Ignore ENOTSUP
+when copying file metadata
+  + meld-SIGINT-handler.patch: add a SIGINT signal handler for
+convenience (bgo#739719)
+  + meld-starting-from-different-name-symlink.patch: allow
+starting Meld from differently-named symlink (bgo#739399)
+
+---

New:

  meld-SIGINT-handler.patch
  meld-fix-tab-width-handling.patch
  meld-ignore-error-when-copying-metadata.patch
  meld-starting-from-different-name-symlink.patch



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.BcXDQ3/_old  2014-11-18 22:44:56.0 +0100
+++ /var/tmp/diff_new_pack.BcXDQ3/_new  2014-11-18 22:44:56.0 +0100
@@ -26,6 +26,14 @@
 Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
+#PATCH-FIX-UPSTREAM meld-fix-tab-width-handling.patch bgo#738001 
badshah...@gmail.com -- Fix GtkSourceView tab width property binding
+Patch1: meld-fix-tab-width-handling.patch
+#PATCH-FIX-UPSTREAM meld-ignore-error-when-copying-metadata.patch 
badshah...@gmail.com -- Ignore ENOTSUP when copying file metadata
+Patch2: meld-ignore-error-when-copying-metadata.patch
+#PATCH-FIX-UPSTREAM meld-SIGINT-handler.patch bgo#739719 badshah...@gmail.com 
-- Add a SIGINT signal handler for convenience
+Patch3: meld-SIGINT-handler.patch 
+#PATCH-FIX-UPSTREAM meld-starting-from-different-name-symlink.patch bgo#739399 
badshah...@gmail.com -- Allow starting Meld from differently-named symlink 
(bgo#739399)
+Patch4: meld-starting-from-different-name-symlink.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -72,6 +80,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 translation-update-upstream
 
 %build

++ meld-SIGINT-handler.patch ++
From af258a4125fa5bd6f2bbd8cb9cc032847c077d5d Mon Sep 17 00:00:00 2001
From: Kai Willadsen kai.willad...@gmail.com
Date: Sun, 9 Nov 2014 08:43:01 +1000
Subject: bin/meld: Add a SIGINT signal handler for convenience (bgo#739719)

This handler does no nice cleanup or anything, but that makes it
functionally equivalent to Meld 1.8.x in terms of behaviour. We *could*
add nicer handling to ensure that e.g., VC temp files get cleaned up,
but that's another problem.

diff --git a/bin/meld b/bin/meld
index 6da1a80..1e53d59 100755
--- a/bin/meld
+++ b/bin/meld
@@ -21,6 +21,7 @@ from __future__ import print_function
 import locale
 import logging
 import os
+import signal
 import subprocess
 import sys
 
@@ -251,5 +252,6 @@ if __name__ == '__main__':
 setup_resources()
 
 import meld.meldapp
+signal.signal(signal.SIGINT, lambda *args: meld.meldapp.app.quit())
 status = meld.meldapp.app.run(sys.argv)
 sys.exit(status)
-- 
cgit v0.10.1


++ meld-fix-tab-width-handling.patch ++
From 6d27183fd85b052bf4f98e13d186b02abd7b6af2 Mon Sep 17 00:00:00 2001
From: Kai Willadsen kai.willad...@gmail.com
Date: Tue, 28 Oct 2014 06:42:02 +1000
Subject: sourceview: Fix GtkSourceView tab width property binding (bgo#738001)

The tab-width and indent-width properties interact weirdly if they're
different. This was a breakage in the GtkSourceView 3 migration, so
just switch the binding back over here.

This might cause some pain in the future if we want to support setting
both for some reason, but I don't actually know why we'd want to do
that.

diff --git a/meld/sourceview.py b/meld/sourceview.py
index 48aa9a2..a0c9e4f 100644
--- a/meld/sourceview.py
+++ b/meld/sourceview.py
@@ -49,7 +49,7 @@ class MeldSourceView(GtkSource.View):
 __gtype_name__ = MeldSourceView
 
 __gsettings_bindings__ = (
-('indent-width', 'indent-width'),
+('indent-width', 'tab-width'),
 ('insert-spaces-instead-of-tabs', 'insert-spaces-instead-of-tabs'),
 ('show-line-numbers', 

commit meld for openSUSE:Factory

2014-11-04 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-11-04 17:29:20

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-10-11 
19:27:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-11-04 
17:29:52.0 +0100
@@ -1,0 +2,10 @@
+Sun Nov  2 20:09:40 UTC 2014 - andreas.stie...@gmx.de
+
+- Update to version 3.12.1:
+  + Work around change colours not displaying on GTK+ 3.14.
+  + Fix missing cache opcodes in some circumstances.
+  + Fix text view expansion when resizing patch dialog.
+  + Build fix to always include C locale when LINGUAS is set.
+- Drop meld-format-as-patch-dialog-window.patch: fixed upstream.
+
+---

Old:

  meld-3.12.0.tar.xz
  meld-format-as-patch-dialog-window.patch

New:

  meld-3.12.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.lsSS6k/_old  2014-11-04 17:29:53.0 +0100
+++ /var/tmp/diff_new_pack.lsSS6k/_new  2014-11-04 17:29:53.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:3.12.0
+Version:3.12.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -26,8 +26,6 @@
 Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
-# PATCH-FIX-UPSTREAM meld-format-as-patch-dialog-window.patch bgo#738120 
badshah...@gmail.com -- Fix vertical resizing of the format-as-patch dialog; 
taken from upstream git
-Patch1: meld-format-as-patch-dialog-window.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -74,7 +72,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 translation-update-upstream
 
 %build

++ meld-3.12.0.tar.xz - meld-3.12.1.tar.xz ++
 4108 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2014-10-11 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-10-11 19:26:12

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-09-30 
19:41:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-10-11 
19:27:07.0 +0200
@@ -1,0 +2,6 @@
+Thu Oct  9 00:02:02 UTC 2014 - badshah...@gmail.com
+
+- Add meld-format-as-patch-dialog-window.patch: fix vertical
+  resizing of the format-as-patch dialog (bgo#738120).
+
+---

New:

  meld-format-as-patch-dialog-window.patch



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.dlHHo4/_old  2014-10-11 19:27:08.0 +0200
+++ /var/tmp/diff_new_pack.dlHHo4/_new  2014-10-11 19:27:08.0 +0200
@@ -26,6 +26,8 @@
 Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
+# PATCH-FIX-UPSTREAM meld-format-as-patch-dialog-window.patch bgo#738120 
badshah...@gmail.com -- Fix vertical resizing of the format-as-patch dialog; 
taken from upstream git
+Patch1: meld-format-as-patch-dialog-window.patch
 BuildRequires:  fdupes
 # Needed for glib2_gsettings_schema macros
 BuildRequires:  glib2-devel
@@ -72,6 +74,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 translation-update-upstream
 
 %build

++ meld-format-as-patch-dialog-window.patch ++
From 6628d80c895cf0b7f9bdba5c3374043eceb4eb0c Mon Sep 17 00:00:00 2001
From: Kai Willadsen kai.willad...@gmail.com
Date: Thu, 9 Oct 2014 07:19:12 +1000
Subject: patchdialog: Update to new Glade and fix sourceview expand
 (bgo#738120)


diff --git a/data/ui/patch-dialog.ui b/data/ui/patch-dialog.ui
index 9710e59..4abfff3 100644
--- a/data/ui/patch-dialog.ui
+++ b/data/ui/patch-dialog.ui
@@ -1,108 +1,163 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.18.1 --
 interface
-  requires lib=gtk+ version=2.16/
-  !-- interface-naming-policy toplevel-contextual --
+  requires lib=gtk+ version=3.6/
   object class=GtkDialog id=patchdialog
 property name=visibleTrue/property
+property name=can_focusFalse/property
 property name=border_width12/property
 property name=title translatable=yesFormat as Patch/property
 property name=type_hintdialog/property
 property name=skip_taskbar_hintTrue/property
 property name=skip_pager_hintTrue/property
 child internal-child=vbox
-  object class=GtkVBox id=dialog-vbox3
+  object class=GtkBox id=dialog-vbox3
 property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
 property name=spacing6/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=layout_styleend/property
+child
+  object class=GtkButton id=button1
+property name=label translatable=yesCopy to 
Clipboard/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=receives_defaultFalse/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillFalse/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=button9
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=receives_defaultFalse/property
+property name=use_stockTrue/property
+accelerator key=Escape signal=activate/
+  /object
+  packing
+property name=expandFalse/property
+property name=fillFalse/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=button7
+property name=label translatable=yesSave 

commit meld for openSUSE:Factory

2014-09-30 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-09-30 19:40:13

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-09-26 
11:21:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-09-30 
19:41:55.0 +0200
@@ -1,0 +2,12 @@
+Sat Sep 27 08:38:21 UTC 2014 - zai...@opensuse.org
+
+- Update to version 3.12.0:
+  + Fixes:
+- Ignore missing files when cleaning up our recently-used
+  folder.
+- Guard against dialogs missing properties they should
+  definitely have.
+- Remove old property from patch dialog.
+  + Updated translations.
+
+---

Old:

  meld-3.11.4.tar.xz

New:

  meld-3.12.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.3MbrqM/_old  2014-09-30 19:41:56.0 +0200
+++ /var/tmp/diff_new_pack.3MbrqM/_new  2014-09-30 19:41:56.0 +0200
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:3.11.4
+Version:3.12.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meld.sourceforge.net/
-Source: 
http://download.gnome.org/sources/meld/3.11/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/3.12/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-nodocs.patch dims...@opensuse.org -- We do not want 
COPYING and NEWS installed like this
 Patch0: meld-nodocs.patch
 BuildRequires:  fdupes

++ meld-3.11.4.tar.xz - meld-3.12.0.tar.xz ++
 1949 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2014-09-26 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-09-26 10:52:07

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-07-21 
10:35:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-09-26 
11:21:27.0 +0200
@@ -1,0 +2,114 @@
+Sat Sep 20 12:18:43 UTC 2014 - zai...@opensuse.org
+
+- Update to version 3.11.4:
+  + Fixes:
+- Only apply the auto merge flag to the last comparison
+  started.
+- Fix install layout issues on Debian-based systems.
+- Fix Open External for files on Windows.
+- Record installation directory and executable location on
+  Windows.
+- Revert to using latin1 as a fallback encoding; this will be
+  reverted in the next unstable series.
+  + Updated translations.
+
+---
+Sat Aug 23 11:05:09 UTC 2014 - dims...@opensuse.org
+
+- Update to version 3.11.3:
+  + Features:
+- Manually handle app menu fallback for non-Gnome shells.
+- Save and restore window maximisation state.
+  + Fixes:
+- Add missing/incomplete Language entries.
+- Miscellaneous code cleanups.
+- Handle broken locale settings better.
+- Fix size allocation issues in preferences UI.
+- Update shebang for environments with Python 3 as default.
+  + Updated translations.
+
+---
+Sun Jul 20 13:56:48 UTC 2014 - dims...@opensuse.org
+
+- Update to version 3.11.2:
+  + Features:
+- File and folder comparison panes can now be resized.
+- Folder comparisons now support scrolling between chunks using
+  the mouse wheel in the link map, like file comparisons.
+  + Fixes:
+- Don't draw spurious actions for equal chunks.
+- Remove default sourceview behaviour for Alt+Left/Right.
+- Fix storing translated column names in configuration.
+- Several fixes for multiple windows in single-instance
+  handling:
+  . Resolve relative paths relative to the correct instance.
+  . Don't create windows in the original instance when the
+calling instance errors out.
+  . Raise the correct window for new windows in the same
+instance.
+  . Exit correctly for command line errors in the calling
+instance.
+- Fix display of unicode paths in repositories.
+- Fix handling of unicode paths in recent files store.
+- Improve behaviour of Open External action, and handle spaces
+  in filenames for the custom editor option.
+- Improve support custom installation prefixes.
+- Changes from version 3.11.1:
+  + Features:
+- New (alpha) infrastructure for stand-alone Windows builds.
+- Display renames and metadata in Bazaar repositories.
+- Improved tab labels in version control comparisons.
+- New merge-order preference to accompany comparison-order.
+- Added a prompt to mark a conflict as resolved from file
+  comparison.
+  + Fixes:
+- Fix filtering for shallow folder comparisons.
+- Several install and distribution fixes.
+- Sundry bug fixes.
+  + Updated translations.
+- Pass --no-update-icon-cache --no-compile-schemas to the distutils
+  script.
+
+---
+Sun Jul 20 10:49:29 UTC 2014 - dims...@opensuse.org
+
+- Update to version 3.11.0:
+  + Features:
+- Supporting hiding empty filtered folders in folder
+  comparison.
+- Notify user when files change externally in file comparison.
+- Use standard GIO file trash handling when deleting files.
+- Newly written Mallard-based help.
+  + User interface updates:
+- Support GNOME 3-style application menu.
+- Visual improvements to several icons.
+- Update Meld's colour scheme.
+- Many visual styling updates, layout tweaks and UI polish.
+  + Internal changes:
+- Port to GObject introspection, GTK+ 3, GApplication,
+  GSettings and other new things starting with 'G'.
+- Port to distutils, based on python-distutils-extra.
+- Move to using CSS for styling and colour definitions.
+- Update to use more modern GTK widgets.
+- Move a lot of extra UI construction into glade/UI files.
+- Make several custom icons themeable.
+- Make Meld a single-instance application, and add support for
+  multiple windows.
+  + Fixes:
+- Improved rendering speed in file comparisons.
+- Copy and paste within a buffer no longer causes occasional
+  incorrect change highlighting.
+- Fixes for version control support.
+- Windows crash fixes.
+- Sundry bug fixes.
+  + Updated translations.
+- Drop 

commit meld for openSUSE:Factory

2014-07-21 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-07-21 10:35:44

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2014-01-28 
12:03:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-07-21 
10:35:47.0 +0200
@@ -1,0 +2,11 @@
+Sat Jul 19 07:55:43 UTC 2014 - zai...@opensuse.org
+
+- Update to version 1.8.6:
+  + Handle spaces in filenames with external editor.
+  + Fix storing translated column names in configuration.
+  + Backport fix for Open externally sensitivity setting.
+  + Fix support for fake comparisons in null VC.
+  + Fix Same filter for shallow comparison cases.
+  + Updated translations.
+
+---

Old:

  meld-1.8.4.tar.xz

New:

  meld-1.8.6.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.Hd43jq/_old  2014-07-21 10:35:48.0 +0200
+++ /var/tmp/diff_new_pack.Hd43jq/_new  2014-07-21 10:35:48.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.8.4
+Version:1.8.6
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.8.4.tar.xz - meld-1.8.6.tar.xz ++
 17829 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2014-01-28 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2014-01-28 12:03:28

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-12-16 
16:35:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2014-01-28 
12:03:29.0 +0100
@@ -1,0 +2,9 @@
+Wed Jan 22 20:49:03 UTC 2014 - dims...@opensuse.org
+
+- Update to version 1.8.4:
+  + Fix crash when scanning CVS-only folders.
+  + Fix crash on Windows when missing cdll.intl.
+  + Fix crash with Italian (it_IT.utf8) locale.
+  + Updated translations.
+
+---

Old:

  meld-1.8.3.tar.xz

New:

  meld-1.8.4.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.sK38IY/_old  2014-01-28 12:03:30.0 +0100
+++ /var/tmp/diff_new_pack.sK38IY/_new  2014-01-28 12:03:30.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.8.3
+Version:1.8.4
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.8.3.tar.xz - meld-1.8.4.tar.xz ++
 6386 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-12-16 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-12-16 16:35:18

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-10-21 
12:30:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-12-16 
16:35:20.0 +0100
@@ -1,0 +2,11 @@
+Sun Dec 15 18:14:19 UTC 2013 - zai...@opensuse.org
+
+- Update to version 1.8.3:
+  + Fix subdirectory comparisons for Subversion 1.6.
+  + Fix git status parsing for some statuses.
+  + Don't disable updating when syncpoints aren't yet active.
+  + Fix modifying column properties causing crashes when using .ini
+config backend.
+  + Updated translations.
+
+---

Old:

  meld-1.8.2.tar.xz

New:

  meld-1.8.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.WbZbOE/_old  2013-12-16 16:35:20.0 +0100
+++ /var/tmp/diff_new_pack.WbZbOE/_new  2013-12-16 16:35:20.0 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.8.2
+Version:1.8.3
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.8.2.tar.xz - meld-1.8.3.tar.xz ++
 8358 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-10-21 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-10-21 12:30:12

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-09-23 
15:25:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-10-21 
12:30:14.0 +0200
@@ -1,0 +2,11 @@
+Sun Oct 20 11:33:25 UTC 2013 - zai...@opensuse.org
+
+- Update to version 1.8.2:
+  + Fix regression selecting Subversion 1.6 repositories.
+  + Fix for unicode usernames on Windows; note that this change
+also moves Meld config from the remote to the local app data
+folder.
+  + Add copyright string to appdata file.
+  + Updated translations.
+
+---

Old:

  meld-1.8.1.tar.xz

New:

  meld-1.8.2.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.YdW8pd/_old  2013-10-21 12:30:14.0 +0200
+++ /var/tmp/diff_new_pack.YdW8pd/_new  2013-10-21 12:30:14.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.8.1
+Version:1.8.2
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.8.1.tar.xz - meld-1.8.2.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.8.1/NEWS new/meld-1.8.2/NEWS
--- old/meld-1.8.1/NEWS 2013-09-22 00:47:41.0 +0200
+++ new/meld-1.8.2/NEWS 2013-10-17 22:57:02.0 +0200
@@ -1,3 +1,19 @@
+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-9-22 meld 1.8.1
 
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.8.1/data/meld.appdata.xml 
new/meld-1.8.2/data/meld.appdata.xml
--- old/meld-1.8.1/data/meld.appdata.xml2013-09-22 00:47:41.0 
+0200
+++ new/meld-1.8.2/data/meld.appdata.xml2013-10-17 22:57:02.0 
+0200
@@ -1,4 +1,5 @@
 ?xml version=1.0 encoding=UTF-8?
+!-- Copyright 2013 Kai Willadsen kai.willad...@gmail.com --
 application
  id type=desktopmeld.desktop/id
  licenceCC0/licence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.8.1/meld/meldapp.py 
new/meld-1.8.2/meld/meldapp.py
--- old/meld-1.8.1/meld/meldapp.py  2013-09-22 00:47:41.0 +0200
+++ new/meld-1.8.2/meld/meldapp.py  2013-10-17 22:57:02.0 +0200
@@ -32,7 +32,7 @@
 from . import preferences
 from . import recent
 
-version = 1.8.1
+version = 1.8.2
 
 
 class MeldApp(gobject.GObject):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.8.1/meld/recent.py 
new/meld-1.8.2/meld/recent.py
--- old/meld-1.8.1/meld/recent.py   2013-09-22 00:47:41.0 +0200
+++ new/meld-1.8.2/meld/recent.py   2013-10-17 22:57:02.0 +0200
@@ -28,6 +28,7 @@
 
 import ConfigParser
 import os
+import sys
 import tempfile
 
 from gettext import gettext as _
@@ -48,7 +49,9 @@
 
 class RecentFiles(object):
 
-recent_path = os.path.join(glib.get_user_data_dir(), meld)
+recent_dirname = Meld if sys.platform == win32 else meld
+recent_path = os.path.join(glib.get_user_data_dir(), recent_dirname)
+recent_path = recent_path.decode('utf8')
 recent_suffix = .meldcmp
 
 # Recent data
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.8.1/meld/util/prefs.py 
new/meld-1.8.2/meld/util/prefs.py
--- old/meld-1.8.1/meld/util/prefs.py   2013-09-22 00:47:41.0 +0200
+++ new/meld-1.8.2/meld/util/prefs.py   2013-10-17 22:57:02.0 +0200
@@ -189,7 +189,8 @@
 }
 
 if sys.platform == win32:
-pref_dir = os.path.join(os.getenv(APPDATA), Meld)
+config_dir = glib.get_user_config_dir().decode('utf8')
+pref_dir = os.path.join(config_dir, Meld)
 else:
 pref_dir = os.path.join(glib.get_user_config_dir(), meld)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.8.1/meld/vc/__init__.py 
new/meld-1.8.2/meld/vc/__init__.py
--- old/meld-1.8.1/meld/vc/__init__.py  2013-09-22 00:47:41.0 +0200
+++ 

commit meld for openSUSE:Factory

2013-09-23 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-09-23 15:25:26

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-09-16 
16:16:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-09-23 
15:25:28.0 +0200
@@ -1,0 +2,9 @@
+Sun Sep 22 02:42:09 UTC 2013 - zai...@opensuse.org
+
+- Update to version 1.8.1:
+  + Add AppData file.
+  + Change order of version control selection for CVS and old SVN.
+  + Fix escaped markup in folder comparisons.
+  + Updated translations.
+
+---

Old:

  meld-1.8.0.tar.xz

New:

  meld-1.8.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.37ZgX1/_old  2013-09-23 15:25:29.0 +0200
+++ /var/tmp/diff_new_pack.37ZgX1/_new  2013-09-23 15:25:29.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.8.0
+Version:1.8.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -111,6 +111,8 @@
 %doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%dir %{_datadir}/appdata/
+%{_datadir}/appdata/meld.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/icons/HighContrast/

++ meld-1.8.0.tar.xz - meld-1.8.1.tar.xz ++
 8327 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-09-16 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-09-16 16:16:39

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-09-07 
07:36:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-09-16 
16:16:40.0 +0200
@@ -1,0 +2,7 @@
+Sun Sep 15 17:11:35 UTC 2013 - firebird...@gmail.com
+
+- Update to version 1.8.0:
+  + Fixes: Minor fixes.
+  + Updated translations.
+
+---

Old:

  meld-1.7.5.tar.xz

New:

  meld-1.8.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.cNo284/_old  2013-09-16 16:16:41.0 +0200
+++ /var/tmp/diff_new_pack.cNo284/_new  2013-09-16 16:16:41.0 +0200
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:1.7.5
+Version:1.8.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meld.sourceforge.net/
-Source: 
http://download.gnome.org/sources/meld/1.7/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/1.8/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
 BuildRequires:  fdupes

++ meld-1.7.5.tar.xz - meld-1.8.0.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.7.5/NEWS new/meld-1.8.0/NEWS
--- old/meld-1.7.5/NEWS 2013-09-01 01:07:29.0 +0200
+++ new/meld-1.8.0/NEWS 2013-09-14 23:46:26.0 +0200
@@ -1,3 +1,15 @@
+2013-9-15 meld 1.8.0
+
+
+  Fixes:
+
+* Minor fixes (Kai Willadsen)
+
+  Translations:
+
+* Matej Urbančič (sl)
+
+
 2013-9-1 meld 1.7.5
 ===
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.7.5/data/ui/meldapp.ui 
new/meld-1.8.0/data/ui/meldapp.ui
--- old/meld-1.7.5/data/ui/meldapp.ui   2013-09-01 01:07:29.0 +0200
+++ new/meld-1.8.0/data/ui/meldapp.ui   2013-09-14 23:46:26.0 +0200
@@ -50,7 +50,7 @@
 property name=program-nameMeld/property
 property name=type_hintGDK_WINDOW_TYPE_HINT_DIALOG/property
 property name=copyright translatable=yesCopyright #xA9; 2002-2009 
Stephen Kennedy
-Copyright #xA9; 2009-2012 Kai Willadsen/property
+Copyright #xA9; 2009-2013 Kai Willadsen/property
 property name=websitehttp://meldmerge.org//property
 property name=license translatable=yesMeld 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, either version 2 of the 
License, or (at your option) any later version.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.7.5/meld/filediff.py 
new/meld-1.8.0/meld/filediff.py
--- old/meld-1.7.5/meld/filediff.py 2013-09-01 01:07:29.0 +0200
+++ new/meld-1.8.0/meld/filediff.py 2013-09-14 23:46:26.0 +0200
@@ -937,8 +937,10 @@
 # widget.get_clipboard(
 #gtk.gdk.SELECTION_CLIPBOARD).wait_is_text_available()
 paste = widget.get_editable()
-for action, sens in zip((Cut, Copy, Paste), (cut, copy, paste)):
-self.main_actiongroup.get_action(action).set_sensitive(sens)
+if self.main_actiongroup:
+for action, sens in zip(
+(Cut, Copy, Paste), (cut, copy, paste)):
+self.main_actiongroup.get_action(action).set_sensitive(sens)
 
 def get_selected_text(self):
 Returns selected text of active pane
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.7.5/meld/meldapp.py 
new/meld-1.8.0/meld/meldapp.py
--- old/meld-1.7.5/meld/meldapp.py  2013-09-01 01:07:29.0 +0200
+++ new/meld-1.8.0/meld/meldapp.py  2013-09-14 23:46:26.0 +0200
@@ -32,7 +32,7 @@
 from . import preferences
 from . import recent
 
-version = 1.7.5
+version = 1.8.0
 
 
 class MeldApp(gobject.GObject):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/meld-1.7.5/po/sl.po new/meld-1.8.0/po/sl.po
--- old/meld-1.7.5/po/sl.po 2013-09-01 01:07:29.0 +0200
+++ new/meld-1.8.0/po/sl.po 2013-09-14 23:46:26.0 +0200
@@ -9,8 +9,8 @@
 Project-Id-Version: meld master\n
 Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?;
 

commit meld for openSUSE:Factory

2013-09-06 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-09-07 07:36:45

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-08-01 
15:48:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-09-07 
07:36:46.0 +0200
@@ -1,0 +2,18 @@
+Tue Sep  3 15:47:11 UTC 2013 - zai...@opensuse.org
+
+- Update to version 1.7.5:
+  + Features:
+- Open the version control console view when the exit code of a
+  VC operation indicates that there was an error.
+- Improve our handling of bad gconf setups, and add a
+  file-system key to force a no-gconf fallback for persistent
+  issues.
+- Add a preference for whether to highlight the current line of
+  a file comparison.
+- Keyboard shortcut for the commit dialog.
+  + Fixes:
+- Fix traversing symlink loops in version control comparisons.
+- Minor fixes and cleanups.
+  + Updated translations.
+
+---

Old:

  meld-1.7.4.tar.xz

New:

  meld-1.7.5.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.xkDCit/_old  2013-09-07 07:36:47.0 +0200
+++ /var/tmp/diff_new_pack.xkDCit/_new  2013-09-07 07:36:47.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.7.4
+Version:1.7.5
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.7.4.tar.xz - meld-1.7.5.tar.xz ++
 4545 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-08-01 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-08-01 15:48:07

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-06-24 
09:34:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-08-01 
15:48:09.0 +0200
@@ -1,0 +2,24 @@
+Sun Jul 28 12:23:03 UTC 2013 - zai...@opensuse.org
+
+- Update to version 1.7.4:
+  + Features:
+- Commit dialog can now automatically wrap commit messages.
+- Add Bazaar support for pushing changes, and improve
+  sensitivity setting.
+- Support Subversion 1.8.
+- Type-ahead-find search now works in folder comparisons.
+- Preference to swap pane order left = local.
+- Arch, Codeville and RCS are no longer supported.
+  + Fixes:
+- When opening new tabs from the command line, bring new tab to
+  the front.
+- Current chunk highlight is now customisable using gtkrc.
+- Syncpoints now prevent chunks from being re-merged,
+  syncpoints move with insertions, and disable automatic
+  updating.
+- Various version control updates and fixes.
+- Sensitivity fixes.
+- Translation string fixes.
+  + Updated translations.
+
+---

Old:

  meld-1.7.3.tar.xz

New:

  meld-1.7.4.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.HwDHj4/_old  2013-08-01 15:48:10.0 +0200
+++ /var/tmp/diff_new_pack.HwDHj4/_new  2013-08-01 15:48:10.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.7.3
+Version:1.7.4
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.7.3.tar.xz - meld-1.7.4.tar.xz ++
 13240 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-06-24 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-06-24 09:34:55

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld

Changes:

--- /work/SRC/openSUSE:Factory/meld/meld.changes2013-04-24 
12:23:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-06-24 
09:34:57.0 +0200
@@ -1,0 +2,39 @@
+Thu Jun  6 16:12:37 UTC 2013 - zai...@opensuse.org
+
+- Update to version 1.7.3:
+  + Features:
+- Support launching conflict comparisons from Subversion.
+- The external text editor setting now supports opening files
+  at a particular line number.
+- A host of minor improvements to the version control UI,
+  including:
+  . Add a new Push action for VC modules, currently supported
+in Git.
+  . Show a summary of unpushed commits, currently supported in
+Git.
+  . Reworked commit dialog, including more details about files
+to be committed and more useful previous-log selection.
+  . Console output for VC comparisons is now formatted to
+better distinguish commands, output and errors.
+  . Support better sensitivity handling in VC comparisons,
+currently implemented by Git.
+- Sundry minor UI improvements:
+  . Much HIG-ification and better wording for actions, dialogs
+and labels.
+  . Make columns user-resizable in version control and folder
+comparisons.
+  . There is now a Save All action, to save all modified files
+in the current comparison.
+  . Rather than giving up on long inline-highlighting
+comparisons, Meld now prompts to continue the comparison.
+  . F5 is now a additional shortcut for Refresh.
+  . Reload has been renamed to Revert and its UI has been
+improved for file comparisons.
+ + Fixes:
+   - Version control updates and miscellaneous fixes.
+   - When guessing file types for syntax highlighting, we now use
+ file contents as well as extension.
+   - Prev/Next Change navigation now centres changes slightly more
+ aggressively.
+
+---

Old:

  meld-1.7.2.tar.xz

New:

  meld-1.7.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.6sR2nl/_old  2013-06-24 09:34:57.0 +0200
+++ /var/tmp/diff_new_pack.6sR2nl/_new  2013-06-24 09:34:57.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.7.2
+Version:1.7.3
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

++ meld-1.7.2.tar.xz - meld-1.7.3.tar.xz ++
 23841 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-04-24 Thread h_root
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.changes2013-03-08 
09:22:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-04-24 
10:47:26.0 +0200
@@ -1,0 +2,21 @@
+Tue Apr 16 17:14:56 UTC 2013 - dims...@opensuse.org
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.WiMrS2/_new  2013-04-24 10:47:35.0 +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 prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
-# PATCH-FIX-OPENSUSE meld-no-updates.patch dims...@opensuse.org -- 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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2013-03-08 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2013-03-08 09:22:51

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.changes2012-11-19 
07:06:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2013-03-08 
09:22:53.0 +0100
@@ -1,0 +2,35 @@
+Fri Mar  1 16:11:45 UTC 2013 - dims...@opensuse.org
+
+- Update to version 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.
+- Shallow comparison (i.e., based on size and timestamp) are
+  now supported for folder comparisons, including timestamp
+  resolution preferences for cross-filesystem comparisons.
+- 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
+- Recently-used comparisons are now supported, allowing you to
+  re-open previous comparisons directly.
+- 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.
+  + Bugfixes:
+- New version control API, currently used by Git and SVN
+- Version control compatibility updates and fixes
+- Command line labelling options now apply to folder tabs
+- Regressions from parallel inline highlighting calculations
+  have been fixed
+- Diff algorithm cleanup
+- Compatibility fixes for Python 3; this does *not* mean that
+  Meld works on Python 3 yet, just that 2to3 issues have been
+  addressed
+  + Updated translations.
+- Add meld-no-updates.patch: do not execute update-mime-database
+  and update-desktop-database during make install. We have to
+  execute these on the target systems.
+- Clean up spec-file, removing obsolete if's for old versions.
+
+---

Old:

  meld-1.7.0.tar.xz

New:

  meld-1.7.1.tar.xz
  meld-no-updates.patch



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.hGSBPY/_old  2013-03-08 09:22:54.0 +0100
+++ /var/tmp/diff_new_pack.hGSBPY/_new  2013-03-08 09:22:54.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.7.0
+Version:1.7.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -26,12 +26,16 @@
 Source: 
http://download.gnome.org/sources/meld/1.7/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
+# PATCH-FIX-OPENSUSE meld-no-updates.patch dims...@opensuse.org -- 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
-# For directory ownership
+# Needed for highcolor macros
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  python
 BuildRequires:  scrollkeeper
+# Needed for shared-mime-info macros
+BuildRequires:  shared-mime-info
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 %if 0%{?suse_version} = 1210
@@ -40,12 +44,7 @@
 %endif
 # needed for VCS diffs
 Requires:   patch
-%if 0%{?suse_version} = 1130
-# For gconf
-Requires:   python-gnome
-%else
 Requires:   python-gconf
-%endif
 Requires:   python-gtk = 2.8.0
 Recommends: %{name}-lang
 Recommends: python-gtksourceview
@@ -75,6 +74,7 @@
 %setup -q
 translation-update-upstream
 %patch1
+%patch2 -p1
 
 %build
 make prefix=%{_prefix} libdir=%{_datadir}
@@ -90,19 +90,17 @@
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?suse_version}  1130
-
 %post
 %desktop_database_post
 %icon_theme_cache_post
-%endif
-
-%if 0%{?suse_version}  1130
+%icon_theme_cache_post HighContrast
+%mime_database_post
 
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
-%endif
+%icon_theme_cache_postun HighContrast
+%mime_database_postun
 
 %files
 %defattr(-,root,root,-)
@@ -117,8 +115,9 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 

commit meld for openSUSE:Factory

2012-11-18 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2012-11-19 07:06:11

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.changes2012-10-24 
17:13:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2012-11-19 
07:06:13.0 +0100
@@ -1,0 +2,20 @@
+Wed Nov  7 09:10:08 UTC 2012 - dims...@opensuse.org
+
+- Update to version 1.7.0:
+  + File comparisons are faster! Meld now has a smarter
+pre-processing step for inline highlighting of differences and
+does its highlighting calculations asynchronously, leading to
+better overall performance and interactivity.
+  + Auto-merge mode is now available from the command-line.
+  + Comparisons can be opened in new tabs (rather than in a new
+window) from the command line.
+  + Custom colours can now be configured for all Meld drawing.
+  + Improved behaviour when opening many tabs at once.
+  + Notification of searches wrapping around the buffer.
+  + Better compatibility with non-standard keyboard layouts.
+  + Better error reporting for failed VC comparisons.
+  + Version control compatibility updates and fixes.
+  + Other miscellaneous bug fixes.
+  + Updated translations.
+
+---

Old:

  meld-1.6.1.tar.xz

New:

  meld-1.7.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.Gg8aMO/_old  2012-11-19 07:06:14.0 +0100
+++ /var/tmp/diff_new_pack.Gg8aMO/_new  2012-11-19 07:06:14.0 +0100
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:1.6.1
+Version:1.7.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meld.sourceforge.net/
-Source: 
http://download.gnome.org/sources/meld/1.6/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/1.7/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
 BuildRequires:  fdupes

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2012-10-24 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2012-10-24 17:13:42

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.changes2012-05-16 
21:08:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2012-10-24 
17:13:44.0 +0200
@@ -1,0 +2,14 @@
+Sun Oct 21 10:40:07 UTC 2012 - zai...@opensuse.org
+
+- Update to version 1.6.1:
+  + Fix traceback from invalid tree cursor paths (rh#832969,
+rh#837133).
+  + Fix traceback when popping up right-click menus in empty tree
+sections (rh#843879).
+  + Fix Bazaar comparisons including exec bit changes (bgo#682852).
+  + Avoid spurious listings in Bazaar with shelved items.
+  + Fix copying symlinks in directories (rh#836606).
+  + Support newer Fossil VC (bgo#683969).
+  + Fix compatibility with Python 2.5.
+
+---

Old:

  meld-1.6.0.tar.xz

New:

  meld-1.6.1.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.D7hhBt/_old  2012-10-24 17:13:52.0 +0200
+++ /var/tmp/diff_new_pack.D7hhBt/_new  2012-10-24 17:13:52.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.6.0
+Version:1.6.1
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2012-05-16 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2012-05-16 21:08:13

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.changes2012-04-12 
09:41:08.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2012-05-16 
21:08:21.0 +0200
@@ -1,0 +2,7 @@
+Sun Apr 29 20:35:45 UTC 2012 - dims...@opensuse.org
+
+- Update to version 1.6.0:
+  + Fix cursor location handling when our tree models change.
+  + Updated translations.
+
+---

Old:

  meld-1.5.4.tar.xz

New:

  meld-1.6.0.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.JfjOAu/_old  2012-05-16 21:08:22.0 +0200
+++ /var/tmp/diff_new_pack.JfjOAu/_new  2012-05-16 21:08:22.0 +0200
@@ -17,13 +17,13 @@
 
 
 Name:   meld
-Version:1.5.4
+Version:1.6.0
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
 Group:  Development/Tools/Other
 Url:http://meld.sourceforge.net/
-Source: 
http://download.gnome.org/sources/meld/1.5/%{name}-%{version}.tar.xz
+Source: 
http://download.gnome.org/sources/meld/1.6/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
 BuildRequires:  fdupes

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2012-04-12 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2012-04-12 09:41:07

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.changes2012-02-16 
12:23:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2012-04-12 
09:41:08.0 +0200
@@ -1,0 +2,10 @@
+Tue Apr  3 08:13:55 UTC 2012 - vu...@opensuse.org
+
+- Update to version 1.5.4:
+  + Fixes:
+- Slightly faster diff calculation
+- Avoid too-tall commit dialogues
+- Minor bug fixes and performance improvements
+  + Updated translations.
+
+---

Old:

  meld-1.5.3.tar.xz

New:

  meld-1.5.4.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.r7nRTU/_old  2012-04-12 09:41:09.0 +0200
+++ /var/tmp/diff_new_pack.r7nRTU/_new  2012-04-12 09:41:09.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   meld
-Version:1.5.3
+Version:1.5.4
 Release:0
 Summary:Visual diff and merge tool
 License:GPL-2.0+
@@ -30,8 +30,8 @@
 # For directory ownership
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
-BuildRequires:  scrollkeeper
 BuildRequires:  python
+BuildRequires:  scrollkeeper
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 %if 0%{?suse_version} = 1210

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2012-02-16 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2012-02-16 12:23:55

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.changes2011-09-23 
02:12:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes   2012-02-16 
12:23:59.0 +0100
@@ -1,0 +2,27 @@
+Tue Jan 31 14:11:21 UTC 2012 - dims...@opensuse.org
+
+- Update to version 1.5.3:
+  + New features:
+- Add simple animations for chunk actions to make it easier to
+  follow the result of insertion and deletion actions
+- Show the currently displayed page area in the side bars
+  + Fixes:
+- Don't show links between chunks where one of the chunks is
+  completely off-screen, reducing visual clutter
+- Syntax highlighting will now assume that all files in a
+  comparison are of the same type if we can't determine
+  otherwise
+- Some fixes to colour usage and legibility for dark themes,
+  with more theme fixes coming soon
+- Remember active filters across sessions in directory and VC
+  comparions
+- 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
+- Work with Subversion 1.7
+- Many sundry bug fixes
+  + Updated translations.
+- Add xz BuildRequires on openSUSE = 12.1, in order to be able to
+  decompress the xz-compressed tarball.
+
+---

Old:

  meld-1.5.2.tar.bz2

New:

  meld-1.5.3.tar.xz



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.XRcs7X/_old  2012-02-16 12:24:01.0 +0100
+++ /var/tmp/diff_new_pack.XRcs7X/_new  2012-02-16 12:24:01.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package meld
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,14 @@
 #
 
 
-
 Name:   meld
-Version:1.5.2
-Release:1
-License:GPL-2.0+
+Version:1.5.3
+Release:0
 Summary:Visual diff and merge tool
-Url:http://meld.sourceforge.net/
+License:GPL-2.0+
 Group:  Development/Tools/Other
-Source: 
http://download.gnome.org/sources/meld/1.5/%{name}-%{version}.tar.bz2
+Url:http://meld.sourceforge.net/
+Source: 
http://download.gnome.org/sources/meld/1.5/%{name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
 BuildRequires:  fdupes
@@ -35,6 +34,10 @@
 BuildRequires:  python
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+%if 0%{?suse_version} = 1210
+# Only needed for openSUSE = 12.1; later it is pulled in by rpm-build.
+BuildRequires:  xz
+%endif
 # needed for VCS diffs
 Requires:   patch
 %if 0%{?suse_version} = 1130
@@ -103,7 +106,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS
+%doc COPYING NEWS
 %dir %{_datadir}/gnome/
 %dir %{_datadir}/gnome/help/
 %dir %{_datadir}/gnome/help/%{name}/

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2011-12-06 Thread h_root
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2011-12-06 18:28:49

Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and  /work/SRC/openSUSE:Factory/.meld.new (New)


Package is meld, Maintainer is 

Changes:




Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.lGuADu/_old  2011-12-06 18:51:01.0 +0100
+++ /var/tmp/diff_new_pack.lGuADu/_new  2011-12-06 18:51:01.0 +0100
@@ -20,7 +20,7 @@
 Name:   meld
 Version:1.5.2
 Release:1
-License:GPLv2+
+License:GPL-2.0+
 Summary:Visual diff and merge tool
 Url:http://meld.sourceforge.net/
 Group:  Development/Tools/Other

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2011-08-03 Thread h_root

Hello community,

here is the log from the commit of package meld for openSUSE:Factory
checked in at Wed Aug 3 11:01:39 CEST 2011.




--- meld/meld.changes   2011-06-09 15:17:27.0 +0200
+++ /mounts/work_src_done/STABLE/meld/meld.changes  2011-07-24 
14:06:25.0 +0200
@@ -1,0 +2,23 @@
+Sun Jul 24 12:20:40 CEST 2011 - vu...@opensuse.org
+
+- Update to version 1.5.2:
+  + New features:
+- Add a new menu item and shortcut for switching between panes
+  in file comparisons
+- Support type-ahead search in version control views
+  + 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
+- Fix incorrect comparison display in files containing FF or
+  NEL linebreak literals
+- Updates to the Fossil version control support
+- Use faster validity check for Bazaar repositories
+- Many minor updates and other fixes
+  + Updated translations.
+- Add Suggests for various vcs that meld can deal with:
+  + vcs available in openSUSE: bzr, cvs, git-core, mercurial,
+monotone, subversion.
+  + vcs available in OBS: darcs, fossil, tla.
+
+---

calling whatdependson for head-i586


Old:

  meld-1.5.1.tar.bz2

New:

  meld-1.5.2.tar.bz2



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.H5Inhe/_old  2011-08-03 11:01:07.0 +0200
+++ /var/tmp/diff_new_pack.H5Inhe/_new  2011-08-03 11:01:07.0 +0200
@@ -18,13 +18,13 @@
 
 
 Name:   meld
-Version:1.5.1
-Release:2
+Version:1.5.2
+Release:1
 License:GPLv2+
 Summary:Visual diff and merge tool
 Url:http://meld.sourceforge.net/
 Group:  Development/Tools/Other
-Source: 
http://ftp.gnome.org/pub/gnome/sources/meld/1.3/%{name}-%{version}.tar.bz2
+Source: 
http://download.gnome.org/sources/meld/1.5/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE meld-1.3.0-scrollkeeper.patch prus...@suse.cz -- don't 
use env
 Patch1: %{name}-1.3.0-env.patch
 BuildRequires:  fdupes
@@ -46,6 +46,17 @@
 Requires:   python-gtk = 2.8.0
 Recommends: %{name}-lang
 Recommends: python-gtksourceview
+# Suggest various vcs that meld can handle
+Suggests:   bzr
+Suggests:   cvs
+Suggests:   git-core
+Suggests:   mercurial
+Suggests:   monotone
+Suggests:   subversion
+# Not in Factory, but still in OBS
+Suggests:   darcs
+Suggests:   fossil
+Suggests:   tla
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
 

++ meld-1.5.1.tar.bz2 - meld-1.5.2.tar.bz2 ++
 10944 lines of diff (skipped)






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2011-06-10 Thread h_root

Hello community,

here is the log from the commit of package meld for openSUSE:Factory
checked in at Fri Jun 10 09:41:00 CEST 2011.




--- meld/meld.changes   2011-04-26 14:47:10.0 +0200
+++ /mounts/work_src_done/STABLE/meld/meld.changes  2011-06-09 
15:17:27.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun  9 15:17:19 CEST 2011 - vu...@opensuse.org
+
+- On 11.4 and later, change python-gnome Requires to python-gconf
+  since this is the only module being used from python-gnome.
+
+---

calling whatdependson for head-i586




Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.i24XcG/_old  2011-06-10 09:40:25.0 +0200
+++ /var/tmp/diff_new_pack.i24XcG/_new  2011-06-10 09:40:25.0 +0200
@@ -19,7 +19,7 @@
 
 Name:   meld
 Version:1.5.1
-Release:1
+Release:2
 License:GPLv2+
 Summary:Visual diff and merge tool
 Url:http://meld.sourceforge.net/
@@ -37,8 +37,12 @@
 BuildRequires:  update-desktop-files
 # needed for VCS diffs
 Requires:   patch
-# For gconf bindings
-Requires:   python-gnome = 2.6.0
+%if 0%{?suse_version} = 1130
+# For gconf
+Requires:   python-gnome
+%else
+Requires:   python-gconf
+%endif
 Requires:   python-gtk = 2.8.0
 Recommends: %{name}-lang
 Recommends: python-gtksourceview






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit meld for openSUSE:Factory

2011-05-02 Thread h_root

Hello community,

here is the log from the commit of package meld for openSUSE:Factory
checked in at Mon May 2 16:39:34 CEST 2011.




--- meld/meld.changes   2011-02-14 20:09:42.0 +0100
+++ /mounts/work_src_done/STABLE/meld/meld.changes  2011-04-26 
14:47:10.0 +0200
@@ -1,0 +2,31 @@
+Sun Mar 20 18:44:06 CET 2011 - dims...@opensuse.org
+
+- Update to version 1.5.1:
+  + New features:
+- Add menu items and keyboard shortcuts for version control and
+  directory comparison actions
+- Add support for the Fossil SCM
+- Add a menu for switching between tabs
+- Add a menu item to unlock scrolling
+  + 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
+- Make line number display work with GtkSourceView 2.10+
+- Support external diff tools in subversion
+- Support CVSNT as a CVS alternative
+- Performance fixes for subversion and bazaar
+- Correctly update a modified file's status in git and svn
+  version control views
+- Make temporary files unwritable to avoid unintentionally
+  editing them
+- Clean up diff results for cleaner comparisons
+- Improve symlink and binary handling, and error cases for
+  directory comparisons
+- Improve copy semantics for directories and symlinks
+- Show case insensitivity and file encoding errors less
+  intrusively
+- Sundry bug fixes
+  + Updated translations.
+
+---

calling whatdependson for head-i586


Old:

  meld-1.5.0.tar.bz2

New:

  meld-1.5.1.tar.bz2



Other differences:
--
++ meld.spec ++
--- /var/tmp/diff_new_pack.nJ1GKU/_old  2011-05-02 16:39:12.0 +0200
+++ /var/tmp/diff_new_pack.nJ1GKU/_new  2011-05-02 16:39:12.0 +0200
@@ -18,8 +18,8 @@
 
 
 Name:   meld
-Version:1.5.0
-Release:8
+Version:1.5.1
+Release:1
 License:GPLv2+
 Summary:Visual diff and merge tool
 Url:http://meld.sourceforge.net/

++ meld-1.5.0.tar.bz2 - meld-1.5.1.tar.bz2 ++
 20067 lines of diff (skipped)






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org