[SCM] glfw packaging branch, master, updated. upstream/2.6-30-g6dfb34d

[Mahyuddin Susanto]

The following commit has been merged in the master branch:
commit 49e975b405e94b67391ae4f45cf8b0021aa882d7
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date:   Tue Oct 11 19:14:12 2011 +0700

    Change short descriptions to avoid duplication

diff --git a/debian/control b/debian/control
index 6a49098..7703035 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Package: libglfw2
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: portable framework for OpenGL application development
+Description: Shared libraries portable framework for OpenGL application development
  GLFW is a free, Open Source, framework for OpenGL application
  development. In short, it is a single library providing a powerful, portable
  API for otherwise operating system specific tasks such as opening an OpenGL
@@ -35,7 +35,7 @@ Depends: libglfw2 (= ${binary:Version}),
          mesa-common-dev,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: portable framework for OpenGL application development
+Description: header files and static libraries portable framework for OpenGL application development
  GLFW is a free, Open Source, framework for OpenGL application
  development. In short, it is a single library providing a powerful, portable
  API for otherwise operating system specific tasks such as opening an OpenGL
diff --git a/debian/patches/fix_compilation_on_non_linux.diff b/debian/patches/fix_compilation_on_non_linux.diff
index afecf03..381959e 100644
--- a/debian/patches/fix_compilation_on_non_linux.diff
+++ b/debian/patches/fix_compilation_on_non_linux.diff
@@ -1,14 +1,14 @@
-Index: glfw-2.7.2/compile.sh
+Index: glfw/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
+--- glfw.orig/compile.sh	2011-10-11 18:47:14.348492865 +0700
++++ glfw/compile.sh	2011-10-11 18:48:33.088883321 +0700
 @@ -95,6 +95,11 @@
    SOFLAGS="-flat_namespace -undefined suppress"
    echo "Mac OS X" 1>&6
    ;;
 +xGNU|xGNU/kFreeBSD)
 +  CFLAGS="$CFLAGS"
-+  LDFLAGS="-shared -Wl,-soname,libglfw.so.2"
++  SOFLAGS="-shared -Wl,-soname,libglfw.so.2"
 +  echo " GNU" 1>&6
 +  ;;
  *)

-- 
glfw packaging