r41951 - in /packages/experimental/meld/debian: changelog patches/02_remove_install_layout.patch patches/series

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

Author: noskcaj-guest
Date: Mon Jul 14 04:09:00 2014
New Revision: 41951

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41951
Log:
* New upstream release
* Add 02_remove_install_layout.patch from ubuntu. Fixes their ftbfs.

Added:
    packages/experimental/meld/debian/patches/02_remove_install_layout.patch
Modified:
    packages/experimental/meld/debian/changelog
    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=41951&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog	[utf-8] (original)
+++ packages/experimental/meld/debian/changelog	[utf-8] Mon Jul 14 04:09:00 2014
@@ -1,3 +1,10 @@
+meld (3.11.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Add 02_remove_install_layout.patch from ubuntu. Fixes their ftbfs.
+
+ -- Jackson Doak <noskcaj at ubuntu.com>  Mon, 14 Jul 2014 13:48:54 +1000
+
 meld (3.11.1-1) experimental; urgency=low
 
   * New upstream development release:

Added: packages/experimental/meld/debian/patches/02_remove_install_layout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/02_remove_install_layout.patch?rev=41951&op=file
==============================================================================
--- packages/experimental/meld/debian/patches/02_remove_install_layout.patch	(added)
+++ packages/experimental/meld/debian/patches/02_remove_install_layout.patch	[utf-8] Mon Jul 14 04:09:00 2014
@@ -0,0 +1,18 @@
+Description: remove broken hardcoded install-layout from setup.py
+Author: Dmitry Shachnev <mitya57 at ubuntu.com>
+Forwarded: no
+Last-Update: 2014-06-16
+
+--- a/setup.py
++++ b/setup.py
+@@ -9,10 +9,6 @@
+ import meld.conf
+ 
+ 
+-if (platform.system() == 'Linux' and
+-        platform.linux_distribution()[0] == 'Ubuntu'):
+-    sys.argv.append('--install-layout=deb')
+-
+ setup(
+     name=meld.conf.__package__,
+     version=meld.conf.__version__,

Modified: packages/experimental/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/patches/series?rev=41951&op=diff
==============================================================================
--- packages/experimental/meld/debian/patches/series	[utf-8] (original)
+++ packages/experimental/meld/debian/patches/series	[utf-8] Mon Jul 14 04:09:00 2014
@@ -1 +1,2 @@
 01_skip_compile_schema_and_icon_cache_update.patch
+02_remove_install_layout.patch