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

Jonny Lamb jonny at debian.org
Tue Jan 26 18:21:45 UTC 2010


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

    Added patch to only export symbols with "hildon_" prefix.

diff --git a/debian/changelog b/debian/changelog
index e626205..ac1495c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ libhildon (2.1.34.debian.1-7) UNRELEASED; urgency=low
 
   * debian/patches/:
     + Added patch to link to Xlib. (Closes: #558898)
+    + Added patch to only export symbols with "hildon_" prefix.
   * debian/libhildon-1-0.symbols: Added. (Closes: #557923)
 
- -- Jonny Lamb <jonny at debian.org>  Tue, 26 Jan 2010 13:30:06 +0000
+ -- Jonny Lamb <jonny at debian.org>  Tue, 26 Jan 2010 17:25:21 +0000
 
 libhildon (2.1.34.debian.1-6) UNRELEASED; 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 bf82ae9..18c8be4 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 1/2] Revert hildon_gtk_widget_set_theme_size removal
+Subject: [PATCH 1/3] 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
index fcbe431..9402db1 100644
--- a/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
+++ b/debian/patches/0002-Be-sure-to-link-to-Xlib.patch
@@ -1,7 +1,7 @@
 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.
+Subject: [PATCH 2/3] Be sure to link to Xlib.
 
 Signed-off-by: Jonny Lamb <jonny at debian.org>
 ---
diff --git a/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch b/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch
new file mode 100644
index 0000000..541b5b3
--- /dev/null
+++ b/debian/patches/0003-Only-export-symbols-with-hildon_-prefix.patch
@@ -0,0 +1,24 @@
+From fc3c0af0d0d4041ceadebcd7568302a863b219de Mon Sep 17 00:00:00 2001
+From: Jonny Lamb <jonny at debian.org>
+Date: Tue, 26 Jan 2010 17:24:52 +0000
+Subject: [PATCH 3/3] Only export symbols with "hildon_" prefix.
+
+Signed-off-by: Jonny Lamb <jonny at debian.org>
+---
+ src/Makefile.am |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f131a62..f7a9ce4 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,8 @@ EXTRA_DIST = hildon-marshalers.list
+ 
+ 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_LDFLAGS = $(HILDON_WIDGETS_LT_LDFLAGS) \
++	-export-symbols-regex ^hildon_
+ 
+ libhildon_ at API_VERSION_MAJOR@_la_LIBADD = \
+ 		$(X_LIBS)			\
diff --git a/debian/patches/series b/debian/patches/series
index 6ea6a74..1d821bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Revert-hildon_gtk_widget_set_theme_size-removal.patch
 0002-Be-sure-to-link-to-Xlib.patch
+0003-Only-export-symbols-with-hildon_-prefix.patch

-- 
Debian packaging for libhildon.



More information about the pkg-maemo-commits mailing list