[Pkg-telepathy-commits] [SCM] folks packaging branch branch, debian, updated. debian/0.1.13-1-12-g9461629

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 32f7c1791282365a30d3ee11b20a498ff29354b3
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Aug 30 11:08:00 2010 +0200

    Remove the need of Gee-1.0 gir file (taken from upstream)
    
    * d/p/0001-tp-lowlevel-doesn-t-actually-depend-upon-the-Gee-int.patch:
      - Remove the need of Gee-1.0 gir file (taken from upstream)

diff --git a/debian/changelog b/debian/changelog
index b1752cf..a4ca340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ folks (0.1.15-1) UNRELEASED; urgency=low
   * Enable introspection support
   * debian/libfolks0.symbols: Add new symbols
   * debian/libfolks0.install: Install new key-file backend
+  * d/p/0001-tp-lowlevel-doesn-t-actually-depend-upon-the-Gee-int.patch:
+    - Remove the need of Gee-1.0 gir file (taken from upstream)
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 30 Aug 2010 10:50:39 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 30 Aug 2010 11:06:41 +0200
 
 folks (0.1.13-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-tp-lowlevel-doesn-t-actually-depend-upon-the-Gee-int.patch b/debian/patches/0001-tp-lowlevel-doesn-t-actually-depend-upon-the-Gee-int.patch
new file mode 100644
index 0000000..7d4d37b
--- /dev/null
+++ b/debian/patches/0001-tp-lowlevel-doesn-t-actually-depend-upon-the-Gee-int.patch
@@ -0,0 +1,36 @@
+From: Travis Reitter <travis.reitter at collabora.co.uk>
+Date: Fri, 27 Aug 2010 22:21:05 +0000
+Subject: [PATCH] tp-lowlevel doesn't actually depend upon the Gee introspection file
+
+---
+ backends/telepathy/lib/Makefile.am |    2 +-
+ backends/telepathy/lib/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
+index c7a57e6..da37110 100644
+--- a/backends/telepathy/lib/Makefile.am
++++ b/backends/telepathy/lib/Makefile.am
+@@ -50,7 +50,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ CLEANFILES =
+ 
+ tp-lowlevel.gir: libtp-lowlevel.la
+-tp_lowlevel_gir_INCLUDES = GObject-2.0 Gee-1.0 TelepathyGLib-0.12
++tp_lowlevel_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
+ tp_lowlevel_gir_CFLAGS = $(TP_GLIB_CFLAGS)
+ tp_lowlevel_gir_LIBS = libtp-lowlevel.la
+ tp_lowlevel_gir_FILES = $(libtp_lowlevel_la_SOURCES)
+diff --git a/backends/telepathy/lib/Makefile.in b/backends/telepathy/lib/Makefile.in
+index 8ff480b..cb10d41 100644
+--- a/backends/telepathy/lib/Makefile.in
++++ b/backends/telepathy/lib/Makefile.in
+@@ -326,7 +326,7 @@ INTROSPECTION_GIRS = tp-lowlevel.gir
+ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+ CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+-tp_lowlevel_gir_INCLUDES = GObject-2.0 Gee-1.0 TelepathyGLib-0.12
++tp_lowlevel_gir_INCLUDES = GObject-2.0 TelepathyGLib-0.12
+ tp_lowlevel_gir_CFLAGS = $(TP_GLIB_CFLAGS)
+ tp_lowlevel_gir_LIBS = libtp-lowlevel.la
+ tp_lowlevel_gir_FILES = $(libtp_lowlevel_la_SOURCES)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a3374ff
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-tp-lowlevel-doesn-t-actually-depend-upon-the-Gee-int.patch

-- 
folks packaging branch