r6418 - packages/trunk/ogre-contrib/debian

[Andres Mejia]

Author: ceros-guest
Date: 2008-04-04 03:39:27 +0000 (Fri, 04 Apr 2008)
New Revision: 6418

Modified:
   packages/trunk/ogre-contrib/debian/changelog
   packages/trunk/ogre-contrib/debian/control
   packages/trunk/ogre-contrib/debian/ogre-contrib-get-orig-source
   packages/trunk/ogre-contrib/debian/rules
   packages/trunk/ogre-contrib/debian/watch
Log:
Update ogre-contrib to new upstream release.

Modified: packages/trunk/ogre-contrib/debian/changelog
===================================================================
--- packages/trunk/ogre-contrib/debian/changelog	2008-04-04 00:06:48 UTC (rev 6417)
+++ packages/trunk/ogre-contrib/debian/changelog	2008-04-04 03:39:27 UTC (rev 6418)
@@ -1,3 +1,12 @@
+ogre-contrib (1.4.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Setup a OGRE_CONFIG_OPTIONS for default configure options used in building
+    ogre.
+  * Changing use of CFLAGS TO CXXFLAGS.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Thu, 03 Apr 2008 23:27:41 -0400
+
 ogre-contrib (1.4.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/ogre-contrib/debian/control
===================================================================
--- packages/trunk/ogre-contrib/debian/control	2008-04-04 00:06:48 UTC (rev 6417)
+++ packages/trunk/ogre-contrib/debian/control	2008-04-04 03:39:27 UTC (rev 6418)
@@ -3,7 +3,7 @@
 Section: contrib/libs
 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, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.6), libogre-dev (<< 1.4.7)
+Build-Depends: debhelper (>= 5), quilt, libtool, automake, pkg-config, nvidia-cg-toolkit (>= 2.0), libfreetype6-dev, libfreeimage-dev, libzzip-dev, libogre-dev (>= 1.4.7), libogre-dev (<< 1.4.8)
 Standards-Version: 3.7.3
 Homepage: http://ogre3d.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ogre-contrib

Modified: packages/trunk/ogre-contrib/debian/ogre-contrib-get-orig-source
===================================================================
--- packages/trunk/ogre-contrib/debian/ogre-contrib-get-orig-source	2008-04-04 00:06:48 UTC (rev 6417)
+++ packages/trunk/ogre-contrib/debian/ogre-contrib-get-orig-source	2008-04-04 03:39:27 UTC (rev 6418)
@@ -4,9 +4,9 @@
 # distributed through Debian.
 
 # 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
+OGRE_VERSION=1.4.7
+OGRE_TARBALL=ogre-linux_osx-v1-4-7.tar.bz2
+OGRE_TARBALL_CHECKSUM=f44cba3f7362f6d8ca4187dee0d588ef
 
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\

Modified: packages/trunk/ogre-contrib/debian/rules
===================================================================
--- packages/trunk/ogre-contrib/debian/rules	2008-04-04 00:06:48 UTC (rev 6417)
+++ packages/trunk/ogre-contrib/debian/rules	2008-04-04 03:39:27 UTC (rev 6418)
@@ -5,19 +5,40 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+# These are from the autotools-dev package documentation.
+# /usr/share/doc/autotools-dev/README.Debian.gz
+# from the section titled "Calling GNU configure properly"
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS += -Wall -g
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
 
+# CXXFLAGS to use. Allowing it to be overriden.
+DEFAULT_CXXFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+   DEFAULT_CXXFLAGS += -O0
 else
-	CFLAGS += -O2
+   DEFAULT_CXXFLAGS += -O2
 endif
+CXXFLAGS ?= $(DEFAULT_CXXFLAGS)
 
+# Include a OGRE_CONFIG_OPTIONS variable that has the default configure options
+# used to build this package. This variable can be overridden.
+OGRE_CONFIG_OPTIONS ?=  $(confflags) \
+		--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 \
+		CXXFLAGS="$(CXXFLAGS)"
+
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
@@ -33,10 +54,7 @@
 	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
+	./configure $(OGRE_CONFIG_OPTIONS)
 	touch configure-stamp
 
 build: configure build-stamp
@@ -91,4 +109,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: unpack configure build clean binary-indep binary-arch binary install 
+.PHONY: configure build clean binary-indep binary-arch binary install

Modified: packages/trunk/ogre-contrib/debian/watch
===================================================================
--- packages/trunk/ogre-contrib/debian/watch	2008-04-04 00:06:48 UTC (rev 6417)
+++ packages/trunk/ogre-contrib/debian/watch	2008-04-04 03:39:27 UTC (rev 6418)
@@ -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-6
+     1-4-7
 
 # Different check for ogre source, provided by uscan man page
 http://sf.net/ogre/ \
      ogre-linux_osx-v(.*)\.tar\.bz2(.*) \
-     1-4-6.
+     1-4-7.