Author: ceros-guest Date: 2007-09-03 16:32:31 +0000 (Mon, 03 Sep 2007) New Revision: 4049
Added: packages/trunk/ogre-contrib/debian/ogre-contrib-tarball.sh packages/trunk/ogre-contrib/debian/patches/autotools.diff packages/trunk/ogre-contrib/debian/patches/series Removed: packages/trunk/ogre-contrib/debian/ogre-contrib-gen.sh packages/trunk/ogre-contrib/debian/patches/00list packages/trunk/ogre-contrib/debian/patches/autotools.dpatch Modified: packages/trunk/ogre-contrib/debian/changelog packages/trunk/ogre-contrib/debian/control packages/trunk/ogre-contrib/debian/rules packages/trunk/ogre-contrib/debian/watch Log: Checking in ogre-contrib-1.4.4-1 packaging Modified: packages/trunk/ogre-contrib/debian/changelog =================================================================== --- packages/trunk/ogre-contrib/debian/changelog 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/changelog 2007-09-03 16:32:31 UTC (rev 4049) @@ -1,3 +1,17 @@ +ogre-contrib (1.4.4-1) unstable; urgency=low + + * New upstream release. + * Package will be maintained by Debian Games Team (Closes: 405768) + * Removing tar-in-tar method. + + Fixing packaging accordingly. + * Removing dependency of autoconf, it is a dependency of automake. + * Switched quilt for patching. + * Bootstrapping will be done manually. + * Updated watchfile. + * Adding Federico Di Gregorio as uploader. + + -- Andres Mejia <[EMAIL PROTECTED]> Fri, 31 Aug 2007 01:11:13 -0400 + ogre-contrib (1.4.3-1) unstable; urgency=low * New upstream release. Modified: packages/trunk/ogre-contrib/debian/control =================================================================== --- packages/trunk/ogre-contrib/debian/control 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/control 2007-09-03 16:32:31 UTC (rev 4049) @@ -2,8 +2,8 @@ Priority: optional Section: contrib/libs Maintainer: Debian Games Team <[EMAIL PROTECTED]> -Uploaders: Andres Mejia <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 5), dpatch, libtool, automake, autoconf, pkg-config, nvidia-cg-toolkit, libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.3), libogre-dev (<< 1.4.4) +Uploaders: Andres Mejia <[EMAIL PROTECTED]>, Federico Di Gregorio <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit, libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.4), libogre-dev (<< 1.4.5) Standards-Version: 3.7.2 Package: ogre-plugins-cgprogrammanager Deleted: packages/trunk/ogre-contrib/debian/ogre-contrib-gen.sh =================================================================== --- packages/trunk/ogre-contrib/debian/ogre-contrib-gen.sh 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/ogre-contrib-gen.sh 2007-09-03 16:32:31 UTC (rev 4049) @@ -1,34 +0,0 @@ -#! /bin/sh - -# This script is used to generate the ogre-contrib tarball that contains -# the sources necessary to build the ogre-plugins-cgprogrammanager -# package. This script will only work with the ogre-1.4.1 upstream source. -# To use this script, you must download and place the upstream source in -# the same directory to be used with this script. The upstream source can -# be found at http://www.ogre3d.org/. This script will not download the -# upstream source for you. - -# Prepare the ogre-contrib tarball -tar -xvjf ogre-linux_osx-v1-4-3.tar.bz2 -mv ogrenew ogre-contrib - -# Remove directories and files not needed to build the -# ogre-plugins-cgprogrammanager package. - -rm -r ogre-contrib/autom4te.cache -rm -r ogre-contrib/Docs -rm -r ogre-contrib/Mac -rm -r ogre-contrib/Other -rm -r ogre-contrib/ReferenceApplication -rm -r ogre-contrib/RenderSystems -rm -r ogre-contrib/Samples -rm -r ogre-contrib/SDK -rm -r ogre-contrib/Tests -rm -r ogre-contrib/Tools -rm -r ogre-contrib/PlugIns/BSPSceneManager -rm -r ogre-contrib/PlugIns/EXRCodec -rm -r ogre-contrib/PlugIns/OctreeSceneManager -rm -r ogre-contrib/PlugIns/ParticleFX - -# Create the tarball -tar -cvzf ogre-contrib.tar.gz ogre-contrib/ --exclude=CVS Added: packages/trunk/ogre-contrib/debian/ogre-contrib-tarball.sh =================================================================== --- packages/trunk/ogre-contrib/debian/ogre-contrib-tarball.sh (rev 0) +++ packages/trunk/ogre-contrib/debian/ogre-contrib-tarball.sh 2007-09-03 16:32:31 UTC (rev 4049) @@ -0,0 +1,67 @@ +#! /bin/sh + +# This script is used to generate the ogre-contrib-1.4.4.orig tarball that can be +# distributed through Debian. + +if [ ! -f ogre-linux_osx-v1-4-4.tar.bz2 ] ; then +# Download the tarball +wget http://downloads.sourceforge.net/ogre/ogre-linux_osx-v1-4-4.tar.bz2 +fi + +# Verify the checksum +CORRECT_CHECKSUM=456b75d21bc09d9cee937e3ccf9fbced +COMPUTED_CHECKSUM=`md5sum ogre-linux_osx-v1-4-4.tar.bz2 | cut -d ' ' -f 1` + +if [ $CORRECT_CHECKSUM != $COMPUTED_CHECKSUM ] ; then + echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM +Expected checksum $CORRECT_CHECKSUM" + exit 0 +else + echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM." +fi + +# Prepare the ogre-contrib-1.4.4.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 +else + echo "Already found extracted ogrenew directory. Please remove +or move ogrenew and ogre-contrib-1.4.4 directories and also ogre_1.4.4.orig.tar.gz." + exit 0 +fi +if [ ! -d ogre-contrib-1.4.4 ]; then + echo "Renaming extracted ogrenew directory to ogre-contrib-1.4.4" + mv ogrenew ogre-contrib-1.4.4 +else + echo "Already found ogre-contrib-1.4.4 directory. Please remove or move +ogrenew and ogre-contrib-1.4.4 directories and also ogre_1.4.4.orig.tar.gz." + exit 0 +fi + +# Remove all CVS directories +echo "Removing all CVS directories" +for REMOVE_CVS in `find ogre-contrib-1.4.4 -name CVS`; do + rm -r "$REMOVE_CVS" +done + +# Remove directories and files not needed to build the +# ogre-plugins-cgprogrammanager package. +echo "Removing components not needed for ogre-contrib packages." +rm -r ogre-contrib-1.4.4/autom4te.cache +rm -r ogre-contrib-1.4.4/Docs +rm -r ogre-contrib-1.4.4/Mac +rm -r ogre-contrib-1.4.4/Other +rm -r ogre-contrib-1.4.4/ReferenceApplication +rm -r ogre-contrib-1.4.4/RenderSystems +rm -r ogre-contrib-1.4.4/Samples +rm -r ogre-contrib-1.4.4/SDK +rm -r ogre-contrib-1.4.4/Tests +rm -r ogre-contrib-1.4.4/Tools +rm -r ogre-contrib-1.4.4/PlugIns/BSPSceneManager +rm -r ogre-contrib-1.4.4/PlugIns/EXRCodec +rm -r ogre-contrib-1.4.4/PlugIns/OctreeSceneManager +rm -r ogre-contrib-1.4.4/PlugIns/ParticleFX + +# Create the tarball +echo "Creating ogre-contrib-1.4.4.orig tarball." +tar -czf ogre-contrib_1.4.4.orig.tar.gz ogre-contrib-1.4.4/ Property changes on: packages/trunk/ogre-contrib/debian/ogre-contrib-tarball.sh ___________________________________________________________________ Name: svn:executable + * Deleted: packages/trunk/ogre-contrib/debian/patches/00list =================================================================== --- packages/trunk/ogre-contrib/debian/patches/00list 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/patches/00list 2007-09-03 16:32:31 UTC (rev 4049) @@ -1 +0,0 @@ -autotools.dpatch Added: packages/trunk/ogre-contrib/debian/patches/autotools.diff =================================================================== --- packages/trunk/ogre-contrib/debian/patches/autotools.diff (rev 0) +++ packages/trunk/ogre-contrib/debian/patches/autotools.diff 2007-09-03 16:32:31 UTC (rev 4049) @@ -0,0 +1,226 @@ +--- ./acinclude.m4.bak 2007-08-31 01:25:58.000000000 -0400 ++++ ./acinclude.m4 2007-08-31 01:28:15.000000000 -0400 +@@ -305,19 +305,7 @@ + [build_exr=$enableval], + [build_exr=no]) + +-if test "x$build_exr" = "xyes" ; then +- PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no]) +- +- if test "x$build_exr" = "xyes" ; then +- AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \ +- PlugIns/EXRCodec/src/Makefile \ +- PlugIns/EXRCodec/include/Makefile]) +- AC_SUBST(OPENEXR_CFLAGS) +- AC_SUBST(OPENEXR_LIBS) +- +- fi +- +-fi ++build_exr=no + + AM_CONDITIONAL(BUILD_EXRPLUGIN, test x$build_exr = xyes) + +@@ -446,19 +434,9 @@ + AC_DEFUN([OGRE_CHECK_CEGUI], [ + PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0, + [build_cegui_sample=true], [build_cegui_sample=false]) +- if test x$build_cegui_sample = xtrue; then +- AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \ +- Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc +- Samples/Common/CEGUIRenderer/src/Makefile \ +- Samples/Common/CEGUIRenderer/include/Makefile \ +- Samples/Gui/Makefile \ +- Samples/Gui/src/Makefile]) +- AC_SUBST(CEGUI_CFLAGS) +- AC_SUBST(CEGUI_LIBS) +- AC_MSG_RESULT([CEGUI available, Gui and FacialAnimation samples will be built]) +- else +- AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built]) +- fi ++ build_cegui_sample=false ++ AC_MSG_RESULT([ignoring CEGUI availability and samples]) ++ + AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue]) + ]) + +--- ./configure.in.bak 2007-08-31 01:26:05.000000000 -0400 ++++ ./configure.in 2007-08-31 01:30:40.000000000 -0400 +@@ -79,8 +79,8 @@ + AC_SUBST(ZZIPLIB_LIBS) + + dnl Get the GL and Platform libs for target build +-OGRE_GET_PLATFORM +-OGRE_GET_GLSUPPORT ++dnl OGRE_GET_PLATFORM ++dnl OGRE_GET_GLSUPPORT + + dnl Find the optional components we should build + OGRE_CHECK_GUI +@@ -116,135 +116,10 @@ + + dnl Create the makefiles + AC_CONFIG_FILES([Makefile \ +- OgreMain/Makefile \ +- OgreMain/src/Makefile \ +- OgreMain/include/Makefile \ +- OgreMain/include/GLX/Makefile \ +- OgreMain/include/gtk/Makefile \ + PlugIns/Makefile \ +- PlugIns/BSPSceneManager/Makefile \ +- PlugIns/BSPSceneManager/src/Makefile \ +- PlugIns/BSPSceneManager/include/Makefile \ + PlugIns/CgProgramManager/Makefile \ + PlugIns/CgProgramManager/src/Makefile \ + PlugIns/CgProgramManager/include/Makefile \ +- PlugIns/OctreeSceneManager/Makefile \ +- PlugIns/OctreeSceneManager/src/Makefile \ +- PlugIns/OctreeSceneManager/include/Makefile \ +- PlugIns/ParticleFX/Makefile \ +- PlugIns/ParticleFX/src/Makefile \ +- PlugIns/ParticleFX/include/Makefile \ +- RenderSystems/Makefile \ +- RenderSystems/GL/Makefile \ +- RenderSystems/GL/src/Makefile \ +- RenderSystems/GL/include/Makefile \ +- RenderSystems/GL/src/atifs/Makefile \ +- RenderSystems/GL/src/atifs/include/Makefile \ +- RenderSystems/GL/src/atifs/src/Makefile \ +- RenderSystems/GL/src/GLSL/Makefile \ +- RenderSystems/GL/src/GLSL/include/Makefile \ +- RenderSystems/GL/src/GLSL/src/Makefile \ +- RenderSystems/GL/src/nvparse/Makefile \ +- RenderSystems/Direct3D9/Makefile \ +- RenderSystems/Direct3D9/src/Makefile \ +- RenderSystems/Direct3D9/include/Makefile \ +- Samples/Makefile \ +- Samples/Common/Makefile \ +- Samples/Common/include/Makefile \ +- Samples/Common/bin/Makefile \ +- Samples/BezierPatch/Makefile \ +- Samples/BezierPatch/src/Makefile \ +- Samples/BezierPatch/include/Makefile \ +- Samples/CameraTrack/Makefile \ +- Samples/CameraTrack/src/Makefile \ +- Samples/CelShading/Makefile \ +- Samples/CelShading/src/Makefile \ +- Samples/Compositor/Makefile \ +- Samples/Compositor/src/Makefile \ +- Samples/Compositor/include/Makefile \ +- Samples/CubeMapping/Makefile \ +- Samples/CubeMapping/src/Makefile \ +- Samples/CubeMapping/include/Makefile \ +- Samples/DeferredShading/Makefile \ +- Samples/DeferredShading/src/Makefile \ +- Samples/DeferredShading/include/Makefile \ +- Samples/Dot3Bump/Makefile \ +- Samples/Dot3Bump/src/Makefile \ +- Samples/EnvMapping/Makefile \ +- Samples/EnvMapping/src/Makefile \ +- Samples/EnvMapping/include/Makefile \ +- Samples/FacialAnimation/Makefile \ +- Samples/FacialAnimation/src/Makefile \ +- Samples/Fresnel/Makefile \ +- Samples/Fresnel/src/Makefile \ +- Samples/Grass/Makefile \ +- Samples/Grass/src/Makefile \ +- Samples/Transpacency/Makefile \ +- Samples/Transpacency/src/Makefile \ +- Samples/Transpacency/include/Makefile \ +- Samples/Lighting/Makefile \ +- Samples/Lighting/src/Makefile \ +- Samples/Lighting/include/Makefile \ +- Samples/OceanDemo/Makefile \ +- Samples/OceanDemo/src/Makefile \ +- Samples/OceanDemo/include/Makefile \ +- Samples/ParticleFX/Makefile \ +- Samples/ParticleFX/src/Makefile \ +- Samples/ParticleFX/include/Makefile \ +- Samples/RenderToTexture/Makefile \ +- Samples/RenderToTexture/src/Makefile \ +- Samples/TextureFX/Makefile \ +- Samples/TextureFX/src/Makefile \ +- Samples/TextureFX/include/Makefile \ +- Samples/Shadows/Makefile \ +- Samples/Shadows/src/Makefile \ +- Samples/SkyBox/Makefile \ +- Samples/SkyBox/src/Makefile \ +- Samples/SkyBox/include/Makefile \ +- Samples/SkyDome/Makefile \ +- Samples/SkyDome/src/Makefile \ +- Samples/SkyDome/include/Makefile \ +- Samples/SkyPlane/Makefile \ +- Samples/SkyPlane/src/Makefile \ +- Samples/SkyPlane/include/Makefile \ +- Samples/Smoke/Makefile \ +- Samples/Smoke/src/Makefile \ +- Samples/Smoke/include/Makefile \ +- Samples/BSP/Makefile \ +- Samples/BSP/src/Makefile \ +- Samples/SkeletalAnimation/Makefile \ +- Samples/SkeletalAnimation/src/Makefile \ +- Samples/SkeletalAnimation/include/Makefile \ +- Samples/Terrain/Makefile \ +- Samples/Terrain/src/Makefile \ +- Samples/Terrain/include/Makefile \ +- Samples/Water/Makefile \ +- Samples/Water/src/Makefile \ +- Samples/Water/include/Makefile \ +- Samples/DynTex/Makefile \ +- Samples/DynTex/src/Makefile \ +- Samples/DynTex/include/Makefile \ +- Samples/VolumeTex/Makefile \ +- Samples/VolumeTex/src/Makefile \ +- Samples/VolumeTex/include/Makefile \ +- Samples/Instancing/Makefile \ +- Samples/Instancing/src/Makefile \ +- Samples/Instancing/include/Makefile \ +- Tests/Makefile \ +- Tests/src/Makefile \ +- Tools/Makefile \ +- Tools/MaterialUpgrader/Makefile \ +- Tools/MaterialUpgrader/src/Makefile \ +- Tools/MaterialUpgrader/include/Makefile \ +- Tools/MeshUpgrader/Makefile \ +- Tools/MeshUpgrader/src/Makefile \ +- Tools/XMLConverter/Makefile \ +- Tools/XMLConverter/src/Makefile \ +- Tools/XMLConverter/include/Makefile \ +- Tools/LightwaveConverter/Makefile \ +- Tools/LightwaveConverter/src/Makefile \ +- Tools/LightwaveConverter/include/Makefile \ +- OGRE.pc + ]) + + AC_OUTPUT +@@ -265,7 +140,6 @@ + echo " Use FreeImage : $build_freeimage" + echo " Use DevIL : $build_il" + echo " Build OGRE demos : $build_ogre_demos" +-test "x$build_ogre_demos" == "xyes" && \ + echo " Build CEGUI demos : $build_cegui_sample" + echo " Build the OpenEXR plugin : $build_exr" + echo " Build the Cg plugin : $build_cg" +--- ./Makefile.am.bak 2007-08-31 01:26:12.000000000 -0400 ++++ ./Makefile.am 2007-08-31 01:34:09.000000000 -0400 +@@ -1,6 +1,3 @@ +-SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests ++SUBDIRS = PlugIns + ACLOCAL_AMFLAGS = -I Scripts/m4 + AUTOMAKE_OPTIONS = foreign +- +-pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = OGRE.pc +--- ./PlugIns/Makefile.am.bak 2007-08-31 01:26:39.000000000 -0400 ++++ ./PlugIns/Makefile.am 2007-08-31 01:31:18.000000000 -0400 +@@ -1,9 +1 @@ +-SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager +- +-if BUILD_CGPLUGIN +-SUBDIRS += CgProgramManager +-endif +- +-if BUILD_EXRPLUGIN +-SUBDIRS += EXRCodec +-endif ++SUBDIRS = CgProgramManager Deleted: packages/trunk/ogre-contrib/debian/patches/autotools.dpatch =================================================================== --- packages/trunk/ogre-contrib/debian/patches/autotools.dpatch 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/patches/autotools.dpatch 2007-09-03 16:32:31 UTC (rev 4049) @@ -1,276 +0,0 @@ -#! /bin/sh -e -## autotools.dpatch by Federico Di Gregorio <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch to build only cgprogrammanager plugin. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- ogre-contrib/acinclude.m4~ 2007-07-11 12:24:19.000000000 -0400 -+++ ogre-contrib/acinclude.m4 2007-07-11 12:25:22.000000000 -0400 -@@ -305,19 +305,7 @@ - [build_exr=$enableval], - [build_exr=no]) - --if test "x$build_exr" = "xyes" ; then -- PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no]) -- -- if test "x$build_exr" = "xyes" ; then -- AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \ -- PlugIns/EXRCodec/src/Makefile \ -- PlugIns/EXRCodec/include/Makefile]) -- AC_SUBST(OPENEXR_CFLAGS) -- AC_SUBST(OPENEXR_LIBS) -- -- fi -- --fi -+build_exr=no - - AM_CONDITIONAL(BUILD_EXRPLUGIN, test x$build_exr = xyes) - -@@ -446,19 +434,8 @@ - AC_DEFUN([OGRE_CHECK_CEGUI], [ - PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0, - [build_cegui_sample=true], [build_cegui_sample=false]) -- if test x$build_cegui_sample = xtrue; then -- AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \ -- Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc -- Samples/Common/CEGUIRenderer/src/Makefile \ -- Samples/Common/CEGUIRenderer/include/Makefile \ -- Samples/Gui/Makefile \ -- Samples/Gui/src/Makefile]) -- AC_SUBST(CEGUI_CFLAGS) -- AC_SUBST(CEGUI_LIBS) -- AC_MSG_RESULT([CEGUI available, Gui and FacialAnimation samples will be built]) -- else -- AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built]) -- fi -+ build_cegui_sample=false -+ AC_MSG_RESULT([ignoring CEGUI availability and samples]) - AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue]) - ]) - -## DP: Also using correct check for SSE. -@@ -593,11 +570,11 @@ - [ - AC_MSG_CHECKING(whether to use SSE) - case $target_cpu in -- powerpc) -- build_sse=no -+ i386 | i486 | i586 | i686 | x86_64) -+ build_sse=yes - ;; - *) -- build_sse=yes -+ build_sse=no - ;; - esac - AC_MSG_RESULT($build_sse) ---- ogre-contrib/configure.in~ 2007-06-08 23:37:21.000000000 -0400 -+++ ogre-contrib/configure.in 2007-06-08 23:42:12.000000000 -0400 -@@ -1,6 +1,6 @@ - AC_PREREQ(2.50) - --AC_INIT([OGRE], [1.4.3]) -+AC_INIT([OGRE], [1.4.3],, [OGRE]) - - AC_CANONICAL_TARGET - -@@ -70,8 +70,8 @@ - AC_SUBST(ZZIPLIB_LIBS) - - dnl Get the GL and Platform libs for target build --OGRE_GET_PLATFORM --OGRE_GET_GLSUPPORT -+dnl OGRE_GET_PLATFORM -+dnl OGRE_GET_GLSUPPORT - - dnl Find the optional components we should build - OGRE_CHECK_GUI -@@ -107,135 +107,10 @@ - - dnl Create the makefiles - AC_CONFIG_FILES([Makefile \ -- OgreMain/Makefile \ -- OgreMain/src/Makefile \ -- OgreMain/include/Makefile \ -- OgreMain/include/GLX/Makefile \ -- OgreMain/include/gtk/Makefile \ - PlugIns/Makefile \ -- PlugIns/BSPSceneManager/Makefile \ -- PlugIns/BSPSceneManager/src/Makefile \ -- PlugIns/BSPSceneManager/include/Makefile \ - PlugIns/CgProgramManager/Makefile \ - PlugIns/CgProgramManager/src/Makefile \ - PlugIns/CgProgramManager/include/Makefile \ -- PlugIns/OctreeSceneManager/Makefile \ -- PlugIns/OctreeSceneManager/src/Makefile \ -- PlugIns/OctreeSceneManager/include/Makefile \ -- PlugIns/ParticleFX/Makefile \ -- PlugIns/ParticleFX/src/Makefile \ -- PlugIns/ParticleFX/include/Makefile \ -- RenderSystems/Makefile \ -- RenderSystems/GL/Makefile \ -- RenderSystems/GL/src/Makefile \ -- RenderSystems/GL/include/Makefile \ -- RenderSystems/GL/src/atifs/Makefile \ -- RenderSystems/GL/src/atifs/include/Makefile \ -- RenderSystems/GL/src/atifs/src/Makefile \ -- RenderSystems/GL/src/GLSL/Makefile \ -- RenderSystems/GL/src/GLSL/include/Makefile \ -- RenderSystems/GL/src/GLSL/src/Makefile \ -- RenderSystems/GL/src/nvparse/Makefile \ -- RenderSystems/Direct3D9/Makefile \ -- RenderSystems/Direct3D9/src/Makefile \ -- RenderSystems/Direct3D9/include/Makefile \ -- Samples/Makefile \ -- Samples/Common/Makefile \ -- Samples/Common/include/Makefile \ -- Samples/Common/bin/Makefile \ -- Samples/BezierPatch/Makefile \ -- Samples/BezierPatch/src/Makefile \ -- Samples/BezierPatch/include/Makefile \ -- Samples/CameraTrack/Makefile \ -- Samples/CameraTrack/src/Makefile \ -- Samples/CelShading/Makefile \ -- Samples/CelShading/src/Makefile \ -- Samples/Compositor/Makefile \ -- Samples/Compositor/src/Makefile \ -- Samples/Compositor/include/Makefile \ -- Samples/CubeMapping/Makefile \ -- Samples/CubeMapping/src/Makefile \ -- Samples/CubeMapping/include/Makefile \ -- Samples/DeferredShading/Makefile \ -- Samples/DeferredShading/src/Makefile \ -- Samples/DeferredShading/include/Makefile \ -- Samples/Dot3Bump/Makefile \ -- Samples/Dot3Bump/src/Makefile \ -- Samples/EnvMapping/Makefile \ -- Samples/EnvMapping/src/Makefile \ -- Samples/EnvMapping/include/Makefile \ -- Samples/FacialAnimation/Makefile \ -- Samples/FacialAnimation/src/Makefile \ -- Samples/Fresnel/Makefile \ -- Samples/Fresnel/src/Makefile \ -- Samples/Grass/Makefile \ -- Samples/Grass/src/Makefile \ -- Samples/Transpacency/Makefile \ -- Samples/Transpacency/src/Makefile \ -- Samples/Transpacency/include/Makefile \ -- Samples/Lighting/Makefile \ -- Samples/Lighting/src/Makefile \ -- Samples/Lighting/include/Makefile \ -- Samples/OceanDemo/Makefile \ -- Samples/OceanDemo/src/Makefile \ -- Samples/OceanDemo/include/Makefile \ -- Samples/ParticleFX/Makefile \ -- Samples/ParticleFX/src/Makefile \ -- Samples/ParticleFX/include/Makefile \ -- Samples/RenderToTexture/Makefile \ -- Samples/RenderToTexture/src/Makefile \ -- Samples/TextureFX/Makefile \ -- Samples/TextureFX/src/Makefile \ -- Samples/TextureFX/include/Makefile \ -- Samples/Shadows/Makefile \ -- Samples/Shadows/src/Makefile \ -- Samples/SkyBox/Makefile \ -- Samples/SkyBox/src/Makefile \ -- Samples/SkyBox/include/Makefile \ -- Samples/SkyDome/Makefile \ -- Samples/SkyDome/src/Makefile \ -- Samples/SkyDome/include/Makefile \ -- Samples/SkyPlane/Makefile \ -- Samples/SkyPlane/src/Makefile \ -- Samples/SkyPlane/include/Makefile \ -- Samples/Smoke/Makefile \ -- Samples/Smoke/src/Makefile \ -- Samples/Smoke/include/Makefile \ -- Samples/BSP/Makefile \ -- Samples/BSP/src/Makefile \ -- Samples/SkeletalAnimation/Makefile \ -- Samples/SkeletalAnimation/src/Makefile \ -- Samples/SkeletalAnimation/include/Makefile \ -- Samples/Terrain/Makefile \ -- Samples/Terrain/src/Makefile \ -- Samples/Terrain/include/Makefile \ -- Samples/Water/Makefile \ -- Samples/Water/src/Makefile \ -- Samples/Water/include/Makefile \ -- Samples/DynTex/Makefile \ -- Samples/DynTex/src/Makefile \ -- Samples/DynTex/include/Makefile \ -- Samples/VolumeTex/Makefile \ -- Samples/VolumeTex/src/Makefile \ -- Samples/VolumeTex/include/Makefile \ -- Samples/Instancing/Makefile \ -- Samples/Instancing/src/Makefile \ -- Samples/Instancing/include/Makefile \ -- Tests/Makefile \ -- Tests/src/Makefile \ -- Tools/Makefile \ -- Tools/MaterialUpgrader/Makefile \ -- Tools/MaterialUpgrader/src/Makefile \ -- Tools/MaterialUpgrader/include/Makefile \ -- Tools/MeshUpgrader/Makefile \ -- Tools/MeshUpgrader/src/Makefile \ -- Tools/XMLConverter/Makefile \ -- Tools/XMLConverter/src/Makefile \ -- Tools/XMLConverter/include/Makefile \ -- Tools/LightwaveConverter/Makefile \ -- Tools/LightwaveConverter/src/Makefile \ -- Tools/LightwaveConverter/include/Makefile \ -- OGRE.pc - ]) - - AC_OUTPUT -@@ -256,7 +131,6 @@ - echo " Use FreeImage : $build_freeimage" - echo " Use DevIL : $build_il" - echo " Build OGRE demos : $build_ogre_demos" --test "x$build_ogre_demos" == "xyes" && \ - echo " Build CEGUI demos : $build_cegui_sample" - echo " Build the OpenEXR plugin : $build_exr" - echo " Build the Cg plugin : $build_cg" ---- ogre-contrib/Makefile.am~ 2007-06-08 23:37:34.000000000 -0400 -+++ ogre-contrib/Makefile.am 2007-06-08 23:43:07.000000000 -0400 -@@ -1,6 +1,3 @@ --SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests -+SUBDIRS = PlugIns - ACLOCAL_AMFLAGS = -I Scripts/m4 - AUTOMAKE_OPTIONS = foreign -- --pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = OGRE.pc ---- ogre-contrib/PlugIns/Makefile.am~ 2007-06-08 23:37:52.000000000 -0400 -+++ ogre-contrib/PlugIns/Makefile.am 2007-06-08 23:43:39.000000000 -0400 -@@ -1,9 +1 @@ --SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager -- --if BUILD_CGPLUGIN --SUBDIRS += CgProgramManager --endif -- --if BUILD_EXRPLUGIN --SUBDIRS += EXRCodec --endif -+SUBDIRS = CgProgramManager Added: packages/trunk/ogre-contrib/debian/patches/series =================================================================== --- packages/trunk/ogre-contrib/debian/patches/series (rev 0) +++ packages/trunk/ogre-contrib/debian/patches/series 2007-09-03 16:32:31 UTC (rev 4049) @@ -0,0 +1 @@ +autotools.diff Modified: packages/trunk/ogre-contrib/debian/rules =================================================================== --- packages/trunk/ogre-contrib/debian/rules 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/rules 2007-09-03 16:32:31 UTC (rev 4049) @@ -18,24 +18,22 @@ CFLAGS += -O2 endif -unpack: unpack-stamp -unpack-stamp: - tar -xvzf ogre-contrib.tar.gz - touch unpack-stamp +patch: patch-stamp +patch-stamp: + dh_testdir + QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch patch-stamp -# Using dpatch for patching. -include /usr/share/dpatch/dpatch.make - -configure: unpack patch configure-stamp +configure: patch configure-stamp configure-stamp: dh_testdir - cd ogre-contrib && \ - #libtoolize --force && \ - #aclocal -I Scripts/m4 && \ - #automake --include-deps --add-missing --foreign && \ - #autoconf && \ - ./bootstrap && \ - ./configure --prefix=/usr \ + # Modified bootstrapping from upstream, declares everything obsolete. + libtoolize --force --copy + aclocal -I Scripts/m4 $(ACLOCAL_FLAGS) + autoheader -f + automake --include-deps --add-missing -f --foreign --copy + autoconf -f + ./configure --prefix=/usr \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --with-gui=Xt --disable-ogre-demos @@ -44,22 +42,29 @@ build: configure build-stamp build-stamp: dh_testdir - cd ogre-contrib && $(MAKE) + $(MAKE) touch build-stamp -clean: unpatch clean-stamp +clean: clean-stamp unpatch clean-stamp: dh_testdir dh_testroot - rm -rf ogre-contrib - rm -f unpack-stamp configure-stamp build-stamp + [ ! -f Makefile ] || $(MAKE) clean distclean + rm -f config.log + rm -f configure-stamp build-stamp dh_clean +unpatch: + dh_testdir + QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 + rm -f patch-stamp + install: build dh_testdir dh_testroot dh_clean -k - cd ogre-contrib && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + install -d debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # Build architecture-independent files here. binary-indep: Modified: packages/trunk/ogre-contrib/debian/watch =================================================================== --- packages/trunk/ogre-contrib/debian/watch 2007-09-03 16:23:48 UTC (rev 4048) +++ packages/trunk/ogre-contrib/debian/watch 2007-09-03 16:32:31 UTC (rev 4049) @@ -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-3 + 1-4-4 # Different check for ogre source, provided by uscan man page http://sf.net/ogre/ \ ogre-linux_osx-v(.*)\.tar\.bz2(.*) \ - 1-4-3. + 1-4-4. _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
