r2899 - in packages/trunk/ogre/debian: . patches

[Andres Mejia]

Author: ceros-guest
Date: 2007-06-09 22:33:18 +0000 (Sat, 09 Jun 2007)
New Revision: 2899

Modified:
   packages/trunk/ogre/debian/changelog
   packages/trunk/ogre/debian/control
   packages/trunk/ogre/debian/copyright
   packages/trunk/ogre/debian/patches/disable_samples.dpatch
   packages/trunk/ogre/debian/rules
Log:
Removing unnecessary dependencies for build. Added closes bugs messages. Updated disable_samples.dpatch to display if CEGUI demos are being built.

Modified: packages/trunk/ogre/debian/changelog
===================================================================
--- packages/trunk/ogre/debian/changelog	2007-06-09 16:34:27 UTC (rev 2898)
+++ packages/trunk/ogre/debian/changelog	2007-06-09 22:33:18 UTC (rev 2899)
@@ -1,7 +1,10 @@
 ogre (1.4.1-1) UNRELEASED; urgency=low
 
   [ Christer Stenbrenden ]
-  * New upstream release (closes: bug#NNNNN)
+  * New upstream release
+    + (Closes: #368277)
+    + (Closes: #416181)
+    + (Closes: #423331)
 
   [ Andres Mejia ]
   * Did some cleanup to get this package to build using pbuilder.

Modified: packages/trunk/ogre/debian/control
===================================================================
--- packages/trunk/ogre/debian/control	2007-06-09 16:34:27 UTC (rev 2898)
+++ packages/trunk/ogre/debian/control	2007-06-09 22:33:18 UTC (rev 2899)
@@ -2,7 +2,7 @@
 Priority: optional
 Section: libs
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), dpatch, texi2html, libtool, automake, autoconf, pkg-config, libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev, libois-dev, libstlport5.1-dev, libzzip-dev, libglu1-mesa-dev, libgl1-mesa-dev, libxext-dev, libxrandr-dev, libxxf86vm-dev, libx11-dev, libxaw7-dev, libxt-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), dpatch, texi2html, libtool, automake, autoconf, pkg-config, libfreeimage-dev, libfreetype6-dev, libopenexr-dev, libcegui-mk2-dev, libzzip-dev, libglu1-mesa-dev, libgl1-mesa-dev, libxext-dev, libxrandr-dev, libxxf86vm-dev, libx11-dev, libxaw7-dev, libxt-dev, zlib1g-dev
 Standards-Version: 3.7.2
 
 Package: libogre14

Modified: packages/trunk/ogre/debian/copyright
===================================================================
--- packages/trunk/ogre/debian/copyright	2007-06-09 16:34:27 UTC (rev 2898)
+++ packages/trunk/ogre/debian/copyright	2007-06-09 22:33:18 UTC (rev 2899)
@@ -7,7 +7,7 @@
 
 Original sources were downloaded from:
 
-   http://ogre.sourceforge.net/.
+   http://www.ogre3d.org/.
 
 Upstream Authors:
 

Modified: packages/trunk/ogre/debian/patches/disable_samples.dpatch
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.dpatch	2007-06-09 16:34:27 UTC (rev 2898)
+++ packages/trunk/ogre/debian/patches/disable_samples.dpatch	2007-06-09 22:33:18 UTC (rev 2899)
@@ -134,6 +134,14 @@
      Tests/Makefile \
      Tests/src/Makefile \
      Tools/Makefile \
+@@ -256,7 +176,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-free/Samples/Common/Makefile.am~	2006-02-02 23:04:39.000000000 -0500
 +++ ogre-free/Samples/Common/Makefile.am	2007-05-27 20:39:54.000000000 -0400
 @@ -1,5 +1 @@

Modified: packages/trunk/ogre/debian/rules
===================================================================
--- packages/trunk/ogre/debian/rules	2007-06-09 16:34:27 UTC (rev 2898)
+++ packages/trunk/ogre/debian/rules	2007-06-09 22:33:18 UTC (rev 2899)
@@ -41,7 +41,7 @@
 	    --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	    --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	    --with-platform=GLX --with-gl-support=GLX \
-	    --disable-cg --enable-openexr --with-gui=Xt
+	    --disable-cg --enable-openexr --with-gui=Xt --disable-ogre-demos
 	touch configure-stamp
 
 build: configure build-stamp