r46715 - in /packages/unstable/gnome-builder/debian: changelog patches/ patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch patches/series rules

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Oct 15 20:11:14 2015
New Revision: 46715

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46715
Log:
* debian/rules: Do not build static libraries
* d/p/0001-vala-remove-in-tree-hack-for-builder-deps.patch: remove in-tree
  hack for builder deps, this removes some runtime error, from upstream

Added:
    packages/unstable/gnome-builder/debian/patches/
    packages/unstable/gnome-builder/debian/patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch
    packages/unstable/gnome-builder/debian/patches/series
Modified:
    packages/unstable/gnome-builder/debian/changelog
    packages/unstable/gnome-builder/debian/rules

Modified: packages/unstable/gnome-builder/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/changelog?rev=46715&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/changelog	[utf-8] Thu Oct 15 20:11:14 2015
@@ -7,8 +7,11 @@
     #801648)
   * Exclude private libraries from dh_makeshlibs call
   * List files currently not installed in the package and install some of them
+  * debian/rules: Do not build static libraries
+  * d/p/0001-vala-remove-in-tree-hack-for-builder-deps.patch: remove in-tree
+    hack for builder deps, this removes some runtime error, from upstream
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 15 Oct 2015 20:59:21 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 15 Oct 2015 22:03:55 +0200
 
 gnome-builder (3.16.3-2) unstable; urgency=medium
 

Added: packages/unstable/gnome-builder/debian/patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch?rev=46715&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch	(added)
+++ packages/unstable/gnome-builder/debian/patches/0001-vala-remove-in-tree-hack-for-builder-deps.patch	[utf-8] Thu Oct 15 20:11:14 2015
@@ -0,0 +1,35 @@
+From 5392b7bab3db0373ca81ee9c541291d7ce05d45d Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert at redhat.com>
+Date: Thu, 15 Oct 2015 08:37:20 -0700
+Subject: [PATCH] vala: remove in-tree hack for builder deps
+
+---
+ plugins/vala-pack/ide-vala-index.vala | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/plugins/vala-pack/ide-vala-index.vala b/plugins/vala-pack/ide-vala-index.vala
+index 56f9b34..093b5e9 100644
+--- a/plugins/vala-pack/ide-vala-index.vala
++++ b/plugins/vala-pack/ide-vala-index.vala
+@@ -90,16 +90,9 @@ namespace Ide
+ 			this.code_context.add_external_package ("glib-2.0");
+ 			this.code_context.add_external_package ("gobject-2.0");
+ 
+-			/* TODO: find packages from build system
+-			 *       the following is just to help us while writing vala in builder
+-			 *       until the build system works.
+-			 */
+-			this.code_context.vapi_directories = new string[] { "libide", "src" };
++			/* TODO: find packages from build system */
+ 			this.code_context.add_external_package ("gio-2.0");
+-			this.code_context.add_external_package ("libvala-0.30");
+-			this.code_context.add_external_package ("libide-1.0");
+-			this.code_context.add_external_package ("gtksourceview-3.0");
+-			this.code_context.add_external_package ("gnome-builder-1.0");
++			this.code_context.add_external_package ("gtk+-3.0");
+ 
+ 			this.report = new Ide.ValaDiagnostics ();
+ 			this.code_context.report = this.report;
+-- 
+2.6.1
+

Added: packages/unstable/gnome-builder/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/patches/series?rev=46715&op=file
==============================================================================
--- packages/unstable/gnome-builder/debian/patches/series	(added)
+++ packages/unstable/gnome-builder/debian/patches/series	[utf-8] Thu Oct 15 20:11:14 2015
@@ -0,0 +1 @@
+0001-vala-remove-in-tree-hack-for-builder-deps.patch

Modified: packages/unstable/gnome-builder/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-builder/debian/rules?rev=46715&op=diff
==============================================================================
--- packages/unstable/gnome-builder/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-builder/debian/rules	[utf-8] Thu Oct 15 20:11:14 2015
@@ -22,6 +22,9 @@
 %:
 	dh $@  --with autotools-dev,gir
 
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-static
+
 # force debian/tmp installation for now until we ship
 # more then one binary package, then this can be dropped...
 override_dh_auto_install: