summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <bertram@cegetel.net>2006-08-20 01:37:15 +0000
committerYohann Ferreira <bertram@cegetel.net>2006-08-20 01:37:15 +0000
commit2b4d8d1323883ab814997f8cd4e984e53919b68e (patch)
treeca9fe6a7c5aae8a688637243fae5b2c7cc72c63f
parent60347d097f29528f9bc0793ca5fd118201a8e583 (diff)
downloadmana-2b4d8d1323883ab814997f8cd4e984e53919b68e.tar.gz
mana-2b4d8d1323883ab814997f8cd4e984e53919b68e.tar.bz2
mana-2b4d8d1323883ab814997f8cd4e984e53919b68e.tar.xz
mana-2b4d8d1323883ab814997f8cd4e984e53919b68e.zip
some fixes to automake building, and debian packagaing updates. Happy to be back :)
-rw-r--r--ChangeLog8
-rw-r--r--debian/control2
-rw-r--r--debian/tmw-data.install1
-rw-r--r--src/Makefile.am1
4 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb988e1b..1919da83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-20 Yohann Ferreira <bertram@cegetel.net>
+ * data/graphics/sprites/Makefile.am : Following the splitting from
+ Philipp, moved out the items.png file from the Makefile.am.
+ * debian/control, debian/tmw-data.install : Updated debian package
+ creation process.
+ * src/Makefile.am : Added iteminfo.cpp to avoid an undefined reference
+ with gcc 4.1.2. Happy to be back :)
+
2006-08-17 Philipp Sehmisch <tmw@crushnet.org>
* data/graphics/items/*: Splitted the items.png into separate images
with more distinctive names. (no, i won't list all 114)
diff --git a/debian/control b/debian/control
index ad079b7d..45a906b6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
Source: tmw
Priority: optional
Maintainer: FERREIRA Yohann <bertram@cegetel.net>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, docbook-to-man, libsdl1.2-dev (>= 1.2.7), libsdl-image1.2-dev (>= 1.2.3), libsdl-mixer1.2-dev (>= 1.2.5), libguichan0-dev (>= 0.4.0-4), libcurl3-gnutls-dev (>= 7.15.0-1), libxml2-dev (>= 2.4.19), libphysfs-dev (>= 1.0.0-1), libgl1-mesa-dev (>= 6.4.1), libpng12-dev (>= 1.2.5), libsdl-net1.2-dev (>= 1.2.5)
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, docbook-to-man, libsdl1.2-dev (>= 1.2.7), libsdl-image1.2-dev (>= 1.2.3), libsdl-mixer1.2-dev (>= 1.2.5), libguichan0-dev (>= 0.5.0-1), libcurl3-gnutls-dev (>= 7.15.0-1), libxml2-dev (>= 2.4.19), libphysfs-dev (>= 1.0.0-1), libgl1-mesa-dev (>= 6.4.1), libpng12-dev (>= 1.2.5), libsdl-net1.2-dev (>= 1.2.5)
Standards-Version: 3.6.2
Package: tmw
diff --git a/debian/tmw-data.install b/debian/tmw-data.install
index 5e2e537e..71b34a98 100644
--- a/debian/tmw-data.install
+++ b/debian/tmw-data.install
@@ -2,6 +2,7 @@ data/items.xml usr/share/games/tmw/data
data/help/*.txt usr/share/games/tmw/data/help
data/graphics/gui/*.png usr/share/games/tmw/data/graphics/gui
data/graphics/sprites/*.png usr/share/games/tmw/data/graphics/sprites
+data/graphics/sprites/*.xml usr/share/games/tmw/data/graphics/sprites
data/graphics/images/*.png usr/share/games/tmw/data/graphics/images
data/graphics/tiles/*.png usr/share/games/tmw/data/graphics/tiles
data/maps/*.tmx.gz usr/share/games/tmw/data/maps
diff --git a/src/Makefile.am b/src/Makefile.am
index acdbff49..fb67496f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -161,6 +161,7 @@ tmw_SOURCES = graphic/imagerect.h \
resources/imagewriter.cpp \
resources/imagewriter.h \
resources/iteminfo.h \
+ resources/iteminfo.cpp \
resources/itemmanager.cpp \
resources/itemmanager.h \
resources/mapreader.cpp \