Updated some doc files. Updated debian packaging files.

5 files changed, 69 insertions, 31 deletions

diff --git a/packaging/debian/changelog.in b/packaging/debian/changelog.in
index 4059803b9..b107dd24e 100644
--- a/packaging/debian/changelog.in
+++ b/packaging/debian/changelog.in
@@ -1,3 +1,48 @@
+mana-4144 (1.1.git-1.1.3.6-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * fix: remove extra spaces from chat commands.
+  * fix: possible fix for pasting from clipboard in X system.
+  * fix: partially opacity in extended minimaps.
+  * add: add to trade items in item context menu.
+  * add: tabs to spells window.
+  * add: check already downloaded files intergrity.
+  * add: pink theme (Freya).
+  * add: updated pt_BR translation some lines from mana client (Freya).
+  * add: updated russian translation.
+  * add: update dejavu fonts.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 05 Mar 2011 22:16:57 +0200
+
+mana-4144 (1.1.git-1.1.2.20-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * fix: stop/start playung music after changing option.
+  * add: show/hide buttons in top right corner.
+  * right click on buttons open menu.
+  * add: show/hide bars in top right corner.
+  * right click on bars open menu.
+  * add: extended minimaps (Ben Longbons).
+  * add: npc gender. (only for extended servers)
+  * add: hiding equipment sprites by attributes (need support in client data).
+  * add: weight notice dialogs not modal and auto hiding after 10 seconds.
+  * add: show amount in pickup particles.
+  * add: new bars Weight bar, Inventory slots bar, Money bar, Arrows bar.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 20 Feb 2011 05:40:33 +0200
+
+mana-4144 (1.1.git-1.1.2.6-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * fix: crashes.
+  * fix: close npc dialogs in different actions like change character/server or network error.
+  * fix: dont show random navigation point with coord 0,0.
+  * fix: update item amount in sell dialog.
+  * add: japanese fonts mplus 1p regular and mplus 1p bold.
+  * add: option to enable/disable players popups.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 05 Feb 2011 21:58:18 +0200
+
 mana-4144 (1.1.git-1.1.1.30-1%DIST%) unstable; urgency=low
 
   * New upstream release.
diff --git a/packaging/debian/control b/packaging/debian/control
index 543930589..899c7d2d0 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,7 +1,7 @@
 Source: mana-4144
 Section: games
 Priority: optional
-Homepage: http://manasource.org/
+Homepage: http://tmw.cetki.com/4144/
 Maintainer: Andrei Karas <akaras@inbox.ru>
 Build-Depends: debhelper (>= 7), libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan-dev (>= 0.8.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev, libsdl-ttf2.0-dev, libsdl-gfx1.2-dev
 Standards-Version: 3.8.3
@@ -11,26 +11,20 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mana-4144-data (= ${source:Version}), tmwcetki-archive-keyring (>= 2010.10.17)
 Recommends: mana-music
 Suggests: mumble
-Description: The Mana World is a 2D MMORPG
- The Mana World (rebranded to Mana) is a serious effort to create an
- innovative free and open source MMORPG. The Mana World uses 2D graphics and
- aims to create a large and diverse interactive world.
- The player's story is built with quests, interaction and fighting against
- monsters and in PvP mode against other players, too. Or you join other partys,
- clans or groups and will contribute them.
+Description: ManaPlus is extended client for The Mana World and similar servers
+ ManaPlus is a 2D MMORPG games advanced client for games based on eAthena fork
+ The Mana World (tAthena) also for other forks like Evol.
+ More info here: http://manaplus.evolonline.org/
 
 Package: mana-4144-dbg
 Section: debug
 Architecture: any
 Priority: extra
 Depends: ${misc:Depends}, mana-4144 (= ${binary:Version})
-Description: The Mana World is a 2D MMORPG (debugging symbols)
- The Mana World (rebranded to Mana) is a serious effort to create an
- innovative free and open source MMORPG. The Mana World uses 2D graphics and
- aims to create a large and diverse interactive world.
- The player's story is built with quests, interaction and fighting against
- monsters and in PvP mode against other players, too. Or you join other partys,
- clans or groups and will contribute them.
+Description: ManaPlus is extended client for TMW and similar servers (debugging symbols)
+ ManaPlus is a 2D MMORPG games advanced client for games based on eAthena fork
+ The Mana World (tAthena) also for other forks like Evol.
+ More info here: http://manaplus.evolonline.org/
  .
  This package provides debugging symbols for the mana-4144 package.
 
@@ -38,12 +32,9 @@ Package: mana-4144-data
 Architecture: all
 Depends: ${misc:Depends}, ttf-dejavu-core, ttf-liberation
 Recommends: mana-4144, ttf-mplus
-Description: The Mana World is a 2D MMORPG (data files)
- The Mana World (rebranded to Mana) is a serious effort to create an
- innovative free and open source MMORPG. The Mana World uses 2D graphics and
- aims to create a large and diverse interactive world.
- The player's story is built with quests, interaction and fighting against
- monsters and in PvP mode against other players, too. Or you join other partys,
- clans or groups and will contribute them.
+Description: ManaPlus is extended client for TMW and similar servers (data files)
+ ManaPlus is a 2D MMORPG games advanced client for games based on eAthena fork
+ The Mana World (tAthena) also for other forks like Evol.
+ More info here: http://manaplus.evolonline.org/
  .
  This package contains the data files.
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index f7ec33f80..dd36bb305 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -3,9 +3,7 @@ Wed,  6 Feb 2007 09:16:23 +0100.
 
 Added paches and repacked by Andrei Karas <akaras@inbox.ru>
 
-It was downloaded from <http://www.themanaworld.org/>.
-
-Upstream Author: Eugenio Favalli <elvenprogrammer@gmail.com>
+Upstream Author: Andrei Karas <akaras@inbox.ru>
 
 License (src/utils/base64.h, src/utils/base64.cpp):
 
@@ -32,6 +30,8 @@ can be found in /usr/share/common-licenses/GPL-2 file.
 License (everything else):
 
 	Copyright (C) 2004-2007 The The Mana World Development Team
+	Copyright (C) 2010  The Mana Developers
+	Copyright (C) 2011  The ManaPlus Developers
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -47,8 +47,12 @@ License (everything else):
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+License (src/mumblemanager.h, src/mumblemanager.cpp):
+
+	In public domain
+
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-2 file.
 
-The Debian packaging is © 2009, Patrick Matthäi <pmatthaei@debian.org> and
+The Debian packaging is © 2011, Andrei Karas <akaras@inbox.ru> and
 is licensed under the GPL, see above.
diff --git a/packaging/debian/mana-4144.docs b/packaging/debian/mana-4144.docs
index 08d044dc9..594403310 100644
--- a/packaging/debian/mana-4144.docs
+++ b/packaging/debian/mana-4144.docs
@@ -1,4 +1,3 @@
 AUTHORS
 README
-docs/progression.txt
 docs/FAQ.txt
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 1ede8e2c4..549c2eb9e 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -13,8 +13,7 @@ config.status:
 	CFLAGS="$(CFLAGS) -Wall" ./configure --host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
 	--datadir=/usr/share/games --bindir=/usr/games --mandir=/usr/share/man \
-	--with-server=eathena
-# --without-opengl
+	--enable-manaserv=yes
 
 build: build-stamp
 build-stamp: config.status
@@ -41,7 +40,7 @@ install: build
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-	dh_installchangelogs -i NEWS
+	dh_installchangelogs -i ChangeLog
 	dh_installdocs -i
 	dh_install -i
 	dh_link -i
@@ -55,7 +54,7 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_installchangelogs -a NEWS
+	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a
 	dh_install -a
 	dh_installmenu -a