[SCM] Debian packaging for libhildon. branch, debian, updated. debian/2.1.34.debian.1-6-5-g73a824f

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 45d855b90718a7cf1002cca99080231a0bb9ce01
Author: Jonny Lamb <jonny at debian.org>
Date:   Tue Jan 26 10:10:12 2010 +0000

    debian/patches/: Added patch to link to Xlib. (Closes: #558898)
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 0c082d0..a999e5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ libhildon (2.1.34.debian.1-6) UNRELEASED; urgency=low
   * debian/rules: Fix typo. Thanks to Laurent Bigonville
     <bigon at debian.org> for letting us know. (Closes: #546043)
   * debian/control: Bumped Standards-Version. (no changes)
+  * debian/patches/:
+    + Added patch to link to Xlib. (Closes: #558898)
 
- -- Jonny Lamb <jonny at debian.org>  Sat, 19 Sep 2009 12:48:45 +0100
+ -- Jonny Lamb <jonny at debian.org>  Tue, 26 Jan 2010 10:08:42 +0000
 
 libhildon (2.1.34.debian.1-5) unstable; urgency=low
 
diff --git a/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch b/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
index 2f5f366..bf82ae9 100644
--- a/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
+++ b/debian/patches/0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
@@ -1,7 +1,7 @@
 From 36f981a4c9c66e306e97d5a16eaf925e7cea6eae Mon Sep 17 00:00:00 2001
 From: Riku Voipio <riku.voipio at iki.fi>
 Date: Sun, 15 Mar 2009 17:24:42 +0200
-Subject: [PATCH] Revert hildon_gtk_widget_set_theme_size removal
+Subject: [PATCH 1/2] Revert hildon_gtk_widget_set_theme_size removal
 
 The upstream idea of moving hildon_gtk_widget_set_theme_size to
 gtk is pure crack.
diff --git a/debian/patches/0002-Be-sure-to-link-to-Xlib.patch b/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
new file mode 100644
index 0000000..fcbe431
--- /dev/null
+++ b/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
@@ -0,0 +1,45 @@
+From 11952aa83ccd2e446166a39f41ae18e42a60afb9 Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny at debian.org>
+Date: Tue, 26 Jan 2010 10:07:46 +0000
+Subject: [PATCH 2/2] Be sure to link to Xlib.
+
+Signed-off-by: Jonny Lamb <jonny at debian.org>
+---
+ configure.ac    |    4 ++++
+ src/Makefile.am |    2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 079de7e..25c0169 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,6 +42,10 @@ AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_VERSION)
+ 
++PKG_CHECK_MODULES(X, x11)
++AC_SUBST(X_LIBS)
++AC_SUBST(X_CFLAGS)
++
+ # libcanberra is needed for the hildon-note sounds.
+ 
+ PKG_CHECK_MODULES(CANBERRA, libcanberra)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a861afa..f131a62 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -15,12 +15,14 @@ lib_LTLIBRARIES = libhildon- at API_VERSION_MAJOR@.la
+ libhildon_ at API_VERSION_MAJOR@_la_LDFLAGS = $(HILDON_WIDGETS_LT_LDFLAGS)
+ 
+ libhildon_ at API_VERSION_MAJOR@_la_LIBADD = \
++		$(X_LIBS)			\
+ 		$(GTK_LIBS) 			\
+ 	  	$(GCONF_LIBS) 			\
+ 	  	$(CANBERRA_LIBS)		\
+ 	  	@HILDON_LT_LDFLAGS@
+ 
+ libhildon_ at API_VERSION_MAJOR@_la_CFLAGS	= \
++		$(X_CFLAGS)			\
+ 		$(GTK_CFLAGS) 			\
+ 		$(GCONF_CFLAGS) 		\
+ 		$(EXTRA_CFLAGS)			\
diff --git a/debian/patches/series b/debian/patches/series
index bb545b5..6ea6a74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
+0002-Be-sure-to-link-to-Xlib.patch

-- 
Debian packaging for libhildon.