[Pkg-cli-libs-commits] [SCM] opentk branch, master, updated. 331e9980b769c513c7261cfffa99a79281c8e196

[Jo Shields]

The following commit has been merged in the master branch:
commit c5bdfc7916e61c072043f94fc6bbabd0c69c336e
Author: Jo Shields <directhex at apebox.org>
Date:   Fri May 18 17:53:49 2012 +0100

    More moduleref cleanup

diff --git a/debian/patches/fix_dllmaps b/debian/patches/fix_dllmaps
new file mode 100644
index 0000000..267ba95
--- /dev/null
+++ b/debian/patches/fix_dllmaps
@@ -0,0 +1,15 @@
+Index: opentk/Source/Compatibility/OpenTK.Compatibility.dll.config
+===================================================================
+--- opentk.orig/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 16:42:01.615347597 +0100
++++ opentk/Source/Compatibility/OpenTK.Compatibility.dll.config	2012-05-18 17:50:12.590385608 +0100
+@@ -2,8 +2,10 @@
+   <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+   <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+   <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
++  <dllmap os="linux" dll="OpenAL32.dll" target="libopenal.so.1"/>
+   <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+   <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
++  <dllmap os="linux" dll="gdiplus.dll" target="libgdiplus.so.0"/>
+   <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+   <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+   <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
diff --git a/debian/patches/series b/debian/patches/series
index 8d58306..4cf94ba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix_dllmaps
 update_targetframeworkversion_to_4.0
diff --git a/debian/rules b/debian/rules
index 59e7205..d544ec8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,8 @@ override_dh_auto_build:
 override_dh_auto_clean:
 	xbuild OpenTK.sln /target:Clean
 	rm -fr Binaries
+
+override_dh_clideps:
+	dh_clideps --exclude-moduleref=/System/Library/Frameworks/Carbon.framework/Versions/Current/Carbon \
+		--exclude-moduleref=/System/Library/Frameworks/ApplicationServices.framework/Versions/Current/ApplicationServices \
+		--exclude-moduleref=/System/Library/Frameworks/AGL.framework/Versions/Current/AGL

-- 
opentk