r5115 - in packages/trunk/ogre/debian: . extras patches
Andres Mejia
ceros-guest at alioth.debian.org
Mon Dec 31 01:28:30 UTC 2007
Author: ceros-guest
Date: 2007-12-31 01:28:29 +0000 (Mon, 31 Dec 2007)
New Revision: 5115
Added:
packages/trunk/ogre/debian/libceguiogre-1.4.6.install
packages/trunk/ogre/debian/libogre-1.4.6.README.Debian
packages/trunk/ogre/debian/libogre-1.4.6.install
packages/trunk/ogre/debian/libogre-1.4.6.manpages
packages/trunk/ogre/debian/patches/fix_rpath.diff
Removed:
packages/trunk/ogre/debian/libceguiogre14.install
packages/trunk/ogre/debian/libogre14.README.Debian
packages/trunk/ogre/debian/libogre14.install
packages/trunk/ogre/debian/libogre14.manpages
packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff
Modified:
packages/trunk/ogre/debian/changelog
packages/trunk/ogre/debian/control
packages/trunk/ogre/debian/extras/ogre-tarball.sh
packages/trunk/ogre/debian/patches/disable_samples.diff
packages/trunk/ogre/debian/patches/series
packages/trunk/ogre/debian/rules
packages/trunk/ogre/debian/watch
Log:
checking in new packaging for ogre-1.4.6
Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/changelog 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1,3 +1,18 @@
+ogre (1.4.6-1~unreleased1) unstable; urgency=low
+
+ * New upstream release.
+ * Modified ogre-tarball.sh script to make it easier to maintain.
+ * Bumped Standards-Version to 3.7.3.
+ * Making all *-dbg packages Priority: extra.
+ + Addresses some lintian warnings.
+ * New releases have been introducing ABI changes for ogre. Reverting back
+ to using -release versioning for sonames.
+ * Making *-dev packages binary-independent.
+ * Making library package name match sonames.
+ + Addresses lintian warning.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sun, 30 Dec 2007 09:32:23 -0500
+
ogre (1.4.5-3) unstable; urgency=low
* Fixing build problem for kfreebsd. (Closes: 451669)
Modified: packages/trunk/ogre/debian/control
===================================================================
--- packages/trunk/ogre/debian/control 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/control 2007-12-31 01:28:29 UTC (rev 5115)
@@ -4,17 +4,17 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Andres Mejia <mcitadel at gmail.com>, Federico Di Gregorio <fog at debian.org>
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.7.2
+Standards-Version: 3.7.3
Homepage: http://ogre3d.org/
Vcs-Svn: svn+ssh://svn.debian.org/pkg-games/packages/trunk/ogre
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ogre/?op=log
-Package: libogre14
+Package: libogremain-1.4.6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libogre3, libogre4, libogre5, libogre5c2a, libogre6
-Replaces: libogre5c2a, libogre6
+Conflicts: libogre3, libogre4, libogre5, libogre5c2a, libogre6, libogre14
+Replaces: libogre5c2a, libogre6, libogre14
Description: Object-oriented Graphics Rendering Engine (libraries)
Ogre is a complete object-oriented 3D rendering engine. It supports
different rendering subsystems but only the OpenGL system is useful
@@ -22,12 +22,13 @@
.
This package contains the Ogre library and plugins.
-Package: libogre14-dbg
+Package: libogremain-1.4.6-dbg
Section: libdevel
Architecture: any
+Priority: extra
Conflicts: libogre5c2a-dbg, libogre6-dbg
Replaces: libogre5c2a-dbg, libogre6-dbg
-Depends: libogre14 (= ${binary:Version})
+Depends: libogremain-1.4.6 (= ${binary: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
@@ -38,8 +39,8 @@
Package: libogre-dev
Section: libdevel
-Architecture: any
-Depends: libogre14 (= ${binary:Version}), libfreeimage-dev | libdevil-dev, libfreetype6-dev, libzzip-dev, libxaw7-dev, libopenexr-dev
+Architecture: all
+Depends: libogremain-1.4.6 (>= ${source:Version}), libfreeimage-dev | libdevil-dev, libfreetype6-dev, libzzip-dev, libxaw7-dev, libopenexr-dev
Suggests: ogre-doc
Description: Object-oriented Graphics Rendering Engine (development files)
Ogre is a complete object-oriented 3D rendering engine. It supports
@@ -75,6 +76,7 @@
Package: ogre-tools-dbg
Section: devel
Architecture: any
+Priority: extra
Depends: ogre-tools (= ${binary:Version})
Description: Object-oriented Graphics Rendering Engine (tools)
Ogre is a complete object-oriented 3D rendering engine. It supports
@@ -94,9 +96,11 @@
.
This package contains the Blender exporter for Ogre.
-Package: libceguiogre14
+Package: libceguiogrerenderer-1.4.6
Section: libs
Architecture: any
+Replaces: libceguiogre14
+Conflicts: libceguiogre14
Depends: ${shlibs:Depends}
Description: CEGUI Ogre Renderer (libraries)
Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
@@ -105,10 +109,11 @@
.
This package contains the CEGUI Ogre Renderer library and plugins.
-Package: libceguiogre14-dbg
+Package: libceguiogrerenderer-1.4.6-dbg
Section: libdevel
Architecture: any
-Depends: libceguiogre14 (= ${binary:Version})
+Priority: extra
+Depends: libceguiogrerenderer-1.4.6 (= ${binary:Version})
Description: CEGUI Ogre Renderer (debugging libs)
Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
providing windowing and widgets. Or simply said: You can create GUI's with it.
@@ -119,8 +124,8 @@
Package: libceguiogre-dev
Section: libdevel
-Architecture: any
-Depends: libceguiogre14 (= ${binary:Version}), libogre-dev (= ${binary:Version})
+Architecture: all
+Depends: libceguiogrerenderer-1.4.6 (>= ${source:Version}), libogre-dev (= ${binary:Version})
Description: CEGUI Ogre Renderer (development files)
Crazy Eddie's GUI System (or short CEGUI) is a cross platform free library
providing windowing and widgets. Or simply said: You can create GUI's with it.
Modified: packages/trunk/ogre/debian/extras/ogre-tarball.sh
===================================================================
--- packages/trunk/ogre/debian/extras/ogre-tarball.sh 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/extras/ogre-tarball.sh 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1,98 +1,102 @@
#! /bin/sh
-# This script is used to generate the ogre-1.4.5.orig tarball that can be
+# This script is used to generate the ogre orig tarball that can be
# distributed through Debian.
-if [ ! -f ogre-linux_osx-v1-4-5.tar.bz2 ] ; then
+# Some variables to make maintaining this script easier
+OGRE_VERSION=1.4.6
+OGRE_TARBALL=ogre-linux_osx-v1-4-6.tar.bz2
+OGRE_TARBALL_CHECKSUM=ef1cf73106e0387624bfdd539cdf9de6
+
+if [ ! -f $OGRE_TARBALL ] ; then
# Download the tarball
-wget http://downloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2
+wget http://downloads.sourceforge.net/ogre/$OGRE_TARBALL
fi
# Verify the checksum
-CORRECT_CHECKSUM=efce9ce9e2b0e2d593e45479210bd4af
-COMPUTED_CHECKSUM=`md5sum ogre-linux_osx-v1-4-5.tar.bz2 | cut -d ' ' -f 1`
+COMPUTED_CHECKSUM=`md5sum $OGRE_TARBALL | cut -d ' ' -f 1`
-if [ $CORRECT_CHECKSUM != $COMPUTED_CHECKSUM ] ; then
+if [ $OGRE_TARBALL_CHECKSUM != $COMPUTED_CHECKSUM ] ; then
echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM
-Expected checksum $CORRECT_CHECKSUM"
+Expected checksum $OGRE_TARBALL_CHECKSUM"
exit 0
else
echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM."
fi
-# Prepare the ogre-1.4.5.orig tarball
+# Prepare the ogre orig tarball
if [ ! -d ogrenew ]; then
- echo "Extracting ogre-linux_osx-v1-4-5.tar.bz2"
- tar -xjf ogre-linux_osx-v1-4-5.tar.bz2
+ echo "Extracting $OGRE_TARBALL"
+ tar -xjf $OGRE_TARBALL
else
echo "Already found extracted ogrenew directory. Please remove
-or move ogrenew and ogre-1.4.5 directories and also ogre_1.4.5.orig.tar.gz."
+or move ogrenew and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
exit 0
fi
-if [ ! -d ogre-1.4.5 ]; then
- echo "Renaming extracted ogrenew directory to ogre-1.4.5"
- mv ogrenew ogre-1.4.5
+if [ ! -d ogre-$OGRE_VERSION ]; then
+ echo "Renaming extracted ogrenew directory to ogre-$OGRE_VERSION"
+ mv ogrenew ogre-$OGRE_VERSION
else
- echo "Already found ogre-1.4.5 directory. Please remove or move
-ogrenew and ogre-1.4.5 directories and also ogre_1.4.5.orig.tar.gz."
+ echo "Already found ogre-$OGRE_VERSION directory. Please remove or move
+ogrenew and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
exit 0
fi
# Remove all CVS directories
echo "Removing all CVS directories"
-for REMOVE_CVS in `find ogre-1.4.5 -name CVS`; do
- rm -r "$REMOVE_CVS"
+for REMOVE_CVS in `find ogre-$OGRE_VERSION -name CVS`; do
+ rm -rf "$REMOVE_CVS"
done
# Remove non-distributable samples
echo "Removing all non-distributable demos."
-rm -r ogre-1.4.5/Samples/BezierPatch
-rm -r ogre-1.4.5/Samples/BSP
-rm -r ogre-1.4.5/Samples/CameraTrack
-rm -r ogre-1.4.5/Samples/CelShading
-rm -r ogre-1.4.5/Samples/Compositor
-rm -r ogre-1.4.5/Samples/CubeMapping
-rm -r ogre-1.4.5/Samples/DeferredShading
-rm -r ogre-1.4.5/Samples/Dot3Bump
-rm -r ogre-1.4.5/Samples/DynTex
-rm -r ogre-1.4.5/Samples/EnvMapping
-rm -r ogre-1.4.5/Samples/FacialAnimation
-rm -r ogre-1.4.5/Samples/Fresnel
-rm -r ogre-1.4.5/Samples/Grass
-rm -r ogre-1.4.5/Samples/Gui
-rm -r ogre-1.4.5/Samples/Instancing
-rm -r ogre-1.4.5/Samples/Lighting
-rm -r ogre-1.4.5/Samples/Media
-rm -r ogre-1.4.5/Samples/OceanDemo
-rm -r ogre-1.4.5/Samples/ParticleFX
-rm -r ogre-1.4.5/Samples/RenderToTexture
-rm -r ogre-1.4.5/Samples/Shadows
-rm -r ogre-1.4.5/Samples/SkeletalAnimation
-rm -r ogre-1.4.5/Samples/SkyBox
-rm -r ogre-1.4.5/Samples/SkyDome
-rm -r ogre-1.4.5/Samples/SkyPlane
-rm -r ogre-1.4.5/Samples/Smoke
-rm -r ogre-1.4.5/Samples/Terrain
-rm -r ogre-1.4.5/Samples/TextureFX
-rm -r ogre-1.4.5/Samples/Transpacency
-rm -r ogre-1.4.5/Samples/VolumeTex
-rm -r ogre-1.4.5/Samples/Water
-rm -r ogre-1.4.5/Samples/Common/bin
-rm -r ogre-1.4.5/Samples/Common/include
-rm -r ogre-1.4.5/Samples/Common/setup
-rm -r ogre-1.4.5/Samples/ReadMe.html
+rm -r ogre-$OGRE_VERSION/Samples/BezierPatch
+rm -r ogre-$OGRE_VERSION/Samples/BSP
+rm -r ogre-$OGRE_VERSION/Samples/CameraTrack
+rm -r ogre-$OGRE_VERSION/Samples/CelShading
+rm -r ogre-$OGRE_VERSION/Samples/Compositor
+rm -r ogre-$OGRE_VERSION/Samples/CubeMapping
+rm -r ogre-$OGRE_VERSION/Samples/DeferredShading
+rm -r ogre-$OGRE_VERSION/Samples/Dot3Bump
+rm -r ogre-$OGRE_VERSION/Samples/DynTex
+rm -r ogre-$OGRE_VERSION/Samples/EnvMapping
+rm -r ogre-$OGRE_VERSION/Samples/FacialAnimation
+rm -r ogre-$OGRE_VERSION/Samples/Fresnel
+rm -r ogre-$OGRE_VERSION/Samples/Grass
+rm -r ogre-$OGRE_VERSION/Samples/Gui
+rm -r ogre-$OGRE_VERSION/Samples/Instancing
+rm -r ogre-$OGRE_VERSION/Samples/Lighting
+rm -r ogre-$OGRE_VERSION/Samples/Media
+rm -r ogre-$OGRE_VERSION/Samples/OceanDemo
+rm -r ogre-$OGRE_VERSION/Samples/ParticleFX
+rm -r ogre-$OGRE_VERSION/Samples/RenderToTexture
+rm -r ogre-$OGRE_VERSION/Samples/Shadows
+rm -r ogre-$OGRE_VERSION/Samples/SkeletalAnimation
+rm -r ogre-$OGRE_VERSION/Samples/SkyBox
+rm -r ogre-$OGRE_VERSION/Samples/SkyDome
+rm -r ogre-$OGRE_VERSION/Samples/SkyPlane
+rm -r ogre-$OGRE_VERSION/Samples/Smoke
+rm -r ogre-$OGRE_VERSION/Samples/Terrain
+rm -r ogre-$OGRE_VERSION/Samples/TextureFX
+rm -r ogre-$OGRE_VERSION/Samples/Transpacency
+rm -r ogre-$OGRE_VERSION/Samples/VolumeTex
+rm -r ogre-$OGRE_VERSION/Samples/Water
+rm -r ogre-$OGRE_VERSION/Samples/Common/bin
+rm -r ogre-$OGRE_VERSION/Samples/Common/include
+rm -r ogre-$OGRE_VERSION/Samples/Common/setup
+rm -r ogre-$OGRE_VERSION/Samples/ReadMe.html
# Remove autom4te.cache directories
echo "Removing generated directories from autotools."
-rm -r ogre-1.4.5/autom4te.cache
-rm -r ogre-1.4.5/ReferenceApplication/autom4te.cache
+rm -r ogre-$OGRE_VERSION/autom4te.cache
+rm -r ogre-$OGRE_VERSION/ReferenceApplication/autom4te.cache
-# Create the tarball and exclude the CVS directories
-if [ ! -f ogre_1.4.5.orig.tar.gz ]; then
+# Create the tarball
+if [ ! -f ogre_$OGRE_VERSION.orig.tar.gz ]; then
echo "Creating orig tarball."
- tar -czf ogre_1.4.5.orig.tar.gz ogre-1.4.5/
+ tar -czf ogre_$OGRE_VERSION.orig.tar.gz ogre-$OGRE_VERSION/
else
echo "Already found orig tarball. Please remove or move ogrenew
-and ogre-1.4.5 directories and also ogre_1.4.5.orig.tar.gz."
+and ogre-$OGRE_VERSION directories and also ogre_$OGRE_VERSION.orig.tar.gz."
exit 0
fi
Copied: packages/trunk/ogre/debian/libceguiogre-1.4.6.install (from rev 5110, packages/trunk/ogre/debian/libceguiogre14.install)
===================================================================
--- packages/trunk/ogre/debian/libceguiogre-1.4.6.install (rev 0)
+++ packages/trunk/ogre/debian/libceguiogre-1.4.6.install 2007-12-31 01:28:29 UTC (rev 5115)
@@ -0,0 +1 @@
+usr/lib/libCEGUIOgreRenderer-*.so
Deleted: packages/trunk/ogre/debian/libceguiogre14.install
===================================================================
--- packages/trunk/ogre/debian/libceguiogre14.install 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/libceguiogre14.install 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1 +0,0 @@
-usr/lib/libCEGUIOgreRenderer.so.*
Copied: packages/trunk/ogre/debian/libogre-1.4.6.README.Debian (from rev 5110, packages/trunk/ogre/debian/libogre14.README.Debian)
===================================================================
--- packages/trunk/ogre/debian/libogre-1.4.6.README.Debian (rev 0)
+++ packages/trunk/ogre/debian/libogre-1.4.6.README.Debian 2007-12-31 01:28:29 UTC (rev 5115)
@@ -0,0 +1,9 @@
+Notes about the soname scheme in Debian and in the upstream release
+*******************************************************************
+
+The upstream developers decided to use libtool's -release scheme for the soname
+which would have caused every application developed using the upstream release
+to break after every revision. With Debian, it's been decided to go back with using libtool's -version-info scheme as was used in previous upstream releases and to use
+"14" as the major number, one up from "13" which was used in ogre 1.2.5.
+
+This means that anything compiled with the upstream version of ogre will be looking for a library called "libOgreMain-1.4.x.so", different from what the Debian modified version of ogre will provide, which is "libOgreMain.so.14.x.x". Thus any application compiled using the upstream version of ogre will have to be recompiled using the Debian version to be able to run on Debian systems.
Copied: packages/trunk/ogre/debian/libogre-1.4.6.install (from rev 5110, packages/trunk/ogre/debian/libogre14.install)
===================================================================
--- packages/trunk/ogre/debian/libogre-1.4.6.install (rev 0)
+++ packages/trunk/ogre/debian/libogre-1.4.6.install 2007-12-31 01:28:29 UTC (rev 5115)
@@ -0,0 +1,5 @@
+usr/lib/libOgreMain-*.so
+usr/lib/OGRE/*.so
+usr/lib/OGRE/*.la
+usr/sbin/update-ogre-plugins
+etc/OGRE/*.cfg
Copied: packages/trunk/ogre/debian/libogre-1.4.6.manpages (from rev 5110, packages/trunk/ogre/debian/libogre14.manpages)
===================================================================
--- packages/trunk/ogre/debian/libogre-1.4.6.manpages (rev 0)
+++ packages/trunk/ogre/debian/libogre-1.4.6.manpages 2007-12-31 01:28:29 UTC (rev 5115)
@@ -0,0 +1 @@
+debian/extras/update-ogre-plugins.8
Deleted: packages/trunk/ogre/debian/libogre14.README.Debian
===================================================================
--- packages/trunk/ogre/debian/libogre14.README.Debian 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/libogre14.README.Debian 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1,9 +0,0 @@
-Notes about the soname scheme in Debian and in the upstream release
-*******************************************************************
-
-The upstream developers decided to use libtool's -release scheme for the soname
-which would have caused every application developed using the upstream release
-to break after every revision. With Debian, it's been decided to go back with using libtool's -version-info scheme as was used in previous upstream releases and to use
-"14" as the major number, one up from "13" which was used in ogre 1.2.5.
-
-This means that anything compiled with the upstream version of ogre will be looking for a library called "libOgreMain-1.4.x.so", different from what the Debian modified version of ogre will provide, which is "libOgreMain.so.14.x.x". Thus any application compiled using the upstream version of ogre will have to be recompiled using the Debian version to be able to run on Debian systems.
Deleted: packages/trunk/ogre/debian/libogre14.install
===================================================================
--- packages/trunk/ogre/debian/libogre14.install 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/libogre14.install 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1,5 +0,0 @@
-usr/lib/libOgreMain.so.*
-usr/lib/OGRE/*.so
-usr/lib/OGRE/*.la
-usr/sbin/update-ogre-plugins
-etc/OGRE/*.cfg
Deleted: packages/trunk/ogre/debian/libogre14.manpages
===================================================================
--- packages/trunk/ogre/debian/libogre14.manpages 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/libogre14.manpages 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1 +0,0 @@
-debian/extras/update-ogre-plugins.8
Modified: packages/trunk/ogre/debian/patches/disable_samples.diff
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.diff 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/patches/disable_samples.diff 2007-12-31 01:28:29 UTC (rev 5115)
@@ -18,24 +18,9 @@
fi
AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
])
---- ./configure.in.bak 2007-10-08 14:20:10.000000000 -0400
-+++ ./configure.in 2007-10-08 14:25:30.000000000 -0400
-@@ -113,6 +113,14 @@
- CXXFLAGS="$CXXFLAGS"
- LIBS="$LIBS"
-
-+dnl Added versioning info. Versioning info doesn't exist upstream.
-+dnl This should end with a versuffix of 14.0.5
-+OGREMAIN_CURRENT=14
-+OGREMAIN_REVISION=5
-+OGREMAIN_AGE=0
-+OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
-+AC_SUBST(OGREMAIN_VERSION_INFO)
-+
- dnl Define samples absolute install path
- ogreexecdir='${abs_top_builddir}/Samples/Common/bin'
- AC_SUBST(abs_top_builddir)
-@@ -154,86 +162,6 @@
+--- ./configure.in.bak 2007-12-30 16:05:11.000000000 -0500
++++ ./configure.in 2007-12-30 16:06:36.000000000 -0500
+@@ -154,86 +154,6 @@
RenderSystems/Direct3D9/include/Makefile \
Samples/Makefile \
Samples/Common/Makefile \
@@ -122,7 +107,7 @@
Tests/Makefile \
Tests/src/Makefile \
Tools/Makefile \
-@@ -269,7 +197,6 @@
+@@ -269,7 +189,6 @@
echo " Use FreeImage : $build_freeimage"
echo " Use DevIL : $build_il"
echo " Build OGRE demos : $build_ogre_demos"
Copied: packages/trunk/ogre/debian/patches/fix_rpath.diff (from rev 5110, packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff)
===================================================================
--- packages/trunk/ogre/debian/patches/fix_rpath.diff (rev 0)
+++ packages/trunk/ogre/debian/patches/fix_rpath.diff 2007-12-31 01:28:29 UTC (rev 5115)
@@ -0,0 +1,11 @@
+--- ./OgreMain/src/Makefile.am.bak 2007-08-28 16:53:42.000000000 -0400
++++ ./OgreMain/src/Makefile.am 2007-08-28 17:07:13.000000000 -0400
+@@ -185,7 +185,7 @@
+
+ platformdir = $(libdir)
+ libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS)
+-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@
+ #-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
+ #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
+
Deleted: packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff
===================================================================
--- packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1,20 +0,0 @@
---- ./OgreMain/src/Makefile.am.bak 2007-08-28 16:53:42.000000000 -0400
-+++ ./OgreMain/src/Makefile.am 2007-08-28 17:07:13.000000000 -0400
-@@ -185,7 +185,7 @@
-
- platformdir = $(libdir)
- libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS)
--libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
-+libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@
- #-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
- #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
-
---- ./Samples/Common/CEGUIRenderer/src/Makefile.am.bak 2007-08-28 16:54:12.000000000 -0400
-+++ ./Samples/Common/CEGUIRenderer/src/Makefile.am 2007-08-28 17:07:37.000000000 -0400
-@@ -4,5 +4,5 @@
-
- libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp OgreCEGUITexture.cpp OgreCEGUIResourceProvider.cpp
- libCEGUIOgreRenderer_la_LIBADD = $(STLPORT_LIBS)
--libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
-+libCEGUIOgreRenderer_la_LDFLAGS = -version-info @OGREMAIN_VERSION_INFO@
-
Modified: packages/trunk/ogre/debian/patches/series
===================================================================
--- packages/trunk/ogre/debian/patches/series 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/patches/series 2007-12-31 01:28:29 UTC (rev 5115)
@@ -1,2 +1,2 @@
disable_samples.diff
-fix_soname_and_rpath.diff
+fix_rpath.diff
Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/rules 2007-12-31 01:28:29 UTC (rev 5115)
@@ -71,16 +71,18 @@
binary-indep: build install
dh_testdir
dh_testroot
+ dh_installdocs -i -Nogre-doc
dh_installdocs -pogre-doc -X*.dot -X*.md5 -X*.tmp
- dh_installdocs -pblender-ogrexml
- dh_install -i
+ dh_install -i -Nlibogre-dev -Nlibceguiogre-dev
+ dh_install -plibogre-dev -XCEGUI --sourcedir=debian/tmp
+ dh_install -plibceguiogre-dev --sourcedir=debian/tmp
dh_installchangelogs -i -Nogre-doc Docs/ChangeLog.html
dh_installchangelogs -pogre-doc
mv debian/ogre-doc/usr/share/doc/ogre-doc/ChangeLog.html \
debian/ogre-doc/usr/share/doc/ogre-doc/Upstream_ChangeLog.html
dh_fixperms -i
+ dh_compress -i -Nogre-doc
dh_compress -pogre-doc -X.txt
- dh_compress -pblender-ogrexml
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -95,15 +97,15 @@
install -d debian/tmp/usr/sbin && \
install -m 755 debian/extras/update-ogre-plugins \
debian/tmp/usr/sbin/update-ogre-plugins
- dh_install -a -Nlibogre-dev --sourcedir=debian/tmp
- dh_install -plibogre-dev -XCEGUI --sourcedir=debian/tmp
+ dh_install -a --sourcedir=debian/tmp
dh_installchangelogs -a Docs/ChangeLog.html
dh_installdocs -a
dh_installexamples -a
dh_installman -a
- dh_strip -plibogre14 --dbg-package=libogre14-dbg
+ dh_strip -plibogremain-1.4.6 --dbg-package=libogremain-1.4.6-dbg
dh_strip -pogre-tools --dbg-package=ogre-tools-dbg
- dh_strip -plibceguiogre14 --dbg-package=libceguiogre14-dbg
+ dh_strip -plibceguiogrerenderer-1.4.6 \
+ --dbg-package=libceguiogrerenderer-1.4.6-dbg
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
Modified: packages/trunk/ogre/debian/watch
===================================================================
--- packages/trunk/ogre/debian/watch 2007-12-30 23:37:10 UTC (rev 5114)
+++ packages/trunk/ogre/debian/watch 2007-12-31 01:28:29 UTC (rev 5115)
@@ -5,9 +5,9 @@
opts=uversionmangle=s/\.\?.*// \
http://downloads.sourceforge.net/ogre \
http://downloads.sourceforge.net/ogre/ogre-linux_osx-v(.*)\.tar\.bz2(.*) \
- 1-4-5
+ 1-4-6
# Different check for ogre source, provided by uscan man page
http://sf.net/ogre/ \
ogre-linux_osx-v(.*)\.tar\.bz2(.*) \
- 1-4-5.
+ 1-4-6.
More information about the Pkg-games-commits
mailing list