Package: ogre
Version: 1.0.6-1.1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my ogre 1.0.6-1.2 NMU.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u ogre-1.0.6/debian/control ogre-1.0.6/debian/control
--- ogre-1.0.6/debian/control
+++ ogre-1.0.6/debian/control
@@ -8,7 +8,7 @@
Package: libogre5c2a
Section: libs
Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libogre3, libogre4, libogre5
Replaces: libogre5
Description: Object-oriented Graphics Rendering Engine (libraries)
@@ -23,7 +23,7 @@
Architecture: any
Conflicts: libogre5-dbg
Replaces: libogre5-dbg
-Depends: ${shlibs:Depends} ${misc:Depends} libogre5c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libogre5c2a (= ${Source-Version})
Description: Object-oriented Graphics Rendering Engine (debugging libs)
Ogre is a complete object-oriented 3D rendering engine. It supports
different rendering subsystems but only the OpenGL system is useful
@@ -59,7 +59,7 @@
Package: ogre-tools
Section: devel
Architecture: any
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Object-oriented Graphics Rendering Engine (tools)
Ogre is a complete object-oriented 3D rendering engine. It supports
different rendering subsystems but only the OpenGL system is useful
diff -u ogre-1.0.6/debian/changelog ogre-1.0.6/debian/changelog
--- ogre-1.0.6/debian/changelog
+++ ogre-1.0.6/debian/changelog
@@ -1,3 +1,11 @@
+ogre (1.0.6-1.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix dependency lines by adding missing commas (Closes: #352039).
+ * Fix FTBFS with g++ 4.1 (Closes: #356442).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Thu, 16 Mar 2006 19:44:47 +0100
+
ogre (1.0.6-1.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- ogre-1.0.6.orig/debian/patches/09_gcc_4.1
+++ ogre-1.0.6/debian/patches/09_gcc_4.1
@@ -0,0 +1,50 @@
+diff -Nru ./ogre-free/OgreMain/include/OgreEntity.h
../build-tree.new/ogre-free/OgreMain/include/OgreEntity.h
+--- ./ogre-free/OgreMain/include/OgreEntity.h 2005-11-16 21:39:05.000000000
+0100
++++ ../build-tree.new/ogre-free/OgreMain/include/OgreEntity.h 2006-03-16
19:43:20.000000000 +0100
+@@ -568,7 +568,7 @@
+
+ /** Stops sharing the SkeletonInstance with other entities.
+ */
+- void Entity::stopSharingSkeletonInstance();
++ void stopSharingSkeletonInstance();
+
+
+ /**
+diff -Nru ./ogre-free/OgreMain/include/OgreImage.h
../build-tree.new/ogre-free/OgreMain/include/OgreImage.h
+--- ./ogre-free/OgreMain/include/OgreImage.h 2005-04-06 15:30:43.000000000
+0200
++++ ../build-tree.new/ogre-free/OgreMain/include/OgreImage.h 2006-03-16
19:42:55.000000000 +0100
+@@ -136,7 +136,7 @@
+ @remarks
+ The size of the buffer must be
numFaces*PixelUtil::getMemorySize(width, height, depth, format)
+ */
+- Image& Image::loadDynamicImage( uchar* pData, size_t uWidth,
size_t uHeight,
++ Image& loadDynamicImage( uchar* pData, size_t uWidth, size_t
uHeight,
+ size_t depth,
+ PixelFormat eFormat,
bool autoDelete = false,
+ size_t numFaces = 1,
size_t numMipMaps = 0);
+diff -Nru
./ogre-free/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h
../build-tree.new/ogre-free/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h
+--- ./ogre-free/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h
2005-02-04 18:51:24.000000000 +0100
++++
../build-tree.new/ogre-free/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h
2006-03-16 19:44:16.000000000 +0100
+@@ -193,8 +193,8 @@
+ /** Overridden from SceneManager */
+ void clearScene(void);
+
+- AxisAlignedBoxSceneQuery* OctreeSceneManager::createAABBQuery(const
AxisAlignedBox& box, unsigned long mask);
+- SphereSceneQuery* OctreeSceneManager::createSphereQuery(const Sphere&
sphere, unsigned long mask);
++ AxisAlignedBoxSceneQuery* createAABBQuery(const AxisAlignedBox& box,
unsigned long mask);
++ SphereSceneQuery* createSphereQuery(const Sphere& sphere, unsigned long
mask);
+ PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const
PlaneBoundedVolumeList& volumes, unsigned long mask);
+ RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask);
+ IntersectionSceneQuery* createIntersectionQuery(unsigned long mask);
+diff -Nru ./ogre-free/Tools/XMLConverter/include/tinyxml.h
../build-tree.new/ogre-free/Tools/XMLConverter/include/tinyxml.h
+--- ./ogre-free/Tools/XMLConverter/include/tinyxml.h 2003-09-11
00:48:29.000000000 +0200
++++ ../build-tree.new/ogre-free/Tools/XMLConverter/include/tinyxml.h
2006-03-16 19:44:44.000000000 +0100
+@@ -790,7 +790,7 @@
+ #endif
+
+ /// Construct.
+- TiXmlDeclaration::TiXmlDeclaration( const char * _version,
++ TiXmlDeclaration( const char * _version,
+
const char * _encoding,
+
const char * _standalone );
+
