r41790 - in /packages/experimental/meld/debian: changelog patches/01_skip_compile_schema_and_icon_cache_update.patch patches/series rules

[rbalint at users.alioth.debian.org]

Author: rbalint
Date: Mon May 26 05:08:47 2014
New Revision: 41790

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41790
Log:
New upstream development release

Added:
    packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch
Modified:
    packages/experimental/meld/debian/changelog
    packages/experimental/meld/debian/patches/series
    packages/experimental/meld/debian/rules

Modified: packages/experimental/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/changelog?rev=41790&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog	[utf-8] (original)
+++ packages/experimental/meld/debian/changelog	[utf-8] Mon May 26 05:08:47 2014
@@ -1,9 +1,24 @@
-meld (3.11.0-2) UNRELEASED; urgency=low
-
+meld (3.11.1-1) experimental; urgency=low
+
+  * New upstream development release:
+    - Features:
+      * New (alpha) infrastructure for stand-alone Windows builds
+        (Kai Willadsen)
+      * Display renames and metadata in Bazaar repositories (Louis des Landes)
+      * Improved tab labels in version control comparisons (Kai Willadsen)
+      * New merge-order preference to accompany comparison-order (Kai Willadsen)
+      * Added a prompt to mark a conflict as resolved from file comparison
+        (Kai Willadsen)
+    - Fixes:
+      * Fix filtering for shallow folder comparisons (Casey)
+      * Several install and distribution fixes (Kai Willadsen)
+      * Sundry bug fixes (Dominique Leuenberger, Thomas Klausner,
+        Louis des Landes, Kai Willadsen)
+  * Ship GSettings schema (Closes: #522015)
   * Drop obsolete patch fixing meld's shebang. It is done automatically now.
   * Drop obsoletely recommended gir1.2-gconf-2.0
 
- -- Balint Reczey <balint at balintreczey.hu>  Tue, 25 Feb 2014 21:02:45 +0100
+ -- Balint Reczey <balint at balintreczey.hu>  Mon, 26 May 2014 10:25:13 +0700
 
 meld (3.11.0-1) experimental; urgency=low
 

Added: packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch?rev=41790&op=file
==============================================================================
--- packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch	(added)
+++ packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch	[utf-8] Mon May 26 05:08:47 2014
@@ -0,0 +1,13 @@
+--- meld-3.11.1/meld/build_helpers.py.orig	2014-05-26 11:48:38.011688842 +0700
++++ meld-3.11.1/meld/build_helpers.py	2014-05-26 11:48:55.187687955 +0700
+@@ -62,8 +62,8 @@
+     ]
+ 
+     def __init__(self, *args, **kwargs):
+-        self.no_update_icon_cache = False
+-        self.no_compile_schemas = False
++        self.no_update_icon_cache = True
++        self.no_compile_schemas = True
+         distutils.dist.Distribution.__init__(self, *args, **kwargs)
+ 
+ 

Modified: packages/experimental/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/series?rev=41790&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/series	[utf-8] (original)
+++ packages/experimental/meld/debian/patches/series	[utf-8] Mon May 26 05:08:47 2014
@@ -0,0 +1 @@
+01_skip_compile_schema_and_icon_cache_update.patch

Modified: packages/experimental/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/rules?rev=41790&op=diff
==============================================================================
--- packages/experimental/meld/debian/rules	[utf-8] (original)
+++ packages/experimental/meld/debian/rules	[utf-8] Mon May 26 05:08:47 2014
@@ -10,5 +10,6 @@
 binary-post-install/meld::
 	rm -rf debian/$(cdbs_curpkg)/usr/share/doc/meld-* \
 		debian/$(cdbs_curpkg)/usr/share/meld/icons/COPYING \
-		debian/$(cdbs_curpkg)/usr/share/pyshared/meld/vc/COPYING
+		debian/$(cdbs_curpkg)/usr/share/pyshared/meld/vc/COPYING \
+		debian/$(cdbs_curpkg)/usr/lib/python2.7/dist-packages/meld/vc/COPYING