r29504 - in /packages/experimental/clutter-1.0/debian/patches: eglx_glx_share_same_soname.patch fix_test_data_path.patch series

[ricotz-guest at users.alioth.debian.org]

Author: ricotz-guest
Date: Wed Aug 24 17:48:30 2011
New Revision: 29504

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29504
Log:
add eglx_glx_share_same_soname.patch

Added:
    packages/experimental/clutter-1.0/debian/patches/eglx_glx_share_same_soname.patch
Modified:
    packages/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch
    packages/experimental/clutter-1.0/debian/patches/series

Added: packages/experimental/clutter-1.0/debian/patches/eglx_glx_share_same_soname.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/clutter-1.0/debian/patches/eglx_glx_share_same_soname.patch?rev=29504&op=file
==============================================================================
--- packages/experimental/clutter-1.0/debian/patches/eglx_glx_share_same_soname.patch (added)
+++ packages/experimental/clutter-1.0/debian/patches/eglx_glx_share_same_soname.patch [utf-8] Wed Aug 24 17:48:30 2011
@@ -1,0 +1,34 @@
+From: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+Date: Wed, 2 Feb 2011 17:21:25 -0200
+Subject: [PATCH] Eglx and glx should share the same SONAME, for compatibility reasons.
+
+Based on: http://bugzilla.clutter-project.org/show_bug.cgi?id=2276
+
+Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
+
+Index: clutter-1.7.10/configure.ac
+===================================================================
+--- clutter-1.7.10.orig/configure.ac
++++ clutter-1.7.10/configure.ac
+@@ -283,7 +283,7 @@
+           CLUTTER_WINSYS=cogl
+           CLUTTER_WINSYS_BASE=x11
+           CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
+-          CLUTTER_SONAME_INFIX=eglx
++          CLUTTER_SONAME_INFIX=glx
+         ],
+ 
+         [eglnative],
+Index: clutter-1.7.10/configure
+===================================================================
+--- clutter-1.7.10.orig/configure
++++ clutter-1.7.10/configure
+@@ -12532,7 +12532,7 @@
+           CLUTTER_WINSYS=cogl
+           CLUTTER_WINSYS_BASE=x11
+           CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
+-          CLUTTER_SONAME_INFIX=eglx
++          CLUTTER_SONAME_INFIX=glx
+          ;; #(
+   eglnative) :
+ 

Modified: packages/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch?rev=29504&op=diff
==============================================================================
--- packages/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch [utf-8] (original)
+++ packages/experimental/clutter-1.0/debian/patches/fix_test_data_path.patch [utf-8] Wed Aug 24 17:48:30 2011
@@ -2,11 +2,11 @@
  their data files when they run.
 Author: Alexandros Frantzis <alexandros.frantzis at linaro.org>
 Last-Update: 2010-06-28
-Index: clutter-1.5.12/tests/interactive/Makefile.am
+Index: clutter-1.7.10/tests/interactive/Makefile.am
 ===================================================================
---- clutter-1.5.12.orig/tests/interactive/Makefile.am	2010-12-20 09:05:01.000000000 -0600
-+++ clutter-1.5.12/tests/interactive/Makefile.am	2011-01-12 15:10:14.568983001 -0600
-@@ -108,7 +108,7 @@
+--- clutter-1.7.10.orig/tests/interactive/Makefile.am
++++ clutter-1.7.10/tests/interactive/Makefile.am
+@@ -118,7 +118,7 @@
  test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
  test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
  test_interactive_CPPFLAGS = \

Modified: packages/experimental/clutter-1.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/clutter-1.0/debian/patches/series?rev=29504&op=diff
==============================================================================
--- packages/experimental/clutter-1.0/debian/patches/series [utf-8] (original)
+++ packages/experimental/clutter-1.0/debian/patches/series [utf-8] Wed Aug 24 17:48:30 2011
@@ -1,1 +1,2 @@
 fix_test_data_path.patch
+eglx_glx_share_same_soname.patch