[SCM] Packaging for ogre-contrib branch, master, updated. upstream/1.4.7-27-g55493c7

[Andres Mejia]

The following commit has been merged in the master branch:
commit 55493c7496f7e3e52f982767b539c89c54e9a71e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 18 01:14:06 2008 -0400

    Fix rules file. Update changelog.

diff --git a/debian/changelog b/debian/changelog
index 4db99d1..aa03b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ ogre-contrib (1.4.8-1) unstable; urgency=low
   * Updated patch.
   * Moved to git repository for packaging.
   * Added DM-Upload-Allowed: yes field.
-  * Installing plugin in directory based on ogre version.
+  * Install plugin in directory based on ogre version.
   * Using /usr/bin/update-ogre-plugins for updating plugins file.
 
  -- Andres Mejia <mcitadel at gmail.com>  Sun, 18 May 2008 00:03:56 -0400
diff --git a/debian/rules b/debian/rules
index 7d3d85d..e4c1bd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Use this variable to set what version of ogre we're working with
+OGRE_VERSION=1.4.8
+
 # These are from the autotools-dev package documentation.
 # /usr/share/doc/autotools-dev/README.Debian.gz
 # from the section titled "Calling GNU configure properly"
@@ -25,7 +28,7 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 else
    DEFAULT_CXXFLAGS += -O2
 endif
-CXXFLAGS ?= $(DEFAULT_CXXFLAGS)
+DEB_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.
@@ -36,8 +39,9 @@ OGRE_CONFIG_OPTIONS ?=  $(confflags) \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--with-gui=Xt \
+		--enable-cg \
 		--disable-ogre-demos \
-		CXXFLAGS="$(CXXFLAGS)"
+		CXXFLAGS="$(DEB_CXXFLAGS)"
 
 patch: patch-stamp
 patch-stamp:
@@ -75,7 +79,7 @@ clean-stamp:
 unpatch:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	rm -f patch-stamp
+	rm -rf .pc/ patch-stamp
 
 install: build
 	dh_testdir 

-- 
Packaging for ogre-contrib