[Pkg-telepathy-commits] [SCM] telepathy-mission-control packaging branch, debian, updated. 48526ae34ec82d2f423fdb76c37dd436d17ad4e2

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 48526ae34ec82d2f423fdb76c37dd436d17ad4e2
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 19:25:10 2008 +0000

    Regenerate patches with debian/rules update-patches

diff --git a/debian/changelog b/debian/changelog
index 58a658d..83d25b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ telepathy-mission-control (4.67-2) UNRELEASED; urgency=low
 
   * Move packaging to git
   * Add `debian/rules update-patches` and gbp.conf for Debian maintainers
+  * Regenerate patches with debian/rules update-patches
   * Add README.source
 
  -- Simon McVittie <smcv at debian.org>  Fri, 26 Dec 2008 19:16:14 +0000
diff --git a/debian/patches/0001-Use-gmodule-no-export-2.0-instead-of-gmodule-2.0-to.patch b/debian/patches/0001-Use-gmodule-no-export-2.0-instead-of-gmodule-2.0-to.patch
new file mode 100644
index 0000000..7e39f2e
--- /dev/null
+++ b/debian/patches/0001-Use-gmodule-no-export-2.0-instead-of-gmodule-2.0-to.patch
@@ -0,0 +1,22 @@
+From 98ebffcb839c119e5d9395a1de61cca653f313f0 Mon Sep 17 00:00:00 2001
+From: Laurent Bigonville <bigon at debian.org>
+Date: Fri, 26 Dec 2008 19:09:27 +0000
+Subject: [PATCH] Use gmodule-no-export-2.0 instead of gmodule-2.0 to avoid all symbols to be exported
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e6cacf7..dc6e917 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0)
+ AC_SUBST(GLIB_LIBS)
+ AC_SUBST(GLIB_CFLAGS)
+ 
+-PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
++PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
+ AC_SUBST(GMODULE_LIBS)
+ AC_SUBST(GMODULE_CFLAGS)
+ 
diff --git a/debian/patches/0002-Add-patch-to-s-Requires-Requires.private-in-.pc.patch b/debian/patches/0002-Add-patch-to-s-Requires-Requires.private-in-.pc.patch
new file mode 100644
index 0000000..a9ff797
--- /dev/null
+++ b/debian/patches/0002-Add-patch-to-s-Requires-Requires.private-in-.pc.patch
@@ -0,0 +1,38 @@
+From 10b4c2ec19d7d9f5179fd0875c7d17f2d4a5d07e Mon Sep 17 00:00:00 2001
+From: Dafydd Harries <daf at rhydd.org>
+Date: Fri, 26 Dec 2008 19:10:35 +0000
+Subject: [PATCH] Add patch to s/Requires/Requires.private/ in *.pc
+
+---
+ libmissioncontrol.pc.in |    3 ++-
+ mission-control.pc.in   |    3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libmissioncontrol.pc.in b/libmissioncontrol.pc.in
+index efdac24..51280e3 100644
+--- a/libmissioncontrol.pc.in
++++ b/libmissioncontrol.pc.in
+@@ -6,7 +6,8 @@ profiles_dir=@PROFILES_DIR@
+ 
+ Name: libmissioncontrol
+ Description:  Mission Control Client Library
+-Requires: dbus-1 >= 0.50, libtelepathy >= 0.3.2, telepathy-glib >= 0.7.1
++Requires: pkg-config >= 0.21
++Requires.private: dbus-1 >= 0.50, libtelepathy >= 0.3.2, telepathy-glib >= 0.7.1
+ Version: @VERSION@
+ Libs: -L${libdir} -lmissioncontrol-client @DBUS_LIBS@
+ Cflags: -I${includedir} @DBUS_CFLAGS@
+diff --git a/mission-control.pc.in b/mission-control.pc.in
+index c2c096e..550b11c 100644
+--- a/mission-control.pc.in
++++ b/mission-control.pc.in
+@@ -6,7 +6,8 @@ pluginlibdir=@pluginlibdir@
+ 
+ Name: mission-control
+ Description:  Mission control filters interface library
+-Requires: dbus-1 >= 0.50, libtelepathy >= 0.0.54
++Requires: pkg-config >= 0.21
++Requires.private: dbus-1 >= 0.50, libtelepathy >= 0.0.54
+ Version: @VERSION@
+ Libs: -L${libdir} -lmissioncontrol-server
+ Cflags: -I${includedir}/mission-control
diff --git a/debian/patches/01_gmodulenoexport.patch b/debian/patches/01_gmodulenoexport.patch
deleted file mode 100644
index 6c44ddf..0000000
--- a/debian/patches/01_gmodulenoexport.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru telepathy-mission-control-4.67.orig/configure.ac telepathy-mission-control-4.67/configure.ac
---- telepathy-mission-control-4.67.orig/configure.ac	2008-09-23 14:34:00.000000000 +0200
-+++ telepathy-mission-control-4.67/configure.ac	2008-09-23 14:34:18.000000000 +0200
-@@ -146,7 +146,7 @@
- AC_SUBST(GLIB_LIBS)
- AC_SUBST(GLIB_CFLAGS)
- 
--PKG_CHECK_MODULES(GMODULE, gmodule-2.0)
-+PKG_CHECK_MODULES(GMODULE, gmodule-no-export-2.0)
- AC_SUBST(GMODULE_LIBS)
- AC_SUBST(GMODULE_CFLAGS)
- 
diff --git a/debian/patches/requires-private.patch b/debian/patches/requires-private.patch
deleted file mode 100644
index 6d14b79..0000000
--- a/debian/patches/requires-private.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' telepathy-mission-control-4.65/libmissioncontrol.pc.in telepathy-mission-control-4.65.new/libmissioncontrol.pc.in
---- telepathy-mission-control-4.65/libmissioncontrol.pc.in	2008-04-08 12:26:02.000000000 +0100
-+++ telepathy-mission-control-4.65.new/libmissioncontrol.pc.in	2008-08-30 13:59:17.000000000 +0100
-@@ -6,7 +6,8 @@
- 
- Name: libmissioncontrol
- Description:  Mission Control Client Library
--Requires: dbus-1 >= 0.50, libtelepathy >= 0.3.2, telepathy-glib >= 0.7.1
-+Requires: pkg-config >= 0.21
-+Requires.private: dbus-1 >= 0.50, libtelepathy >= 0.3.2, telepathy-glib >= 0.7.1
- Version: @VERSION@
- Libs: -L${libdir} -lmissioncontrol-client @DBUS_LIBS@
- Cflags: -I${includedir} @DBUS_CFLAGS@
-diff -Nur -x '*.orig' -x '*~' telepathy-mission-control-4.65/mission-control.pc.in telepathy-mission-control-4.65.new/mission-control.pc.in
---- telepathy-mission-control-4.65/mission-control.pc.in	2008-04-08 12:26:02.000000000 +0100
-+++ telepathy-mission-control-4.65.new/mission-control.pc.in	2008-08-30 13:59:36.000000000 +0100
-@@ -6,7 +6,8 @@
- 
- Name: mission-control
- Description:  Mission control filters interface library
--Requires: dbus-1 >= 0.50, libtelepathy >= 0.0.54
-+Requires: pkg-config >= 0.21
-+Requires.private: dbus-1 >= 0.50, libtelepathy >= 0.0.54
- Version: @VERSION@
- Libs: -L${libdir} -lmissioncontrol-server
- Cflags: -I${includedir}/mission-control

-- 
telepathy-mission-control packaging