r42857 - in /packages/experimental/meld/debian: changelog patches/01_skip_compile_schema_and_icon_cache_update.patch patches/02_remove_install_layout.patch patches/series

[noskcaj-guest at users.alioth.debian.org]

Author: noskcaj-guest
Date: Fri Sep 19 21:48:11 2014
New Revision: 42857

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42857
Log:
* New upstream release
* Drop 02_remove_install_layout.patch, fixd upstream

Removed:
    packages/experimental/meld/debian/patches/02_remove_install_layout.patch
Modified:
    packages/experimental/meld/debian/changelog
    packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch
    packages/experimental/meld/debian/patches/series

Modified: packages/experimental/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/changelog?rev=42857&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog	[utf-8] (original)
+++ packages/experimental/meld/debian/changelog	[utf-8] Fri Sep 19 21:48:11 2014
@@ -1,3 +1,10 @@
+meld (3.11.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Drop 02_remove_install_layout.patch, fixd upstream
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Sat, 20 Sep 2014 07:46:38 +1000
+
 meld (3.11.3-1) experimental; urgency=medium
 
   * New upstream development release

Modified: 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=42857&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch	[utf-8] (original)
+++ packages/experimental/meld/debian/patches/01_skip_compile_schema_and_icon_cache_update.patch	[utf-8] Fri Sep 19 21:48:11 2014
@@ -1,6 +1,10 @@
---- 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 @@
+---
+ meld/build_helpers.py |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/meld/build_helpers.py
++++ b/meld/build_helpers.py
+@@ -66,8 +66,8 @@ class MeldDistribution(distutils.dist.Di
      ]
  
      def __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=42857&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/series	[utf-8] (original)
+++ packages/experimental/meld/debian/patches/series	[utf-8] Fri Sep 19 21:48:11 2014
@@ -1,2 +1 @@
 01_skip_compile_schema_and_icon_cache_update.patch
-02_remove_install_layout.patch