debian/changelog | 3 ++
debian/libpixman-1-0.lintian-overrides | 2 -
debian/libpixman-1-0.symbols | 2 -
debian/patches/00-unexport-symbol.diff | 49 +++++++++++++++++++++++++++++++++
debian/patches/series | 2 -
5 files changed, 53 insertions(+), 5 deletions(-)
New commits:
commit 01c2431ef89ef76ae64c4f2beb37ef30f234e758
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Tue Jan 8 18:16:23 2013 +0100
Add 00-unexport-symbol.diff
* Add 00-unexport-symbol.diff
- remove test-only use of _pixman_internal_only_get_implementation
- zap the only test requiring the use of this symbol
diff --git a/debian/changelog b/debian/changelog
index 164db38..c87ccc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ pixman (0.28.2-1) UNRELEASED; urgency=low
[ Maarten Lankhorst ]
* New upstream release.
+ * Add 00-unexport-symbol.diff
+ - remove test-only use of _pixman_internal_only_get_implementation
+ - zap the only test requiring the use of this symbol
-- Cyril Brulebois <k...@debian.org> Tue, 27 Nov 2012 14:00:13 +0100
diff --git a/debian/libpixman-1-0.lintian-overrides
b/debian/libpixman-1-0.lintian-overrides
deleted file mode 100644
index 0b5320d..0000000
--- a/debian/libpixman-1-0.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libpixman-1-0: symbols-declares-dependency-on-other-package
libpixman-1-0-private
-
diff --git a/debian/libpixman-1-0.symbols b/debian/libpixman-1-0.symbols
index d8ee457..8f5f4e5 100644
--- a/debian/libpixman-1-0.symbols
+++ b/debian/libpixman-1-0.symbols
@@ -1,6 +1,4 @@
libpixman-1.so.0 libpixman-1-0 #MINVER#
-| libpixman-1-0-private
- _pixman_internal_only_get_implementation@Base 0 1
pixman_add_trapezoids@Base 0
pixman_add_traps@Base 0
pixman_add_triangles@Base 0.21.6
diff --git a/debian/patches/00-unexport-symbol.diff
b/debian/patches/00-unexport-symbol.diff
new file mode 100644
index 0000000..b74f509
--- /dev/null
+++ b/debian/patches/00-unexport-symbol.diff
@@ -0,0 +1,49 @@
+diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
+index c0a6bc0..2f0edfb 100644
+--- a/pixman/pixman-private.h
++++ b/pixman/pixman-private.h
+@@ -765,12 +765,6 @@ get_implementation (void)
+ return global_implementation;
+ }
+
+-/* This function is exported for the sake of the test suite and not part
+- * of the ABI.
+- */
+-PIXMAN_EXPORT pixman_implementation_t *
+-_pixman_internal_only_get_implementation (void);
+-
+ /* Memory allocation helpers */
+ void *
+ pixman_malloc_ab (unsigned int n, unsigned int b);
+diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
+index b1e9fb6..9245760 100644
+--- a/pixman/pixman-utils.c
++++ b/pixman/pixman-utils.c
+@@ -283,15 +283,6 @@ pixman_region32_copy_from_region16 (pixman_region32_t
*dst,
+ return retval;
+ }
+
+-/* This function is exported for the sake of the test suite and not part
+- * of the ABI.
+- */
+-PIXMAN_EXPORT pixman_implementation_t *
+-_pixman_internal_only_get_implementation (void)
+-{
+- return get_implementation ();
+-}
+-
+ #ifdef DEBUG
+
+ void
+diff --git a/test/Makefile.sources b/test/Makefile.sources
+index 0778971..0f34411 100644
+--- a/test/Makefile.sources
++++ b/test/Makefile.sources
+@@ -4,7 +4,6 @@ TESTPROGRAMS = \
+ pdf-op-test \
+ region-test \
+ region-translate-test \
+- combiner-test \
+ fetch-test \
+ rotate-test \
+ oob-test \
diff --git a/debian/patches/series b/debian/patches/series
index fdffa2a..bad3809 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# placeholder
+00-unexport-symbol.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tsj0l-00023e...@vasks.debian.org
