r32608 - in /desktop/unstable/libxklavier/debian: changelog patches/00git_gir_build_include.patch patches/00git_introspection.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Feb 15 09:40:35 2012
New Revision: 32608

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32608
Log:
* New upstream release.
* Drop 00git_introspection.patch, upstream now.
* Add 00git_gir_build_include.patch: Fix building of GIR. Taken from
  upstream git head.

Added:
    desktop/unstable/libxklavier/debian/patches/00git_gir_build_include.patch
Removed:
    desktop/unstable/libxklavier/debian/patches/00git_introspection.patch
Modified:
    desktop/unstable/libxklavier/debian/changelog
    desktop/unstable/libxklavier/debian/patches/series

Modified: desktop/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/changelog?rev=32608&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/changelog [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/changelog [utf-8] Wed Feb 15 09:40:35 2012
@@ -1,6 +1,10 @@
-libxklavier (5.1-4) UNRELEASED; urgency=low
+libxklavier (5.2-1) UNRELEASED; urgency=low
 
   * debian/watch: Watch for xz tarballs.
+  * New upstream release.
+  * Drop 00git_introspection.patch, upstream now.
+  * Add 00git_gir_build_include.patch: Fix building of GIR. Taken from
+    upstream git head.
 
  -- Martin Pitt <mpitt at debian.org>  Wed, 15 Feb 2012 10:35:02 +0100
 

Added: desktop/unstable/libxklavier/debian/patches/00git_gir_build_include.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/patches/00git_gir_build_include.patch?rev=32608&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/patches/00git_gir_build_include.patch (added)
+++ desktop/unstable/libxklavier/debian/patches/00git_gir_build_include.patch [utf-8] Wed Feb 15 09:40:35 2012
@@ -1,0 +1,27 @@
+From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martin.pitt at ubuntu.com>
+Date: Mon, 16 Jan 2012 16:00:18 +0100
+Subject: [PATCH] Use local include files for building GIR
+
+Add -I argument for g-ir-scanner to use the include files from the local tree
+instead of the ones installed in the system.
+---
+ libxklavier/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am
+index 6c8631a..c53ff6d 100644
+--- a/libxklavier/Makefile.am
++++ b/libxklavier/Makefile.am
+@@ -94,7 +94,7 @@ introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURC
+ 
+ Xkl-1.0.gir: libxklavier.la
+ Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0
+-Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
++Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS)
+ Xkl_1_0_gir_LIBS = libxklavier.la
+ Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources)
+ INTROSPECTION_GIRS += Xkl-1.0.gir
+-- 
+1.7.9
+

Modified: desktop/unstable/libxklavier/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/patches/series?rev=32608&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libxklavier/debian/patches/series [utf-8] Wed Feb 15 09:40:35 2012
@@ -1,2 +1,2 @@
-00git_introspection.patch
+00git_gir_build_include.patch
 use-pkgconfig-properly.patch