[SCM] glfw packaging branch, master, updated. upstream/2.6-20-g630ae37

[Mahyuddin Susanto]

The following commit has been merged in the master branch:
commit c0f655776e0f22677f9dd7ff676423707aea1f83
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date:   Fri Sep 9 09:16:48 2011 +0700

    refreshing patches

diff --git a/debian/patches/fix-soname.diff b/debian/patches/fix-soname.diff
index 34e78c2..3238f9f 100644
--- a/debian/patches/fix-soname.diff
+++ b/debian/patches/fix-soname.diff
@@ -1,13 +1,13 @@
-Index: glfw-2.6/compile.sh
+Index: glfw-2.7.2/compile.sh
 ===================================================================
---- glfw-2.6.orig/compile.sh	2008-04-16 14:08:06.000000000 +0200
-+++ glfw-2.6/compile.sh	2008-04-16 14:08:21.000000000 +0200
-@@ -85,7 +85,7 @@
+--- glfw-2.7.2.orig/compile.sh	2011-09-09 04:35:06.592500628 +0700
++++ glfw-2.7.2/compile.sh	2011-09-09 04:35:04.972498252 +0700
+@@ -88,7 +88,7 @@
  case "x`uname 2> /dev/null`" in
  xLinux)
-   CFLAGS="$CFLAGS -Dlinux"
--  LDFLAGS="-shared"
-+  LDFLAGS="-shared -Wl,-soname,libglfw.so.2"
-   echo " Linux" 1>&6
+   GLFW_LIB_CFLAGS="$GLFW_LIB_CFLAGS -D_GLFW_USE_LINUX_JOYSTICKS"
+-  SOFLAGS="-shared -Wl,-soname,libglfw.so"
++  SOFLAGS="-shared -Wl,-soname,libglfw.so.2"
+   echo "Linux" 1>&6
    ;;
  xDarwin)
diff --git a/debian/patches/fix_compilation_on_non_linux.diff b/debian/patches/fix_compilation_on_non_linux.diff
index 21bb9b3..afecf03 100644
--- a/debian/patches/fix_compilation_on_non_linux.diff
+++ b/debian/patches/fix_compilation_on_non_linux.diff
@@ -1,8 +1,10 @@
---- a/compile.sh
-+++ b/compile.sh
-@@ -93,6 +93,11 @@
-   LDFLAGS="-flat_namespace -undefined suppress"
-   echo " Mac OS X" 1>&6
+Index: glfw-2.7.2/compile.sh
+===================================================================
+--- glfw-2.7.2.orig/compile.sh	2011-09-09 04:33:08.032326732 +0700
++++ glfw-2.7.2/compile.sh	2011-09-09 04:33:03.422319980 +0700
+@@ -95,6 +95,11 @@
+   SOFLAGS="-flat_namespace -undefined suppress"
+   echo "Mac OS X" 1>&6
    ;;
 +xGNU|xGNU/kFreeBSD)
 +  CFLAGS="$CFLAGS"
@@ -10,5 +12,5 @@
 +  echo " GNU" 1>&6
 +  ;;
  *)
-   LDFLAGS="-shared -soname libglfw.so"
-   echo " Generic Unix" 1>&6
+   SOFLAGS="-shared -soname libglfw.so"
+   echo "Generic Unix" 1>&6

-- 
glfw packaging