Author: ceros-guest
Date: 2008-01-12 05:41:51 +0000 (Sat, 12 Jan 2008)
New Revision: 5296
Removed:
packages/trunk/funguloids/debian/watch
Modified:
packages/trunk/funguloids/debian/README.Debian
packages/trunk/funguloids/debian/changelog
packages/trunk/funguloids/debian/control
packages/trunk/funguloids/debian/copyright
packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch
packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch
packages/trunk/funguloids/debian/rules
Log:
Checking in what was distributed with funguloids-1.06-4.
Modified: packages/trunk/funguloids/debian/README.Debian
===================================================================
--- packages/trunk/funguloids/debian/README.Debian 2008-01-12 04:16:37 UTC
(rev 5295)
+++ packages/trunk/funguloids/debian/README.Debian 2008-01-12 05:41:51 UTC
(rev 5296)
@@ -1,16 +1,8 @@
-Newline Convention
-===============================================================================
-
-Two files (bin/plugins.cfg.in and bin/resources.cfg.in) had their end of line
-conventions set to be compatible with Windows/DOS. This caused problems while
-attempting to patch them so their end of line convention was set for
-compatibility with Unix-like systems. Therefore these two files are different
-from the files delivered upstream.
-
ogre-plugins-cgprogrammanager
===============================================================================
Funguloids can be played with or without ogre-plugins-cgprogrammanager. Without
ogre-plugins-cgprogrammanager, the game's visual quality will be slightly
diminished. For architectures and kernels that don't contain the
-ogre-plugins-cgprogrammanager package, the CgProgramManager plugin setting is
removed.
+ogre-plugins-cgprogrammanager package, the CgProgramManager plugin setting is
+removed.
Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog 2008-01-12 04:16:37 UTC (rev
5295)
+++ packages/trunk/funguloids/debian/changelog 2008-01-12 05:41:51 UTC (rev
5296)
@@ -1,8 +1,15 @@
-funguloids (1.06-1) UNRELEASED; urgency=low
+funguloids (1.06-4) unstable; urgency=low
[ Andres Mejia ]
- * New upstream release (Closes: #428718)
+ * Addressing lintian debian-rules-ignores-make-clean-error warning.
+ * Added --force-missing option in automake.
+ * Added -f option in autoheader and autoconf.
+ * Repacked tarball to remove files that are added by --force-missing option.
+ -- Andres Mejia <[EMAIL PROTECTED]> Thu, 16 Aug 2007 16:47:16 -0400
+
+funguloids (1.06-3) unstable; urgency=low
+
[ Jon Dowland ]
* update menu section to "Games/Action" for menu transition
(thanks Linas Žvirblis)
@@ -10,7 +17,24 @@
[ Cyril Brulebois ]
* Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
- [ Barry deFreese ]
- * Add watch file
+ -- Andres Mejia <[EMAIL PROTECTED]> Sun, 12 Aug 2007 12:58:58 -0400
- -- Jon Dowland <[EMAIL PROTECTED]> Thu, 12 Jul 2007 11:29:13 +0100
+funguloids (1.06-2) unstable; urgency=low
+
+ * Repacked orig tarball to take out tar-in-tar method.
+ + Modified debian/rules and patches for this change.
+ + Also took out files that are generated by autotools.
+ * Added dependency of tofrodos for patching files using DOS carraige return.
+ + Added to-dos and from-dos targets in debian/rules to use this.
+ + Removed message about Newline convention in README.Debian.
+ * Corrected some mistakes in patches where incorrect files would be cleaned.
+ * Ensured text in README.Debian and debian/copyright didn't exceed 80
+ columns.
+
+ -- Andres Mejia <[EMAIL PROTECTED]> Fri, 10 Aug 2007 00:56:31 -0400
+
+funguloids (1.06-1) unstable; urgency=low
+
+ * New upstream release (Closes: #428718)
+
+ -- Andres Mejia <[EMAIL PROTECTED]> Sun, 08 Jul 2007 02:38:08 -0400
Modified: packages/trunk/funguloids/debian/control
===================================================================
--- packages/trunk/funguloids/debian/control 2008-01-12 04:16:37 UTC (rev
5295)
+++ packages/trunk/funguloids/debian/control 2008-01-12 05:41:51 UTC (rev
5296)
@@ -3,9 +3,8 @@
Section: contrib/games
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Andres Mejia <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), dpatch, 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, tofrodos, automake, autoconf,
liblua5.1-0-dev, libois-dev, libogre-dev (>= 1.4), libalut-dev, libopenal-dev,
libogg-dev, libvorbis-dev, libmad0-dev
Standards-Version: 3.7.2
-Homepage: http://funguloids.sourceforge.net/
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funguloids/
XS-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/funguloids/?op=log
Modified: packages/trunk/funguloids/debian/copyright
===================================================================
--- packages/trunk/funguloids/debian/copyright 2008-01-12 04:16:37 UTC (rev
5295)
+++ packages/trunk/funguloids/debian/copyright 2008-01-12 05:41:51 UTC (rev
5296)
@@ -1,7 +1,9 @@
This package was debianized by Andres Mejia <[EMAIL PROTECTED]> on
Sat, 23 Jun 2007 15:59:37 -0400.
-It was downloaded from <http://funguloids.sourceforge.net/download.html>. The
(sources + data) tarball was downloaded.
+It was downloaded from <http://funguloids.sourceforge.net/download.html>. The
+(sources + data) tarball was downloaded. Files that are generated by autotools
+are removed from original tarball.
Credits:
@@ -10,21 +12,34 @@
Artwork: Mika Halttunen
Sound Design & Music: Teemu Ruokolainen
-We're using Ogre graphics engine for visuals, OIS for input, Lua for scripting
and OpenAL for audio output. SimpleIni is used for the configuration
reading/writing. Hosted by SourceForge.
+We're using Ogre graphics engine for visuals, OIS for input, Lua for scripting
+and OpenAL for audio output. SimpleIni is used for the configuration
+reading/writing. Hosted by SourceForge.
-Comments, ideas, patches, bug reports, etc. are always welcome and
appreciated! :) Use the SourceForge trackers, or just mail me at the e-mail
address above. And be sure to check out Funguloids website at
http://funguloids.sourceforge.net for the latest stuff!
+Comments, ideas, patches, bug reports, etc. are always welcome and
+appreciated! :) Use the SourceForge trackers, or just mail me at the e-mail
+address above. And be sure to check out Funguloids website at
+http://funguloids.sourceforge.net for the latest stuff!
Copyright and License:
"Those Funny Funguloids!" is licensed under the zlib/libpng license.
Copyright © 2006-2007, Mika Halttunen & Teemu Ruokolainen
-This software is provided 'as-is', without any express or implied warranty. In
no event will the authors be held liable for any damages arising from the use
of this software.
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use
+of this software.
-Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it freely,
subject to the following restrictions:
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
- 1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software in a
product, an acknowledgment in the product documentation would be appreciated
but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software in a
+ product, an acknowledgment in the product documentation would be appreciated
+ but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
The Debian packaging is (C) 2007, Andres Mejia <[EMAIL PROTECTED]> and
Modified:
packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch
===================================================================
---
packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch
2008-01-12 04:16:37 UTC (rev 5295)
+++
packages/trunk/funguloids/debian/patches/disable_ogre-plugins-cgprogrammanager.dpatch
2008-01-12 05:41:51 UTC (rev 5296)
@@ -26,8 +26,8 @@
esac
exit 0
---- funguloids/bin/plugins.cfg.in~ 2007-07-08 01:48:31.000000000 -0400
-+++ funguloids/bin/plugins.cfg.in 2007-07-08 01:49:14.000000000 -0400
+--- bin/plugins.cfg.in~ 2007-07-08 01:48:31.000000000 -0400
++++ bin/plugins.cfg.in 2007-07-08 01:49:14.000000000 -0400
@@ -7,6 +7,5 @@
Plugin=RenderSystem_GL
Plugin=Plugin_ParticleFX
Modified: packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch
===================================================================
--- packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch
2008-01-12 04:16:37 UTC (rev 5295)
+++ packages/trunk/funguloids/debian/patches/makefile_modifications.dpatch
2008-01-12 05:41:51 UTC (rev 5296)
@@ -26,9 +26,9 @@
exit 0
## DP: Patch to install music files using DESTDIR.
---- funguloids/bin/music/Makefile.am~ 2007-06-23 18:03:05.000000000 -0400
-+++ funguloids/bin/music/Makefile.am 2007-06-23 18:04:00.000000000 -0400
-@@ -1,15 +1,11 @@
+--- bin/music/Makefile.am~ 2007-06-23 18:03:05.000000000 -0400
++++ bin/music/Makefile.am 2007-06-23 18:04:00.000000000 -0400
+@@ -1,12 +1,10 @@
-musicinstall_DATA = playlist.lua
+musicinstall_DATA = playlist.lua MarylandInMay.ogg
@@ -39,16 +39,12 @@
-install-data-hook:
- if test -r MarylandInMay.ogg; then cp MarylandInMay.ogg
"@musicinstalldir@"; fi;
--
--
- distclean: clean
- clean:
-- -rm -f playlist.lua *~
-+ -rm -f playlist.lua MarylandInMay.ogg *~
+
+ distclean: clean
## DP: Patch to install data files using DESTDIR.
---- funguloids/bin/Makefile.am~ 2007-06-23 18:36:56.000000000 -0400
-+++ funguloids/bin/Makefile.am 2007-06-23 18:39:50.000000000 -0400
+--- bin/Makefile.am~ 2007-06-23 18:36:56.000000000 -0400
++++ bin/Makefile.am 2007-06-23 18:39:50.000000000 -0400
@@ -4,7 +4,7 @@
dist_pixmapinstall_DATA = funguloids.png
dist_gameinstall_DATA = gamesettings.cfg
@@ -65,15 +61,7 @@
- fi; \
- if test -r bootstrap.mpk; then cp bootstrap.mpk "@gameinstalldir@"; fi;
\
- if test -r funguloids.mpk; then cp funguloids.mpk "@gameinstalldir@"; fi
-+ fi;
++ fi
uninstall-hook:
rm -rf "@docinstalldir@"
-@@ -32,5 +30,6 @@
- distclean: clean
-
- clean:
-- -rm -f funguloids funguloids.sh plugins.cfg resources.cfg Ogre.log
ogre.cfg *~
-+ -rm -f funguloids funguloids.sh plugins.cfg resources.cfg \
-+ bootstrap.mpk funguloids.mpk Ogre.log ogre.cfg *~
-
Modified: packages/trunk/funguloids/debian/rules
===================================================================
--- packages/trunk/funguloids/debian/rules 2008-01-12 04:16:37 UTC (rev
5295)
+++ packages/trunk/funguloids/debian/rules 2008-01-12 05:41:51 UTC (rev
5296)
@@ -9,14 +9,13 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-unpack: unpack-stamp
-unpack-stamp:
+from-dos:
dh_testdir
- tar -xvzf funguloids.tar.gz
- touch unpack-stamp
+ fromdos -e bin/plugins.cfg.in
-patch: unpack patch-stamp
+patch: from-dos 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
@@ -24,43 +23,79 @@
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: unpack patch configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
- cd funguloids && \
aclocal && \
- autoheader && \
- automake --add-missing --copy && \
- autoconf && \
+ autoheader -f && \
+ automake --add-missing --force-missing --copy && \
+ autoconf -f && \
CXX=$(DEB_HOST_GNU_TYPE)-g++ ./configure --prefix=/usr --with-fmod=no
touch configure-stamp
build: configure build-stamp
build-stamp:
dh_testdir
- cd funguloids && $(MAKE)
+ $(MAKE)
touch build-stamp
-clean: clean-stamp
+clean: clean-stamp unpatch to-dos
clean-stamp:
dh_testdir
dh_testroot
- rm -rf funguloids
- rm -rf debian/patched
- rm -f *-stamp
+ [ ! -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
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
+
+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
- cd funguloids && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Build architecture-independent files here.
binary-indep:
Deleted: packages/trunk/funguloids/debian/watch
===================================================================
--- packages/trunk/funguloids/debian/watch 2008-01-12 04:16:37 UTC (rev
5295)
+++ packages/trunk/funguloids/debian/watch 2008-01-12 05:41:51 UTC (rev
5296)
@@ -1,3 +0,0 @@
-version=3
-
-http://sf.net/funguloids/funguloids-linux-src-([\d.]+)\.tar\.bz2
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
