summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--debian/changelog7
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules1
-rw-r--r--debian/tmw.install5
-rw-r--r--src/gui/char_select.cpp2
6 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 58e9a825..eb972ffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-26 Yohann Ferreira <bertram@cegetel.net>
+
+ * src/gui/char_select.cpp, debian/control, debian/rules,
+ debian/tmw.install, debian/changelog: Updated Debian files and fixed a
+ let by Elven.
+
2005-09-26 Eugenio Favalli <elvenprogrammer@gmail.com>
* The Mana World.dev, src/Makefile.am, src/game.cpp,
diff --git a/debian/changelog b/debian/changelog
index 97a0bb0d..00bf6bc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tmw (0.0.16-2) unstable; urgency=low
+
+ * Close the missing icon bug.
+ * Made it compilable in amd64.
+
+ -- FERREIRA Yohann <bertram@cegetel.net> Mon, 26 Sep 2005 00:22:33 +0200
+
tmw (0.0.16-1) unstable; urgency=low
* Eighth Release
diff --git a/debian/control b/debian/control
index a9f552dd..8f0707e3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: tmw
Section: games
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), libguichan-dev (>= 0.4.0-2), libcurl3-dev (>= 7.14.0-2), libxml2-dev (>= 2.4.19), libphysfs-dev (>= 1.0.0-1), xlibmesa-gl-dev (>= 6.8.2.dfsg.1-4), libpng3-dev (>= 1.2.8), 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), libguichan-dev (>= 0.4.0-2), libcurl3-dev (>= 7.14.0-2), libxml2-dev (>= 2.4.19), libphysfs-dev (>= 1.0.0-1), xlibmesa-gl-dev (>= 6.8.2.dfsg.1-4), libpng12-dev (>= 1.2.5), libsdl-net1.2-dev (>= 1.2.5)
Standards-Version: 3.6.1
Package: tmw
-Architecture: i386
-Depends: libsdl1.2debian (>= 1.2.7), libsdl-image1.2 (>= 1.2.3), libsdl-mixer1.2 (>= 1.2.5), libguichan (>= 0.4.0-2), libxml2 (>= 2.4.19), libphysfs-1.0-0 (>= 1.0.0-1), libcurl3 (>= 7.14.0-2), tmw-data (>= 0.0.16), libpng3 (>= 1.2.8), libsdl-net1.2 (>= 1.2.5)
+Architecture: i386 amd64
+Depends: libsdl1.2debian (>= 1.2.7), libsdl-image1.2 (>= 1.2.3), libsdl-mixer1.2 (>= 1.2.5), libguichan (>= 0.4.0-2), libxml2 (>= 2.4.19), libphysfs-1.0-0 (>= 1.0.0-1), libcurl3 (>= 7.14.0-2), tmw-data (>= 0.0.16), libpng12-0 (>= 1.2.8), libsdl-net1.2 (>= 1.2.5)
Suggests: tmw-music
Maintainer: Ferreira Yohann <bertram@cegetel.net>
Description: The Mana World is a Great Online Game
diff --git a/debian/rules b/debian/rules
index c5525209..887ad088 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,6 @@ binary-indep: build install
cp data/icons/tmw-icon.xpm debian/tmp/usr/share/pixmaps/tmw.xpm
cp data/icons/tmw-icon.png debian/tmp/usr/share/pixmaps/tmw.png
-
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
diff --git a/debian/tmw.install b/debian/tmw.install
index b6a8b633..5f54a8e3 100644
--- a/debian/tmw.install
+++ b/debian/tmw.install
@@ -1,2 +1,3 @@
-src/tmw usr/games
-tmw.desktop usr/share/applications
+src/tmw usr/games
+tmw.desktop usr/share/applications
+data/icons/tmw-icon.png usr/share/games/tmw/data/icons
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index f6fa3a1a..84e0e13a 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -258,7 +258,7 @@ void CharSelectDialog::serverCharSelect()
errorMessage = "Cannot use this ID";
break;
default:
- errorMessage = "Unknown failure to select character");
+ errorMessage = "Unknown failure to select character";
break;
}
skip(msg.getLength());