[SCM] Packaging for ogre branch, master, updated. upstream/1.4.9.dfsg1-108-g1969995

[Christoph Egger]

The following commit has been merged in the master branch:
commit 1969995b297051b72c9702f407c11f07569a7bee
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Tue Sep 1 12:07:59 2009 +0200

    Import FTBFS patch, Clean EXR patch and comment out EXR patch in series, doesn't work with and without here

diff --git a/debian/changelog b/debian/changelog
index 07fff67..4faab5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ogre (1.6.1.dfsg1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Import Patch fix Build (Closes: #520863), thanks to Peter
+    Collingbourne
+
+ -- Christoph Egger <debian at christoph-egger.org>  Tue, 01 Sep 2009 12:07:06 +0200
+
 ogre (1.6.1.dfsg1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/fix_exrcodec_plugin.diff b/debian/patches/fix_exrcodec_plugin.diff
index 4225788..2b9d5cc 100644
--- a/debian/patches/fix_exrcodec_plugin.diff
+++ b/debian/patches/fix_exrcodec_plugin.diff
@@ -1,7 +1,8 @@
-Index: ogre/home/fog/Workspaces/debian/packages/ogre/ogre/PlugIns/EXRCodec/include/OgreEXRCodec.h
-===================================================================
---- ogre.orig/home/fog/Workspaces/debian/packages/ogre/ogre/PlugIns/EXRCodec/include/OgreEXRCodec.h	2009-03-18 19:13:49.103759422 +0100
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+diff --git a/PlugIns/EXRCodec/include/OgreEXRCodec.h b/PlugIns/EXRCodec/include/OgreEXRCodec.h
+deleted file mode 100644
+index 42d02d8..0000000
+--- a/PlugIns/EXRCodec/include/OgreEXRCodec.h
++++ /dev/null
 @@ -1,57 +0,0 @@
 -/*
 ------------------------------------------------------------------------------
diff --git a/debian/patches/ogre_1.6.1.dfsg1-1.ftbfs.patch b/debian/patches/ogre_1.6.1.dfsg1-1.ftbfs.patch
new file mode 100644
index 0000000..5834333
--- /dev/null
+++ b/debian/patches/ogre_1.6.1.dfsg1-1.ftbfs.patch
@@ -0,0 +1,21 @@
+diff -u ogre-1.6.1.dfsg1/debian/patches/series ogre-1.6.1.dfsg1/debian/patches/series
+--- ogre-1.6.1.dfsg1/debian/patches/series
++++ ogre-1.6.1.dfsg1/debian/patches/series
+@@ -3,0 +4 @@
++pthread_extern_c.patch
+only in patch2:
+unchanged:
+--- ogre-1.6.1.dfsg1.orig/debian/patches/pthread_extern_c.patch
++++ ogre-1.6.1.dfsg1/debian/patches/pthread_extern_c.patch
+@@ -0,0 +1,11 @@
++--- ogre-1.6.1.dfsg1/OgreMain/src/nedmalloc/malloc.c.h.orig	2009-01-05 12:07:43.000000000 +0000
+++++ ogre-1.6.1.dfsg1/OgreMain/src/nedmalloc/malloc.c.h	2009-05-15 18:45:23.000000000 +0100
++@@ -1839,7 +1839,7 @@
++ /* skipped internal declaration from pthread.h */
++ #ifdef linux
++ #ifndef PTHREAD_MUTEX_RECURSIVE
++-extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
+++extern "C" int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr,
++ 					   int __kind));
++ #define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP
++ #define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y)
diff --git a/debian/patches/series b/debian/patches/series
index 746e779..a754901 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 disable_samples.diff
 fix_rpath.diff
 fix_distclean.patch
-fix_exrcodec_plugin.diff
+#fix_exrcodec_plugin.diff
+ogre_1.6.1.dfsg1-1.ftbfs.patch

-- 
Packaging for ogre