Author: ceros-guest Date: 2007-10-14 20:16:28 +0000 (Sun, 14 Oct 2007) New Revision: 4418
Removed: packages/trunk/ogre/debian/patches/makefile_modifications.diff Modified: packages/trunk/ogre/debian/ packages/trunk/ogre/debian/changelog 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/watch Log: Checking in ogre-1.4.5-1 packaging. Property changes on: packages/trunk/ogre/debian ___________________________________________________________________ Name: svn-bp:origUrl - http://ftp.de.debian.org/debian/pool/main/o/ogre/ogre_1.4.4.orig.tar.gz + http://ftp.de.debian.org/debian/pool/contrib/o/ogre-contrib/ogre-contrib_1.4.5.orig.tar.gz Modified: packages/trunk/ogre/debian/changelog =================================================================== --- packages/trunk/ogre/debian/changelog 2007-10-14 20:11:57 UTC (rev 4417) +++ packages/trunk/ogre/debian/changelog 2007-10-14 20:16:28 UTC (rev 4418) @@ -1,3 +1,13 @@ +ogre (1.4.5-1) unstable; urgency=low + + [ Andres Mejia ] + * New upstream release. + * Removed makefile_modifications patch as it's no longer needed. + * Modified disable_samples patch to update version info. + + Also removed checks for ogre platform and gui as they are not needed. + + -- Andres Mejia <[EMAIL PROTECTED]> Mon, 08 Oct 2007 14:14:46 -0400 + ogre (1.4.4-2) unstable; urgency=low [ Andres Mejia ] Modified: packages/trunk/ogre/debian/extras/ogre-tarball.sh =================================================================== --- packages/trunk/ogre/debian/extras/ogre-tarball.sh 2007-10-14 20:11:57 UTC (rev 4417) +++ packages/trunk/ogre/debian/extras/ogre-tarball.sh 2007-10-14 20:16:28 UTC (rev 4418) @@ -1,16 +1,16 @@ #! /bin/sh -# This script is used to generate the ogre-1.4.4.orig tarball that can be +# This script is used to generate the ogre-1.4.5.orig tarball that can be # distributed through Debian. -if [ ! -f ogre-linux_osx-v1-4-4.tar.bz2 ] ; then +if [ ! -f ogre-linux_osx-v1-4-5.tar.bz2 ] ; then # Download the tarball -wget http://downloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-4.tar.bz2 +wget http://downloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-5.tar.bz2 fi # Verify the checksum -CORRECT_CHECKSUM=456b75d21bc09d9cee937e3ccf9fbced -COMPUTED_CHECKSUM=`md5sum ogre-linux_osx-v1-4-4.tar.bz2 | cut -d ' ' -f 1` +CORRECT_CHECKSUM=efce9ce9e2b0e2d593e45479210bd4af +COMPUTED_CHECKSUM=`md5sum ogre-linux_osx-v1-4-5.tar.bz2 | cut -d ' ' -f 1` if [ $CORRECT_CHECKSUM != $COMPUTED_CHECKSUM ] ; then echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM @@ -20,79 +20,79 @@ echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM." fi -# Prepare the ogre-1.4.4.orig tarball +# Prepare the ogre-1.4.5.orig tarball if [ ! -d ogrenew ]; then - echo "Extracting ogre-linux_osx-v1-4-4.tar.bz2" - tar -xjf ogre-linux_osx-v1-4-4.tar.bz2 + echo "Extracting ogre-linux_osx-v1-4-5.tar.bz2" + tar -xjf ogre-linux_osx-v1-4-5.tar.bz2 else echo "Already found extracted ogrenew directory. Please remove -or move ogrenew and ogre-1.4.4 directories and also ogre_1.4.4.orig.tar.gz." +or move ogrenew and ogre-1.4.5 directories and also ogre_1.4.5.orig.tar.gz." exit 0 fi -if [ ! -d ogre-1.4.4 ]; then - echo "Renaming extracted ogrenew directory to ogre-1.4.4" - mv ogrenew ogre-1.4.4 +if [ ! -d ogre-1.4.5 ]; then + echo "Renaming extracted ogrenew directory to ogre-1.4.5" + mv ogrenew ogre-1.4.5 else - echo "Already found ogre-1.4.4 directory. Please remove or move -ogrenew and ogre-1.4.4 directories and also ogre_1.4.4.orig.tar.gz." + 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." exit 0 fi # Remove all CVS directories echo "Removing all CVS directories" -for REMOVE_CVS in `find ogre-1.4.4 -name CVS`; do +for REMOVE_CVS in `find ogre-1.4.5 -name CVS`; do rm -r "$REMOVE_CVS" done # Remove non-distributable samples echo "Removing all non-distributable demos." -rm -r ogre-1.4.4/Samples/BezierPatch -rm -r ogre-1.4.4/Samples/BSP -rm -r ogre-1.4.4/Samples/CameraTrack -rm -r ogre-1.4.4/Samples/CelShading -rm -r ogre-1.4.4/Samples/Compositor -rm -r ogre-1.4.4/Samples/CubeMapping -rm -r ogre-1.4.4/Samples/DeferredShading -rm -r ogre-1.4.4/Samples/Dot3Bump -rm -r ogre-1.4.4/Samples/DynTex -rm -r ogre-1.4.4/Samples/EnvMapping -rm -r ogre-1.4.4/Samples/FacialAnimation -rm -r ogre-1.4.4/Samples/Fresnel -rm -r ogre-1.4.4/Samples/Grass -rm -r ogre-1.4.4/Samples/Gui -rm -r ogre-1.4.4/Samples/Instancing -rm -r ogre-1.4.4/Samples/Lighting -rm -r ogre-1.4.4/Samples/Media -rm -r ogre-1.4.4/Samples/OceanDemo -rm -r ogre-1.4.4/Samples/ParticleFX -rm -r ogre-1.4.4/Samples/RenderToTexture -rm -r ogre-1.4.4/Samples/Shadows -rm -r ogre-1.4.4/Samples/SkeletalAnimation -rm -r ogre-1.4.4/Samples/SkyBox -rm -r ogre-1.4.4/Samples/SkyDome -rm -r ogre-1.4.4/Samples/SkyPlane -rm -r ogre-1.4.4/Samples/Smoke -rm -r ogre-1.4.4/Samples/Terrain -rm -r ogre-1.4.4/Samples/TextureFX -rm -r ogre-1.4.4/Samples/Transpacency -rm -r ogre-1.4.4/Samples/VolumeTex -rm -r ogre-1.4.4/Samples/Water -rm -r ogre-1.4.4/Samples/Common/bin -rm -r ogre-1.4.4/Samples/Common/include -rm -r ogre-1.4.4/Samples/Common/setup -rm -r ogre-1.4.4/Samples/ReadMe.html +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 # Remove autom4te.cache directories echo "Removing generated directories from autotools." -rm -r ogre-1.4.4/autom4te.cache -rm -r ogre-1.4.4/ReferenceApplication/autom4te.cache +rm -r ogre-1.4.5/autom4te.cache +rm -r ogre-1.4.5/ReferenceApplication/autom4te.cache # Create the tarball and exclude the CVS directories -if [ ! -f ogre_1.4.4.orig.tar.gz ]; then +if [ ! -f ogre_1.4.5.orig.tar.gz ]; then echo "Creating orig tarball." - tar -czf ogre_1.4.4.orig.tar.gz ogre-1.4.4/ + tar -czf ogre_1.4.5.orig.tar.gz ogre-1.4.5/ else echo "Already found orig tarball. Please remove or move ogrenew -and ogre-1.4.4 directories and also ogre_1.4.4.orig.tar.gz." +and ogre-1.4.5 directories and also ogre_1.4.5.orig.tar.gz." exit 0 fi Modified: packages/trunk/ogre/debian/patches/disable_samples.diff =================================================================== --- packages/trunk/ogre/debian/patches/disable_samples.diff 2007-10-14 20:11:57 UTC (rev 4417) +++ packages/trunk/ogre/debian/patches/disable_samples.diff 2007-10-14 20:16:28 UTC (rev 4418) @@ -18,40 +18,16 @@ fi AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue]) ]) -@@ -588,6 +586,12 @@ - AC_SUBST(GTK_LIBS) - ]) - -+dnl Check whether Ogre platform and GUI to be built are the same -+dnl Fixes problem with running make distclean -+AC_DEFUN([OGRE_PLATFORM_AND_GUI], -+[AM_CONDITIONAL(SAME_PLATFORM_AND_GUI, test "x$OGRE_PLATFORM" = "x$OGRE_GUI") -+]) -+ - dnl SSE support - AC_DEFUN([OGRE_CHECK_SSE], - [ ---- ./configure.in.bak 2007-08-29 00:09:01.000000000 -0400 -+++ ./configure.in 2007-08-29 00:09:15.000000000 -0400 -@@ -93,6 +93,10 @@ - OGRE_CHECK_DX9 - OGRE_CHECK_SSE - -+dnl Check to see if Ogre platform and GUI are the same -+dnl Fixes problem running make distclean when both are set to GLX -+OGRE_PLATFORM_AND_GUI -+ - dnl Check to see if user wants to disable building of demos (defaults is to build) - also checks for OIS - OGRE_BUILD_DEMOS - -@@ -109,6 +113,14 @@ +--- ./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.4 ++dnl This should end with a versuffix of 14.0.5 +OGREMAIN_CURRENT=14 -+OGREMAIN_REVISION=4 ++OGREMAIN_REVISION=5 +OGREMAIN_AGE=0 +OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE +AC_SUBST(OGREMAIN_VERSION_INFO) @@ -59,7 +35,7 @@ dnl Define samples absolute install path ogreexecdir='${abs_top_builddir}/Samples/Common/bin' AC_SUBST(abs_top_builddir) -@@ -150,86 +162,6 @@ +@@ -154,86 +162,6 @@ RenderSystems/Direct3D9/include/Makefile \ Samples/Makefile \ Samples/Common/Makefile \ @@ -146,7 +122,7 @@ Tests/Makefile \ Tests/src/Makefile \ Tools/Makefile \ -@@ -265,7 +197,6 @@ +@@ -269,7 +197,6 @@ echo " Use FreeImage : $build_freeimage" echo " Use DevIL : $build_il" echo " Build OGRE demos : $build_ogre_demos" Deleted: packages/trunk/ogre/debian/patches/makefile_modifications.diff =================================================================== --- packages/trunk/ogre/debian/patches/makefile_modifications.diff 2007-10-14 20:11:57 UTC (rev 4417) +++ packages/trunk/ogre/debian/patches/makefile_modifications.diff 2007-10-14 20:16:28 UTC (rev 4418) @@ -1,11 +0,0 @@ ---- ./OgreMain/include/Makefile.am.bak 2007-08-28 22:21:38.000000000 -0400 -+++ ./OgreMain/include/Makefile.am 2007-08-28 22:23:44.000000000 -0400 -@@ -1,4 +1,7 @@ --SUBDIRS = $(OGRE_PLATFORM) $(OGRE_GUI) -+if !SAME_PLATFORM_AND_GUI -+ INCLUDE_SUBDIRS = $(OGRE_GUI) -+endif -+SUBDIRS = $(OGRE_PLATFORM) $(INCLUDE_SUBDIRS) - - pkginclude_HEADERS = Ogre.h \ - OgreAlignedAllocator.h \ Modified: packages/trunk/ogre/debian/patches/series =================================================================== --- packages/trunk/ogre/debian/patches/series 2007-10-14 20:11:57 UTC (rev 4417) +++ packages/trunk/ogre/debian/patches/series 2007-10-14 20:16:28 UTC (rev 4418) @@ -1,3 +1,2 @@ disable_samples.diff fix_soname_and_rpath.diff -makefile_modifications.diff Modified: packages/trunk/ogre/debian/watch =================================================================== --- packages/trunk/ogre/debian/watch 2007-10-14 20:11:57 UTC (rev 4417) +++ packages/trunk/ogre/debian/watch 2007-10-14 20:16:28 UTC (rev 4418) @@ -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-4 + 1-4-5 # Different check for ogre source, provided by uscan man page http://sf.net/ogre/ \ ogre-linux_osx-v(.*)\.tar\.bz2(.*) \ - 1-4-4. + 1-4-5. _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
