The following commit has been merged in the master branch:
commit fe56e03f05406707334569d228fa1019768b8dbd
Author: Michael Koch <[email protected]>
Date: Thu Sep 3 21:16:08 2009 +0200
ogre (1.6.1.dfsg1-1.1) UNRELEASED; urgency=low
* Add Confflicts for libogremain-1.4.9 to libogremain-1.6.1.
(Closes: #521413)
* Added debian/patches/fix_pthread.patch to allow building ogre
on more architectures (Closes: #520863)
* Updated debian/patches/fix_distclean.patch to allow building
two times in a row (Closes: #524775)
* Moved libceguiogrerenderer-1.6.1-dbg and libogremain-1.6.1-dbg
to debug section.
* Updated Standards-Version to 3.8.3.
-- Michael Koch <[email protected]> Thu, 03 Sep 2009 07:19:37 +0200
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..15f8be5
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+Patch System
+============
+
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/changelog b/debian/changelog
index 07fff67..d0b498d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ogre (1.6.1.dfsg1-1.1) UNRELEASED; urgency=low
+
+ * Add Confflicts for libogremain-1.4.9 to libogremain-1.6.1.
+ (Closes: #521413)
+ * Added debian/patches/fix_pthread.patch to allow building ogre
+ on more architectures (Closes: #520863)
+ * Updated debian/patches/fix_distclean.patch to allow building
+ two times in a row (Closes: #524775)
+ * Moved libceguiogrerenderer-1.6.1-dbg and libogremain-1.6.1-dbg
+ to debug section.
+ * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <[email protected]> Thu, 03 Sep 2009 07:19:37 +0200
+
ogre (1.6.1.dfsg1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index d9f9685..6071431 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: libs
Maintainer: Debian Games Team <[email protected]>
Uploaders: Andres Mejia <[email protected]>, Federico Di Gregorio
<[email protected]>
Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config,
libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev (>=
0.5.0), libzzip-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev |
libgl-dev, libxrandr-dev, libxxf86vm-dev, libxaw7-dev, libxt-dev, libz-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
Homepage: http://ogre3d.org/
Vcs-Git: git://git.debian.org/git/pkg-games/ogre.git
Vcs-Browser: http://git.debian.org/?p=pkg-games/ogre.git
@@ -27,7 +27,7 @@ Package: libogremain-1.6.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libogre3, libogre4, libogre5, libogre5c2a, libogre6
+Conflicts: libogre3, libogre4, libogre5, libogre5c2a, libogre6,
libogremain-1.4.9
Replaces: libogre5c2a, libogre6, libogre14, libogremain-1.4.6,
libogremain-1.4.7, libogremain-1.4.8, libogremain-1.4.9
Description: Object-oriented Graphics Rendering Engine (libraries)
Ogre is a complete object-oriented 3D rendering engine. It supports
@@ -37,7 +37,7 @@ Description: Object-oriented Graphics Rendering Engine
(libraries)
This package contains the Ogre library and plugins.
Package: libogremain-1.6.1-dbg
-Section: libdevel
+Section: debug
Architecture: any
Priority: extra
Conflicts: libogre5c2a-dbg, libogre6-dbg
@@ -97,7 +97,7 @@ Description: CEGUI Ogre Renderer (libraries)
This package contains the CEGUI Ogre Renderer library and plugins.
Package: libceguiogrerenderer-1.6.1-dbg
-Section: libdevel
+Section: debug
Architecture: any
Priority: extra
Replaces: libceguiogre14-dbg, libceguiogrerenderer-1.4.6-dbg,
libceguiogrerenderer-1.4.7-dbg, libceguiogrerenderer-1.4.8-dbg,
libceguiogrerenderer-1.4.9-dbg
diff --git a/debian/patches/fix_distclean.patch
b/debian/patches/fix_distclean.patch
index 5992611..2c78d0f 100644
--- a/debian/patches/fix_distclean.patch
+++ b/debian/patches/fix_distclean.patch
@@ -11,3 +11,18 @@ distclean is made.
pkginclude_HEADERS = Ogre.h \
OgreAlignedAllocator.h \
+--- a/PlugIns/Makefile.am.bak 2009-09-03 07:58:32.000000000 +0200
++++ b/PlugIns/Makefile.am 2009-09-03 07:57:07.000000000 +0200
+@@ -1,9 +1,12 @@
+ SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager PCZSceneManager
OctreeZone
++DIST_SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager PCZSceneManager
OctreeZone
+
+ if BUILD_CGPLUGIN
+ SUBDIRS += CgProgramManager
++DIST_SUBDIRS += CgProgramManager
+ endif
+
+ if BUILD_EXRPLUGIN
+ SUBDIRS += EXRCodec
++DIST_SUBDIRS += EXRCodec
+ endif
diff --git a/debian/patches/fix_pthread.patch b/debian/patches/fix_pthread.patch
new file mode 100644
index 0000000..9dfae03
--- /dev/null
+++ b/debian/patches/fix_pthread.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 92deb67..cdf0788 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
disable_samples.diff
fix_rpath.diff
fix_distclean.patch
+fix_pthread.patch
--
Packaging the Ogre GameEngine
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
