[SCM] Evolving Artificial Life branch, master, updated. upstream/1.0-beta11+dfsg-11-ga6ae127
Gabriele Giacone
1o5g4r8o at gmail.com
Thu Mar 18 01:15:37 UTC 2010
The following commit has been merged in the master branch:
commit a6ae1273dded9730f206c7f605b8028edd54b812
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Thu Mar 18 02:07:16 2010 +0100
new upstream release 1.0-beta12.1
diff --git a/debian/changelog b/debian/changelog
index d470d8c..dd8a4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+critterding (1.0-beta12.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Verdana fonts replaced with DejaVuSans fonts.
+ - Removed patch 01nonfreefonts.
+ - Removed +dfsg from version number.
+ - Removed ttf-liberation dependency.
+ * Removed patch 00libftgl, now it builds against system ftgl.
+ * Added patch 00fontandiconpath to replace font and icon relative paths with
+ absolute ones.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com> Thu, 18 Mar 2010 02:03:17 +0100
+
critterding (1.0-beta11+dfsg-2) unstable; urgency=low
* Added upstream README (Closes: #568698)
diff --git a/debian/control b/debian/control
index 646ef79..ebe2613 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Gabriele Giacone <1o5g4r8o at gmail.com>
Build-Depends: debhelper (>= 7.0.50~), autotools-dev, automake, libtool,
- pkg-config, mesa-common-dev, libglu1-mesa-dev, libsdl1.2-dev,
- ttf-liberation, libftgl-dev, imagemagick
+ pkg-config, mesa-common-dev, libglu1-mesa-dev, libsdl1.2-dev, libftgl-dev,
+ imagemagick
Standards-Version: 3.8.4
DM-Upload-Allowed: yes
Vcs-Git: git://git.debian.org/debian-science/packages/critterding.git
@@ -14,7 +14,7 @@ Homepage: http://critterding.sourceforge.net/
Package: critterding
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-liberation
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Evolving Artificial Life
Critterding is a "Petri dish" universe in 3D that demonstrates
evolving artificial life. Critters start out with completely
diff --git a/debian/critterding.1 b/debian/critterding.1
index 9a8972a..c903041 100644
--- a/debian/critterding.1
+++ b/debian/critterding.1
@@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "CRITTERDING 1"
-.TH CRITTERDING 1 "2010-01-23" "1.0" "critterding Debian manpage"
+.TH CRITTERDING 1 "2010-03-17" "1.0" "critterding Debian manpage"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -198,6 +198,18 @@ Use \fBF1\fR in the simulation for more information about keys.
\& autoload critters from ~/.critterding/load
\& (default: 0, range: 0\-1)
.Ve
+.IP "\fB\-\-autoloadlastsaved\fR num" 4
+.IX Item "--autoloadlastsaved num"
+.Vb 2
+\& autoload critters from ~/.critterding/lastsaved
+\& (default: 0, range: 0\-1)
+.Ve
+.IP "\fB\-\-benchmark\fR num" 4
+.IX Item "--benchmark num"
+.Vb 2
+\& run the critterding benchmark
+\& (default: 0, range: 0\-1)
+.Ve
.IP "\fB\-\-body_maxbodyparts\fR num" 4
.IX Item "--body_maxbodyparts num"
.Vb 2
@@ -226,7 +238,7 @@ Use \fBF1\fR in the simulation for more information about keys.
.IX Item "--body_maxmutations num"
.Vb 2
\& maximum mutations on a body mutant
-\& (default: 10, range: 1\-1000000)
+\& (default: 3, range: 1\-1000000)
.Ve
.IP "\fB\-\-body_minbodypartsize\fR num" 4
.IX Item "--body_minbodypartsize num"
@@ -252,6 +264,18 @@ Use \fBF1\fR in the simulation for more information about keys.
\& chance of adding a body part
\& (default: 1, range: 0\-100)
.Ve
+.IP "\fB\-\-body_percentmutateeffectchangecolor\fR num" 4
+.IX Item "--body_percentmutateeffectchangecolor num"
+.Vb 2
+\& chance of changing body color
+\& (default: 1, range: 0\-100)
+.Ve
+.IP "\fB\-\-body_percentmutateeffectchangecolor_slightly\fR num" 4
+.IX Item "--body_percentmutateeffectchangecolor_slightly num"
+.Vb 2
+\& chance of changing body color
+\& (default: 5, range: 0\-100)
+.Ve
.IP "\fB\-\-body_percentmutateeffectchangeconstraintangles\fR num" 4
.IX Item "--body_percentmutateeffectchangeconstraintangles num"
.Vb 2
@@ -298,7 +322,7 @@ Use \fBF1\fR in the simulation for more information about keys.
.IX Item "--body_percentmutateeffectrepositionhead num"
.Vb 2
\& chance of repositioning head
-\& (default: 1, range: 0\-100)
+\& (default: 5, range: 0\-100)
.Ve
.IP "\fB\-\-body_percentmutateeffectresizebodypart\fR num" 4
.IX Item "--body_percentmutateeffectresizebodypart num"
@@ -550,13 +574,13 @@ Use \fBF1\fR in the simulation for more information about keys.
.IX Item "--brain_percentmutateeffectaddneuron num"
.Vb 2
\& chance of adding a neuron
-\& (default: 10, range: 0\-100)
+\& (default: 1, range: 0\-100)
.Ve
.IP "\fB\-\-brain_percentmutateeffectaddsynapse\fR num" 4
.IX Item "--brain_percentmutateeffectaddsynapse num"
.Vb 2
\& chance of adding a synapse
-\& (default: 29, range: 0\-100)
+\& (default: 5, range: 0\-100)
.Ve
.IP "\fB\-\-brain_percentmutateeffectaltermutable\fR num" 4
.IX Item "--brain_percentmutateeffectaltermutable num"
@@ -568,19 +592,19 @@ Use \fBF1\fR in the simulation for more information about keys.
.IX Item "--brain_percentmutateeffectalterneuron num"
.Vb 2
\& chance of altering a neuron
-\& (default: 20, range: 0\-100)
+\& (default: 2, range: 0\-100)
.Ve
.IP "\fB\-\-brain_percentmutateeffectremoveneuron\fR num" 4
.IX Item "--brain_percentmutateeffectremoveneuron num"
.Vb 2
\& chance of removing a neuron
-\& (default: 10, range: 0\-100)
+\& (default: 1, range: 0\-100)
.Ve
.IP "\fB\-\-brain_percentmutateeffectremovesynapse\fR num" 4
.IX Item "--brain_percentmutateeffectremovesynapse num"
.Vb 2
\& chance of removing a synapse
-\& (default: 29, range: 0\-100)
+\& (default: 5, range: 0\-100)
.Ve
.IP "\fB\-\-camerasensitivity\fR num" 4
.IX Item "--camerasensitivity num"
@@ -594,6 +618,12 @@ Use \fBF1\fR in the simulation for more information about keys.
\& colors genetically exact critters identically
\& (default: 0, range: 0\-1)
.Ve
+.IP "\fB\-\-critter_autoexchangeinterval\fR num" 4
+.IX Item "--critter_autoexchangeinterval num"
+.Vb 2
+\& save critters every n seconds
+\& (default: 0, range: 0\-1000000)
+.Ve
.IP "\fB\-\-critter_autosaveinterval\fR num" 4
.IX Item "--critter_autosaveinterval num"
.Vb 2
@@ -606,11 +636,17 @@ Use \fBF1\fR in the simulation for more information about keys.
\& enables critters to eat each other
\& (default: 1, range: 0\-1)
.Ve
+.IP "\fB\-\-critter_insertevery\fR num" 4
+.IX Item "--critter_insertevery num"
+.Vb 2
+\& inserts a random critter every n frames
+\& (default: 0, range: 0\-1000000)
+.Ve
.IP "\fB\-\-critter_killhalfat\fR num" 4
.IX Item "--critter_killhalfat num"
.Vb 2
\& kill 50% of critters if population reaches n
-\& (default: 100, range: 2\-1000000)
+\& (default: 120, range: 2\-1000000)
.Ve
.IP "\fB\-\-critter_maxenergy\fR num" 4
.IX Item "--critter_maxenergy num"
@@ -622,7 +658,7 @@ Use \fBF1\fR in the simulation for more information about keys.
.IX Item "--critter_maxlifetime num"
.Vb 2
\& maximum number of frames a critter lives
-\& (default: 8000, range: 1\-1000000)
+\& (default: 40000, range: 1\-1000000)
.Ve
.IP "\fB\-\-critter_minenergyproc\fR num" 4
.IX Item "--critter_minenergyproc num"
@@ -636,6 +672,12 @@ Use \fBF1\fR in the simulation for more information about keys.
\& minimum frames between procreations
\& (default: 20, range: 1\-1000000)
.Ve
+.IP "\fB\-\-critter_raycastvision\fR num" 4
+.IX Item "--critter_raycastvision num"
+.Vb 2
+\& use raycast vision instead of opengl
+\& (default: 0, range: 0\-1)
+.Ve
.IP "\fB\-\-critter_retinasize\fR num" 4
.IX Item "--critter_retinasize num"
.Vb 2
@@ -651,9 +693,15 @@ Use \fBF1\fR in the simulation for more information about keys.
.IP "\fB\-\-critter_startenergy\fR num" 4
.IX Item "--critter_startenergy num"
.Vb 2
-\& energy a new critter starts with
+\& energy a new critter (adam) starts with
\& (default: 3000, range: 1\-1000000)
.Ve
+.IP "\fB\-\-drawscene\fR num" 4
+.IX Item "--drawscene num"
+.Vb 2
+\& draw the scene
+\& (default: 1, range: 0\-1)
+.Ve
.IP "\fB\-\-energy\fR num" 4
.IX Item "--energy num"
.Vb 2
@@ -676,7 +724,7 @@ Use \fBF1\fR in the simulation for more information about keys.
.IX Item "--food_maxlifetime num"
.Vb 2
\& maximum number of frames a food unit exists
-\& (default: 4000, range: 1\-1000000)
+\& (default: 40000, range: 1\-1000000)
.Ve
.IP "\fB\-\-food_size\fR num" 4
.IX Item "--food_size num"
@@ -684,6 +732,12 @@ Use \fBF1\fR in the simulation for more information about keys.
\& size of a food unit
\& (default: 200, range: 1\-1000000)
.Ve
+.IP "\fB\-\-fpslimit\fR num" 4
+.IX Item "--fpslimit num"
+.Vb 2
+\& frames per second for the fps limiter
+\& (default: 30, range: 1\-1000)
+.Ve
.IP "\fB\-\-fsX\fR num" 4
.IX Item "--fsX num"
.Vb 2
@@ -702,29 +756,42 @@ Use \fBF1\fR in the simulation for more information about keys.
\& enable fullscreen mode
\& (default: 0, range: 0\-1)
.Ve
-.IP "\fB\-\-insertcritterevery\fR num" 4
-.IX Item "--insertcritterevery num"
+.IP "\fB\-\-headless\fR num" 4
+.IX Item "--headless num"
.Vb 2
-\& inserts a random critter every n frames
-\& (default: 0, range: 0\-1000000)
+\& do not open gl context
+\& (default: 0, range: 0\-1)
.Ve
-.IP "\fB\-\-killhalfdecreaseenergybypct\fR num" 4
-.IX Item "--killhalfdecreaseenergybypct num"
+.IP "\fB\-\-killhalf_decrenergypct\fR num" 4
+.IX Item "--killhalf_decrenergypct num"
.Vb 2
\& decrease energy by n percent when killhalfat triggers
\& (default: 1, range: 0\-100)
.Ve
+.IP "\fB\-\-killhalf_decrmaxlifetimepct\fR num" 4
+.IX Item "--killhalf_decrmaxlifetimepct num"
+.Vb 2
+\& decrease critter_maxlifetime by n when killhalfat triggers
+\& (default: 0, range: 0\-100)
+.Ve
+.IP "\fB\-\-killhalf_incrworldsizeX\fR num" 4
+.IX Item "--killhalf_incrworldsizeX num"
+.Vb 2
+\& increase worldsizeX by n when killhalfat triggers
+\& (default: 0, range: 0\-100)
+.Ve
+.IP "\fB\-\-killhalf_incrworldsizeY\fR num" 4
+.IX Item "--killhalf_incrworldsizeY num"
+.Vb 2
+\& increase worldsizeY by n when killhalfat triggers
+\& (default: 0, range: 0\-100)
+.Ve
.IP "\fB\-\-mincritters\fR num" 4
.IX Item "--mincritters num"
.Vb 2
\& minimum number of critters
\& (default: 10, range: 0\-1000)
.Ve
-.IP "\fB\-\-profile\fR file" 4
-.IX Item "--profile file"
-.Vb 1
-\& load settings. Settings can be saved to ./default by pressing "s".
-.Ve
.IP "\fB\-\-race\fR num" 4
.IX Item "--race num"
.Vb 2
@@ -737,12 +804,30 @@ Use \fBF1\fR in the simulation for more information about keys.
\& number of vision retinas to stack per row onscreen
\& (default: 20, range: 1\-1000)
.Ve
+.IP "\fB\-\-roundworld\fR num" 4
+.IX Item "--roundworld num"
+.Vb 2
+\& enable round planet
+\& (default: 0, range: 0\-1)
+.Ve
+.IP "\fB\-\-startseed\fR num" 4
+.IX Item "--startseed num"
+.Vb 2
+\& enable fullscreen mode
+\& (default: 0, range: 0\-4000000000)
+.Ve
.IP "\fB\-\-testworld\fR num" 4
.IX Item "--testworld num"
.Vb 2
-\& enable race simulation
+\& a world for test purposes
\& (default: 0, range: 0\-1)
.Ve
+.IP "\fB\-\-threads\fR num" 4
+.IX Item "--threads num"
+.Vb 2
+\& threads to use
+\& (default: 1, range: 1\-16)
+.Ve
.IP "\fB\-\-worldsizeX\fR num" 4
.IX Item "--worldsizeX num"
.Vb 2
diff --git a/debian/patches/00fontandiconpath b/debian/patches/00fontandiconpath
new file mode 100644
index 0000000..7ef9950
--- /dev/null
+++ b/debian/patches/00fontandiconpath
@@ -0,0 +1,26 @@
+Description: This patch replace font and icon relative paths with
+ absolute ones.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- critterding-1.0-beta12.1.orig/src/gui/textprinter.cpp
++++ critterding-1.0-beta12.1/src/gui/textprinter.cpp
+@@ -185,7 +185,7 @@ void Textprinter::setUpFonts()
+ char const *fontFilePath;
+
+ string fontpath = Settings::Instance()->binarypath;
+- string defaultf = "../share/critterding/font.ttf";
++ string defaultf = "/usr/share/critterding/font.ttf";
+ string systemf = "/usr/share/fonts/TTF/DejaVuSans.ttf";
+
+ string usepath = fontpath;
+--- critterding-1.0-beta12.1.orig/src/gl/glwindow.cpp
++++ critterding-1.0-beta12.1/src/gl/glwindow.cpp
+@@ -47,7 +47,7 @@ void GLWindow::create(const char* title,
+ // SDL_WM_SetIcon(SDL_LoadBMP("other files/critterding icon.png"), 0);
+ // SDL_WM_SetIcon(SDL_LoadBMP("other files/cd.bmp"), 0);
+ string pixmappath = Settings::Instance()->binarypath;
+- pixmappath.append( "../share/critterding/pixmaps/cd.bmp" );
++ pixmappath.append( "/usr/share/critterding/pixmaps/cd.bmp" );
+ SDL_WM_SetIcon(SDL_LoadBMP(pixmappath.c_str()), 0);
+ // SDL_WM_SetIcon(SDL_LoadBMP("/projects/lessons/lesson20/data/image2.bmp"), 0);
+
diff --git a/debian/patches/00libftgl b/debian/patches/00libftgl
deleted file mode 100644
index a5d40a8..0000000
--- a/debian/patches/00libftgl
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: To build against Debian libftgl
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- critterding-1.0-beta11+dfsg.orig/configure.in
-+++ critterding-1.0-beta11+dfsg/configure.in
-@@ -7,6 +7,8 @@ AC_LANG_CPLUSPLUS
- AC_PROG_CXX
- AM_PROG_LIBTOOL
-
-+PKG_PROG_PKG_CONFIG
-+
- AC_MSG_CHECKING([host type])
- case "$host" in
- *-apple-darwin*)
-@@ -48,6 +50,8 @@ AC_SUBST(SDLMAIN)
-
- dnl AC_DEFINE(OS, $OS, [Operating System])
-
-+PKG_CHECK_MODULES(FTGL, ftgl)
-+
- AC_OUTPUT(Makefile src/Makefile src/brainz/Makefile \
- src/math/Makefile \
- src/gl/Makefile \
-@@ -55,7 +59,6 @@ AC_OUTPUT(Makefile src/Makefile src/brai
- src/scenes/entities/Makefile \
- src/scenes/modes/Makefile \
- src/utils/Makefile \
-- src/utils/ftgl/Makefile \
- src/utils/bullet/Makefile \
- src/gui/Makefile \
- )
---- critterding-1.0-beta11+dfsg.orig/src/Makefile.am
-+++ critterding-1.0-beta11+dfsg/src/Makefile.am
-@@ -15,9 +15,10 @@ critterding_LDADD = $(top_builddir)/src/
- $(top_builddir)/src/utils/libutils.la \
- $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/gui/libgui.la \
-- $(HOST_LIBS)
-+ $(HOST_LIBS) \
-+ $(FTGL)
-
- # -lGL -lfreetype -lSDL
- # -lBulletDynamics -lBulletCollision -lLinearMath
- # -lftgl
--critterding_LDFLAGS = -avoid-version -no-undefined
-+critterding_LDFLAGS = -avoid-version -no-undefined -lftgl
---- critterding-1.0-beta11+dfsg.orig/src/utils/Makefile.am
-+++ critterding-1.0-beta11+dfsg/src/utils/Makefile.am
-@@ -5,8 +5,8 @@ noinst_HEADERS = dir.h file.h p
-
- libutils_la_SOURCES = dir.cpp file.cpp parser.cpp randgen.cpp timer.cpp fps.cpp sleeper.cpp settings.cpp displaylists.cpp events.cpp raycast.cpp mousepicker.cpp statsbuffer.cpp commands.cpp execcmd.cpp logbuffer.cpp
-
--libutils_la_LIBADD = $(top_builddir)/src/utils/ftgl/libftgl.la $(top_builddir)/src/utils/bullet/libbulletmath.la $(top_builddir)/src/utils/bullet/libbulletcollision.la \
-+libutils_la_LIBADD = $(FTGL) $(top_builddir)/src/utils/bullet/libbulletmath.la $(top_builddir)/src/utils/bullet/libbulletcollision.la \
- $(top_builddir)/src/utils/bullet/libbulletdynamics.la
- libutils_la_LDFLAGS = -avoid-version -no-undefined
-
--SUBDIRS = ftgl bullet
-+SUBDIRS = bullet
---- critterding-1.0-beta11+dfsg.orig/src/gui/textprinter.h
-+++ critterding-1.0-beta11+dfsg/src/gui/textprinter.h
-@@ -9,7 +9,7 @@
- #include "../math/vector2i.h"
-
- #define FTGL_TEXTURE 5
--#include "../utils/ftgl/FTGL/ftgl.h"
-+#include "/usr/include/FTGL/ftgl.h"
-
- using namespace std;
-
diff --git a/debian/patches/01nonfreefonts b/debian/patches/01nonfreefonts
deleted file mode 100644
index 3accfef..0000000
--- a/debian/patches/01nonfreefonts
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: To replace non-free verdana fonts with LiberationSans Regular
-Author: Gabriele Giacone <1o5g4r8o at gmail.com>
-
---- critterding-1.0beta11+dfsg.orig/src/gui/textprinter.cpp
-+++ critterding-1.0beta11+dfsg/src/gui/textprinter.cpp
-@@ -153,7 +153,7 @@ void Textprinter::setUpFonts()
-
- char const *fontFilePath;
- //fontFilePath = "fonts/helvetica_3.ttf";
-- fontFilePath = "fonts/verdana.ttf";
-+ fontFilePath = "/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf";
-
- // Allocate an array to hold all fonts
- fonts = new FTFont *[1];
diff --git a/debian/patches/series b/debian/patches/series
index 5692a68..ef20dbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-00libftgl
-01nonfreefonts
+00fontandiconpath
diff --git a/debian/rules b/debian/rules
index 4c2df11..889dd7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,8 @@ override_dh_auto_install:
override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) distclean
find . -name Makefile.in -delete
- -rm aclocal.m4 config.* configure depcomp install-sh ltmain.sh missing
+ rm -f aclocal.m4 config.* configure depcomp install-sh ltmain.sh missing
+ rm -rf m4 src/utils/ftgl/.deps src/utils/ftgl/Makefile
rm -rf $(CURDIR)/debian/icons
get-orig-source:
--
Evolving Artificial Life
More information about the debian-science-commits
mailing list