[SCM] Packaging for scorched3d branch, master, updated. debian/43.2a.dfsg-6-13-gc06df20

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 9b011616c9fbf0c3f7041bfa08f7a23d4efb9169
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Wed Feb 8 14:03:02 2012 -0500

    removed embedded copy of GLEW library (closes: #634843)

diff --git a/debian/changelog b/debian/changelog
index ec941bf..c966952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ scorched3d (43.3+dfsg-1) precise; urgency=low
   * added myself as an uploader
   * refreshed debian/patches/01-openal-pkgconfig.diff
   * update to debhelper compat level 9
+  * removed embedded copy of GLEW library (closes: #634843)
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 08 Feb 2012 13:16:38 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 08 Feb 2012 14:00:30 -0500
 
 scorched3d (43.2a.dfsg-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 10aa33e..55bda7a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
                libfftw3-dev,
                libfreetype6-dev,
                libgl1-mesa-dev,
+               libglew-dev,
                libglu1-mesa-dev,
                libjpeg-dev,
                libogg-dev,
@@ -32,7 +33,7 @@ Homepage: http://scorched3d.sourceforge.net/
 
 Package: scorched3d
 Architecture: any
-Pre-Depends: dpkg (>= 1.15.6)
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: scorched3d-data (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/0003-remove-embedded-glew.patch b/debian/patches/0003-remove-embedded-glew.patch
new file mode 100644
index 0000000..ceda3a0
--- /dev/null
+++ b/debian/patches/0003-remove-embedded-glew.patch
@@ -0,0 +1,49 @@
+Description: removed the embedded copy of the GLEW library
+Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634843
+
+--- a/configure-gl.m4
++++ b/configure-gl.m4
+@@ -27,7 +27,8 @@
+     if test `uname -s` == Darwin; then 
+         GL_LIBS="-framework OpenGL"
+     else
+-        GL_LIBS="-lGL -lGLU -lpthread" 
++        PKG_CHECK_MODULES([GLEW], [glew])
++        GL_LIBS="$GLEW_LIBS -lGL -lGLU -lpthread"
+     fi
+ fi 
+ 
+--- a/src/client/scorchedc/scorchedc.vcxproj
++++ b/src/client/scorchedc/scorchedc.vcxproj
+@@ -535,7 +535,6 @@
+     <ClCompile Include="..\dialogs\TutorialDialog.cpp" />
+     <ClCompile Include="..\GLEXT\GLCamera.cpp" />
+     <ClCompile Include="..\GLEXT\GLCameraFrustum.cpp" />
+-    <ClCompile Include="..\GLEXT\glew.c" />
+     <ClCompile Include="..\GLEXT\GLFont2d.cpp" />
+     <ClCompile Include="..\GLEXT\GLFont2dFreeType.cpp" />
+     <ClCompile Include="..\GLEXT\GLFont2dStorage.cpp" />
+@@ -1282,7 +1281,6 @@
+     <ClInclude Include="..\dialogs\TutorialDialog.h" />
+     <ClInclude Include="..\GLEXT\GLCamera.h" />
+     <ClInclude Include="..\GLEXT\GLCameraFrustum.h" />
+-    <ClInclude Include="..\GLEXT\glew.h" />
+     <ClInclude Include="..\GLEXT\GLFont2d.h" />
+     <ClInclude Include="..\GLEXT\GLFont2dFreeType.h" />
+     <ClInclude Include="..\GLEXT\GLFont2dStorage.h" />
+@@ -1309,7 +1307,6 @@
+     <ClInclude Include="..\GLEXT\GLVertexBufferObject.h" />
+     <ClInclude Include="..\GLEXT\GLViewPort.h" />
+     <ClInclude Include="..\GLEXT\glxew.h" />
+-    <ClInclude Include="..\GLEXT\wglew.h" />
+     <ClInclude Include="..\GLSL\GLSLProgram.h" />
+     <ClInclude Include="..\GLSL\GLSLShader.h" />
+     <ClInclude Include="..\GLSL\GLSLShaderSetup.h" />
+@@ -1604,4 +1601,4 @@
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+   <ImportGroup Label="ExtensionTargets">
+   </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
diff --git a/debian/patches/series b/debian/patches/series
index a9b76a5..fe5e5de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-openal-pkgconfig.diff
 kfreebsd.diff
+0003-remove-embedded-glew.patch

-- 
Packaging for scorched3d