r5299 - packages/trunk/funguloids/debian

Sat Jan 12 07:53:06 UTC 2008

Author: ceros-guest
Date: 2008-01-12 07:53:05 +0000 (Sat, 12 Jan 2008)
New Revision: 5299

Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/control
   packages/trunk/funguloids/debian/rules
Log:
Fixing bug #449330. Fixing debian/rules. Removing some unneeded Build-Denpends.

Modified: packages/trunk/funguloids/debian/changelog
===================================================================

--- packages/trunk/funguloids/debian/changelog	2008-01-12 05:52:12 UTC (rev 5298)
+++ packages/trunk/funguloids/debian/changelog	2008-01-12 07:53:05 UTC (rev 5299)
@@ -4,12 +4,28 @@
   * Add watch file.
 
   [ Andres Mejia ]
-  * Removing XS- previx for Vcs-* fields.
+  * Removing XS- prefix for Vcs-* fields.
   * Bumped Standards-Version to 3.7.3.
   * Moved Homepage field to source package stanza.
   * Changed Priority to extra.
     + nvidia-cg-toolkit and ogre-plugins-cgprogrammanager will be Priority
       extra in the future.
+  * Allowing funguloids to degrade gracefully if ogre cg plugin is not
+    installed.
+    + Uses a symlink to /etc/OGRE/plugins.cfg.
+    + No longer need to patch included plugins.cfg.
+    + No longer need Build-Depends of tofrodos.
+    + Closes: #449330
+  * Removed autoconf as Build-Depends, it's a dependency of automake.
+  * Fixed up debian/rules.
+    + Leave files generate by autotools alone.
+    + Use $(MAKE) clean distclean.
+    + Use $(INSTALL)
+    + Set proper tests in debian/rules so as to not depend on --force option
+      for rm.
+    + Adding option to use noopt.
+    + Adding option to use nostrip. Currently just outputs a message.
+    + Adding proper CXXFLAGS.
 
  -- Andres Mejia <mcitadel at gmail.com>  Sat, 12 Jan 2008 00:46:39 -0500
 

Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control	2008-01-12 05:52:12 UTC (rev 5298)
+++ packages/trunk/funguloids/debian/control	2008-01-12 07:53:05 UTC (rev 5299)
@@ -3,7 +3,7 @@
 Section: contrib/games
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 5), dpatch, tofrodos, automake, autoconf, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
+Build-Depends: debhelper (>= 5), dpatch, automake, liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev, libogg-dev, libvorbis-dev, libmad0-dev
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funguloids/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/funguloids/?op=log

Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules	2008-01-12 05:52:12 UTC (rev 5298)
+++ packages/trunk/funguloids/debian/rules	2008-01-12 07:53:05 UTC (rev 5299)
@@ -9,22 +9,20 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-from-dos:
-	dh_testdir
-	fromdos -e bin/plugins.cfg.in
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+   CXXFLAGS += -O0 -g -Wall
+else
+   CXXFLAGS += -O2 -g -Wall
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	@echo How is this done using debhelper?
+	@echo Or should be include a dbg package?
+endif
 
-patch: from-dos patch-stamp
+patch: patch-stamp
 patch-stamp:
 	dh_testdir
 	dpatch apply makefile_modifications
-# This is so Funguloids won't ask for the CgProgramManager plugin on
-# architectures or kernels that don't contain the
-# ogre-plugins-cgprogrammanager package.
-ifneq ($(DEB_HOST_GNU_TYPE),$(findstring $(DEB_HOST_GNU_TYPE), \
-		i486-linux-gnu \
-		x86_64-linux-gnu))
-	dpatch apply disable_ogre-plugins-cgprogrammanager
-endif
 	touch patch-stamp
 
 configure: patch configure-stamp
@@ -43,58 +41,27 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: clean-stamp unpatch to-dos
+clean: clean-stamp unpatch
 clean-stamp:
 	dh_testdir
 	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-# These files are removed to get the cleanest diff.gz possible.
-# These files are autogenerated with autotools.
-	rm -f build-aux/install-sh
-	rm -f build-aux/missing
-	rm -f build-aux/depcomp
-	rm -f bin/music/Makefile.in
-# This next file is created during build but there is no proper line to clean
-# it in the upstream source.
-	rm -f bin/music/playlist.lua
-	rm -f bin/music/Makefile
-	rm -f bin/Makefile.in
-	rm -f bin/icon/Makefile.in
-	rm -f bin/icon/Makefile
-	rm -f bin/Makefile
-	rm -f bin/docs/Makefile.in
-	rm -f bin/docs/Makefile
-	rm -f Makefile.in
-	rm -f include/Makefile.in
-	rm -f src/Makefile.in
-	rm -f configure
-	rm -f aclocal.m4
-
-	rm -f configure-stamp build-stamp
+	[ ! -f Makefile ] || $(MAKE) clean distclean
+	[ ! -f configure-stamp ] || rm configure-stamp
+	[ ! -f build-stamp ] || rm build-stamp
 	dh_clean
 
 unpatch:
 	dh_testdir
 	dh_testroot
-ifneq ($(DEB_HOST_GNU_TYPE),$(findstring $(DEB_HOST_GNU_TYPE), \
-		i486-linux-gnu \
-		x86_64-linux-gnu))
-	dpatch deapply disable_ogre-plugins-cgprogrammanager
-endif
 	dpatch deapply makefile_modifications
-	rm -rf debian/patched
-	rm -f patch-stamp
+	[ ! -d debian/patched ] || rm -r debian/patched
+	[ ! -f patch-stamp ] || rm patch-stamp
 
-to-dos:
-	dh_testdir
-	dh_testroot
-	todos -e bin/plugins.cfg.in
-
 install: build
 	dh_testdir 
 	dh_testroot
 	dh_clean -k
-	install -d debian/tmp
+	$(INSTALL) -d debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 # Build architecture-independent files here.
@@ -105,7 +72,8 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_install --sourcedir=debian/tmp
+	dh_install --sourcedir=debian/tmp -Xplugins.cfg
+	dh_link /etc/OGRE/plugins.cfg usr/share/games/funguloids/plugins.cfg
 	dh_installchangelogs
 	dh_installman debian/funguloids.6
 	dh_installdocs debian/tmp/usr/share/docs/funguloids/*


