Add debian packaging files from manaplus and delete outdated mana files.

20 files changed, 570 insertions, 284 deletions

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
deleted file mode 100644
index bc5b75799..000000000
--- a/packaging/debian/changelog
+++ /dev/null
@@ -1,77 +0,0 @@
-tmw (0.0.24-1) unstable; urgency=low
-
-  * New upstream release.
-  * Wrapped configure script options line to a more human readable
-    format.
-  * Bumped Standards-Version to 3.7.3.
-  * Changed description in debian/tmw.menu, it is now called as an
-    adventure instead of an arcade game.
-  * Removed the ugly hyphen in the description of debian/tmw.desktop.
-  * Removed debian/tmw.6 manpage, because it is in upstream now.
-  * Removed 01-set-gl-texture-zero and 02-guichan_0.7 patches,
-    because they are fixed in the current upstream release.
-  * Removed now useless calls of dh_link and dh_installman in
-    debian/rules.
-  * Removed debian/tmw-data.docs, because the NEWS and AUTHORS file
-    is already in the tmw package.
-  * Removed deprecated encoding flag from debian/tmw.desktop.
-  * Added debian/watch file.
-  * Added homepage field to debian/control and removed the one from
-    the long descriptions.
-  * Added a break to the long description of tmw-data. It looks now
-    realy better.
-  * Added the tmw-dbg package, which provides the debugging symbols.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Mon, 24 Dec 2007 17:10:00 +0100
-
-tmw (0.0.23-3) unstable; urgency=low
-
-  * Added missing files data/graphics/images/ambient/*.png to
-    release.
-    Closes: #439861
-  * Added guichan_0.7 patch to build tmw against guichan 0.7.1.
-  * debian/control: Changed guichan version to libguichan2 and
-    changed build dependencie from libcurl3-dev to libcurl4-gnutls-dev.
-  * debian/tmw.menu: Corrected menu entry categorie to Games/Adventure.
-    Thanks lintian.
-  * Fixed clean rule. Thanks lintian.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Thu,  6 Sep 2007 18:36:00 +0100
-
-tmw (0.0.23-2) unstable; urgency=low
-
-  * Added set-gl-texture-zero patch to set GL texture index
-    to zero when an image uses the SDL backend.
-    Closes: #427915
-  * debian/control: Removed dependencie of tmw-data to tmw.
-    Closes: #427920
-  * debian/control: Set tmw as recommends to tmw-data.
-  * debian/control: Added dpatch to the build dependencies.
-  * debian/control: Changed guichan version to libguichan1.
-    Closes: #435065
-  * debian/tmw.docs: Added upstream ChangeLog to package.
-  * debian/rules: Removed now unneeded '--with-opengl'
-    configure flag.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Wed,  20 Jun 2007 08:55:12 +0100
-
-tmw (0.0.23-1) unstable; urgency=low
-
-  * Uploaded tmw to unstable.
-    Closes: #418725, #423275
-  * New upstream release.
-  * debian/rules: No longer needed the tmw-icon rename
-    hack. Upstream renamed the icon files.
-  * debian/tmw.xpm: Added xpm icon file, because upstream
-    has forgotten it in the newest release.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Mon,  5 Jun 2007 21:05:36 +0100
-
-tmw (0.0.22.2-1) experimental; urgency=low
-
-  * Initial release.
-  * Uploading to experimental because we need libguichan0-dev (>= 0.6.1).
-  * src/main.cpp:
-     Moved tmw-icon.png to /usr/share/icons/tmw.png.
-
- -- Patrick Matthäi <patrick.matthaei@web.de>  Tue,  6 Mar 2007 09:08:21 +0100
diff --git a/packaging/debian/changelog.in b/packaging/debian/changelog.in
new file mode 100644
index 000000000..4059803b9
--- /dev/null
+++ b/packaging/debian/changelog.in
@@ -0,0 +1,478 @@
+mana-4144 (1.1.git-1.1.1.30-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 30 Jan 2011 00:24:28 +0200
+
+mana-4144 (1.1.git-1.1.1.16-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Fri, 14 Jan 2011 17:33:11 +0200
+
+mana-4144 (1.1.git-1.1.1.9-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 09 Jan 2011 02:55:55 +0200
+
+mana-4144 (1.0.git-1.0.12.26-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Fri, 24 Dec 2010 18:55:07 +0200
+
+mana-4144 (1.0.git-1.0.12.12-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 11 Dec 2010 15:59:38 +0200
+
+mana-4144 (1.0.git-1.0.11.28-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 28 Nov 2010 05:45:05 +0200
+
+mana-4144 (1.0.git-1.0.11.13-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 13 Nov 2010 16:31:17 +0200
+
+mana-4144 (1.0.git-1.0.10.31-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 31 Oct 2010 02:23:42 +0300
+
+mana-4144 (1.0.git-1.0.10.19-1%DIST%) unstable; urgency=high
+
+  * New upstream release.
+  * Critical fix.
+
+ -- Andrei Karas <akaras@inbox.ru>  Tue, 19 Oct 2010 02:46:21 +0300
+
+mana-4144 (1.0.git-1.0.10.17-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * Add deps ont tmwcetki-keyring package.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 16 Oct 2010 15:56:18 +0300
+
+mana-4144 (1.0.git-1.0.10.5-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Tue, 05 Oct 2010 20:11:29 +0300
+
+mana-4144 (1.0.git-1.0.10.4-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 03 Oct 2010 22:23:21 +0300
+
+mana-4144 (1.0.git-1.0.10.3-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 02 Oct 2010 17:13:36 +0300
+
+mana-4144 (1.0.git-1.0.9.19-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 19 Sep 2010 00:07:42 +0300
+
+mana-4144 (1.0.git-1.0.9.12-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 11 Sep 2010 18:47:19 +0300
+
+mana-4144 (1.0.git-1.0.9.4-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 04 Sep 2010 15:07:23 +0300
+
+mana-4144 (1.0.git-1.0.8.29-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 29 Aug 2010 04:00:39 +0300
+
+mana-4144 (1.0.git-1.0.8.15-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 15 Aug 2010 02:03:07 +0300
+
+mana-4144 (1.0.git-1.0.8.3-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Mon, 02 Aug 2010 23:39:20 +0300
+
+mana-4144 (1.0.git-1.0.8.1-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 01 Aug 2010 00:33:28 +0300
+
+mana-4144 (1.0.git-1.0.7.18-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 17 Jul 2010 15:09:43 +0300
+
+mana-4144 (1.0.git-1.0.7.5-2%DIST%) unstable; urgency=low
+
+  * Replace Recommended mumble to Suggested mumble.
+
+ -- Andrei Karas <akaras@inbox.ru>  Mon, 05 Jul 2010 19:50:39 +0300
+
+mana-4144 (1.0.git-1.0.7.4-2%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 04 Jul 2010 20:03:05 +0300
+
+mana-4144 (1.0.git-1.0.7.4-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 04 Jul 2010 15:45:50 +0300
+
+mana-4144 (1.0.git-1.0.6.21-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Mon, 21 Jun 2010 04:04:49 +0300
+
+mana-4144 (1.0.git-1.0.6.20-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 19 Jun 2010 13:52:18 +0300
+
+mana-4144 (1.0.git-1.0.5.30-2%DIST%) unstable; urgency=low
+
+  * Check version fix.
+
+ -- Andrei Karas <akaras@inbox.ru>  Mon, 31 May 2010 17:33:15 +0300
+
+mana-4144 (1.0.git-1.0.5.30-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 30 May 2010 18:37:35 +0300
+
+mana-4144 (1.0.git-1.0.5.23-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 23 May 2010 14:09:32 +0300
+
+mana-4144 (1.0.git-1.0.5.1-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 01 May 2010 15:07:38 +0300
+
+mana-4144 (1.0.git-1.0.4.25-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * Most path renamed from mana to manaplus.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 25 Apr 2010 17:37:00 +0300
+
+mana-4144 (1.0.git-1.0.4.14-1%DIST%) unstable; urgency=high
+
+  * New upstream release.
+  * Trying avoid server bugs.
+
+ -- Andrei Karas <akaras@inbox.ru>  Tue, 13 Apr 2010 23:33:01 +0300
+
+mana-4144 (1.0.git-1.0.3.21-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 21 Mar 2010 16:34:00 +0200
+
+mana-4144 (1.0.git-1.0.3.8-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Mon, 08 Mar 2010 02:49:27 +0200
+
+mana-4144 (1.0.git-1.0.2.28-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 28 Feb 2010 16:11:12 +0200
+
+mana-4144 (1.0.git-1.0.2.23-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Tue, 23 Feb 2010 23:42:50 +0200
+
+mana-4144 (1.0.git-1.0.2.7-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 06 Feb 2010 05:02:52 +0200
+
+mana-4144 (1.0.git-1.0.1.17-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 17 Jan 2010 18:45:26 +0200
+
+mana-4144 (1.0.git-0.12-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 02 Jan 2010 16:28:34 +0200
+
+mana-4144 (1.0.git-0.11-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sun, 13 Dec 2009 14:15:29 +0200
+
+mana-4144 (1.0.git-0.10-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * Fixing localisation problems.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 28 Nov 2009 19:11:39 +0200
+
+mana-4144 (1.0.git-0.9-1) unstable; urgency=low
+
+  * tmw rebrended to mana.
+  * Include 4144's patches.
+
+ -- Andrei Karas <akaras@inbox.ru>  Tue, 10 Nov 2009 16:36:01 +0200
+
+tmw (0.0.29.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Drop debian/tmw.xpm and use the one from upstream.
+  * Merge 0.0.29-1~bpo50+1 changelog.
+  * Remove NEWS from tmw.docs and add it as upstream changelog. This also fixes
+    a lintian warning.
+
+ -- Patrick Matthäi <pmatthaei@debian.org>  Wed, 10 Jun 2009 13:42:43 +0200
+
+tmw (0.0.29-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+
+ -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 25 May 2009 18:44:32 +0200
+
+tmw (0.0.29-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix typo in get-orig-source target.
+  * Refer in debian/copyright to the GPL-2 file instead of GPL.
+  * Add my own copyright for the Debian packaging.
+  * Merge 0.0.28.1-1~bpo50+1 changelog.
+  * Install tmw.desktop from the upstream source.
+  * Update to compat 7.
+  * Use the tmw.menu file from upstream.
+  * Remove deprecated dh_desktop call.
+  * Rewrote parts of the debian/rules to use $(MAKE) install instead of
+    grepping again and again with new releases new files and directories.
+
+ -- Patrick Matthäi <pmatthaei@debian.org>  Thu, 14 May 2009 11:35:10 +0200
+
+tmw (0.0.28.1-3) unstable; urgency=low
+
+  * Bump Standards-Version to 3.8.1 (no changes needed).
+  * Change section of tmw-dbg to debug.
+  * Change my email address.
+  * Remove DM-Upload-Allowed control field.
+  * Rebuild against physfs 2.0.0.
+
+ -- Patrick Matthäi <pmatthaei@debian.org>  Mon, 20 Apr 2009 19:40:36 +0200
+
+tmw (0.0.28.1-2) unstable; urgency=low
+
+  * Rebuild against physfs 1.0.1.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Wed,  4 Mar 2009 13:59:28 +0200
+
+tmw (0.0.28.1-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Tue, 17 Feb 2009 18:25:37 +0200
+
+tmw (0.0.28.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Symlink to the dejavu fonts and depend on it instead of using the
+      embedded one.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Thu, 12 Feb 2009 20:03:15 +0200
+
+tmw (0.0.28-1) unstable; urgency=low
+
+  * New upstream release.
+    - Add new build dependency libsdl-ttf2.0-dev.
+    - Add new usr/share/games/tmw/data/fonts files.
+  * Add get-orig-source target.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon, 26 Jan 2009 12:48:33 +0200
+
+tmw (0.0.27-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixes GCC 4.4 FTBFS.
+      Closes: #504967
+    - The upstream ChangeLog is not used anymore. Removing it from the docs.
+  * Add missing ${misc:Depends}. Thanks lintian.
+  * Corrected date of the last upload.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Sun,  7 Dec 2008 19:21:11 +0200
+
+tmw (0.0.26-2) unstable; urgency=low
+
+  * Uploading to unstable.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon,  1 Sep 2008 09:53:10 +0200
+
+tmw (0.0.26-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Fri, 29 Aug 2008 22:11:40 +0200
+
+tmw (0.0.25-1) experimental; urgency=low
+
+  * New upstream release.
+    Uploading to experimental, Lenny is frozen.
+  * Removed useless debhelper call.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Thu, 31 Jul 2008 19:28:00 +0200
+
+tmw (0.0.24.1+svn4436-1) unstable; urgency=low
+
+  * New svn snapshot.
+  * Fixed spelling error in last changelog entry.
+  * Updated build depends.
+  * Updated Standards-Version to 3.8.0 (no changes needed).
+  * Fixed categorie in tmw.desktop.
+  * Added DM-Upload-Allowed control field.
+  * Removed recommend from tmw-data on tmw-music, tmw does it also.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Sun, 20 Jul 2008 11:59:44 +0100
+
+tmw (0.0.24.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - Drop 01-fix-gcc4.3-ftbfs.dpatch, merged in upstream.
+    - Adjusted tmw-data.install file. Some directorys in data/graphics has been
+      removed.
+  * Removed dpatch.
+  * Install the manpage with dh_installman.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon,  7 Apr 2008 18:19:44 +0100
+
+tmw (0.0.24-3) unstable; urgency=low
+
+  * Included again dpatch for the 01-fix-gcc4.3-ftbfs.dpatch.
+    Closes: #462420
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Thu, 20 Mar 2008 20:42:00 +0100
+
+tmw (0.0.24-2) unstable; urgency=low
+
+  * Cleaned debian/tmw.desktop file. It should now appear in the
+    KDE and Gnome menus.
+    Closes: #458242
+  * Rewritten long and short descriptions of the packages.
+  * Removed dpatch, because it is not needed in the last two builds.
+  * Removed not needed build depends on autotools-dev and dpkg-dev.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Wed,  2 Jan 2008 10:00:00 +0100
+
+tmw (0.0.24-1) unstable; urgency=low
+
+  * New upstream release.
+    - Removed debian/tmw.6 manpage, because it is in upstream now.
+    - Removed 01-set-gl-texture-zero and 02-guichan_0.7 patches,
+      because they are fixed in the current upstream release.
+  * Wrapped configure script options line to a more human readable
+    format.
+  * Bumped Standards-Version to 3.7.3.
+  * Changed description in debian/tmw.menu, it is now called as an
+    adventure instead of an arcade game.
+  * Removed the ugly hyphen in the description of debian/tmw.desktop.
+  * Removed now useless calls of dh_link and dh_installman in
+    debian/rules.
+  * Removed debian/tmw-data.docs, because the NEWS and AUTHORS file
+    is already in the tmw package.
+  * Removed deprecated encoding flag from debian/tmw.desktop.
+  * Added debian/watch file.
+  * Added homepage field to debian/control and removed the one from
+    the long descriptions.
+  * Added a break to the long description of tmw-data. It looks now
+    really better.
+  * Added the tmw-dbg package, which provides the debugging symbols.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon, 24 Dec 2007 17:10:00 +0100
+
+tmw (0.0.23-3) unstable; urgency=low
+
+  * Added missing files data/graphics/images/ambient/*.png to
+    release.
+    Closes: #439861
+  * Added guichan_0.7 patch to build tmw against guichan 0.7.1.
+  * debian/control: Changed guichan version to libguichan2 and
+    changed build dependencie from libcurl3-dev to libcurl4-gnutls-dev.
+  * debian/tmw.menu: Corrected menu entry categorie to Games/Adventure.
+    Thanks lintian.
+  * Fixed clean rule. Thanks lintian.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Thu,  6 Sep 2007 18:36:00 +0100
+
+tmw (0.0.23-2) unstable; urgency=low
+
+  * Added set-gl-texture-zero patch to set GL texture index
+    to zero when an image uses the SDL backend.
+    Closes: #427915
+  * debian/control: Removed dependencie of tmw-data to tmw.
+    Closes: #427920
+  * debian/control: Set tmw as recommends to tmw-data.
+  * debian/control: Added dpatch to the build dependencies.
+  * debian/control: Changed guichan version to libguichan1.
+    Closes: #435065
+  * debian/tmw.docs: Added upstream ChangeLog to package.
+  * debian/rules: Removed now unneeded '--with-opengl'
+    configure flag.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Wed,  20 Jun 2007 08:55:12 +0100
+
+tmw (0.0.23-1) unstable; urgency=low
+
+  * Uploaded tmw to unstable.
+    Closes: #418725, #423275
+  * New upstream release.
+  * debian/rules: No longer needed the tmw-icon rename
+    hack. Upstream renamed the icon files.
+  * debian/tmw.xpm: Added xpm icon file, because upstream
+    has forgotten it in the newest release.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Mon,  5 Jun 2007 21:05:36 +0100
+
+tmw (0.0.22.2-1) experimental; urgency=low
+
+  * Initial release.
+  * Uploading to experimental because we need libguichan0-dev (>= 0.6.1).
+  * src/main.cpp:
+     Moved tmw-icon.png to /usr/share/icons/tmw.png.
+
+ -- Patrick Matthäi <patrick.matthaei@web.de>  Tue,  6 Mar 2007 09:08:21 +0100
diff --git a/packaging/debian/compat b/packaging/debian/compat
index 7ed6ff82d..7f8f011eb 100644
--- a/packaging/debian/compat
+++ b/packaging/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/packaging/debian/control b/packaging/debian/control
index a5696ca5d..543930589 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,27 +1,49 @@
-Source: mana
+Source: mana-4144
 Section: games
 Priority: optional
 Homepage: http://manasource.org/
-Maintainer: Patrick Matthäi <patrick.matthaei@web.de>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libcurl4-gnutls-dev, libgl1-mesa-dev, libguichan2-dev (>= 0.7.1), libsdl1.2-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, libsdl-mixer1.2-dev, libphysfs-dev, libpng12-dev, libxml2-dev, zlib1g-dev
-Standards-Version: 3.7.3
+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
 
-Package: mana
+Package: mana-4144
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mana-data (= ${source:Version})
-Description: Mana is a 2D MMORPG client
+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.
 
-Package: mana-dbg
+Package: mana-4144-dbg
+Section: debug
 Architecture: any
 Priority: extra
-Depends: mana (= ${binary:Version})
-Description: Mana is a 2D MMORPG client (debugging symbols)
+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.
  .
- This package provides debugging symbols for the mana package.
+ This package provides debugging symbols for the mana-4144 package.
 
-Package: mana-data
+Package: mana-4144-data
 Architecture: all
-Recommends: mana
-Description: Mana is a 2D MMORPG client
+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.
  .
  This package contains the data files.
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index a6a2b687a..f7ec33f80 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -1,6 +1,8 @@
 This package was debianized by Patrick Matthäi <patrick.matthaei@web.de> on
 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>
@@ -25,7 +27,7 @@ License (src/utils/base64.h, src/utils/base64.cpp):
 	GNU General Public License for more details.
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 License (everything else):
 
@@ -46,4 +48,7 @@ License (everything else):
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
+
+The Debian packaging is © 2009, Patrick Matthäi <pmatthaei@debian.org> and
+is licensed under the GPL, see above.
diff --git a/packaging/debian/files b/packaging/debian/files
new file mode 100644
index 000000000..816aadf47
--- /dev/null
+++ b/packaging/debian/files
@@ -0,0 +1,3 @@
+mana-4144-data_1.0.git-1.0.1.17-1_all.deb games optional
+mana-4144_1.0.git-1.0.1.17-1_amd64.deb games optional
+mana-4144-dbg_1.0.git-1.0.1.17-1_amd64.deb debug extra
diff --git a/packaging/debian/mana-4144-data.install b/packaging/debian/mana-4144-data.install
new file mode 100644
index 000000000..32b040f58
--- /dev/null
+++ b/packaging/debian/mana-4144-data.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/share/locale usr/share/
+debian/tmp/usr/share/games/manaplus/data/graphics usr/share/games/manaplus/data/
+debian/tmp/usr/share/games/manaplus/data/help usr/share/games/manaplus/data/
+debian/tmp/usr/share/games/manaplus/data/icons usr/share/games/manaplus/data/
+debian/tmp/usr/share/games/manaplus/data/themes usr/share/games/manaplus/data/
+debian/tmp/usr/share/games/manaplus/data/sfx usr/share/games/manaplus/data/
+debian/tmp/usr/share/games/manaplus/data/sfx/system usr/share/games/manaplus/data/sfx/
diff --git a/packaging/debian/mana-4144-data.links b/packaging/debian/mana-4144-data.links
new file mode 100644
index 000000000..53c8b7458
--- /dev/null
+++ b/packaging/debian/mana-4144-data.links
@@ -0,0 +1,8 @@
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/games/manaplus/data/fonts/dejavusans.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf usr/share/games/manaplus/data/fonts/dejavusans-bold.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf usr/share/games/manaplus/data/fonts/dejavusansmono.ttf
+usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf usr/share/games/manaplus/data/fonts/dejavusansmono-bold.ttf
+usr/share/fonts/truetype/ttf-liberation/LiberationSans-Bold.ttf usr/share/games/manaplus/data/fonts/liberationsans-bold.ttf
+usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf usr/share/games/manaplus/data/fonts/liberationsans.ttf
+usr/share/fonts/truetype/ttf-liberation/LiberationMono-Bold.ttf usr/share/games/manaplus/data/fonts/liberationsansmono-bold.ttf
+usr/share/fonts/truetype/ttf-liberation/LiberationMono-Regular.ttf usr/share/games/manaplus/data/fonts/liberationsansmono.ttf
diff --git a/packaging/debian/mana-4144-data.substvars b/packaging/debian/mana-4144-data.substvars
new file mode 100644
index 000000000..abd3ebebc
--- /dev/null
+++ b/packaging/debian/mana-4144-data.substvars
@@ -0,0 +1 @@
+misc:Depends=
diff --git a/packaging/debian/mana.docs b/packaging/debian/mana-4144.docs
index d622a5279..08d044dc9 100644
--- a/packaging/debian/mana.docs
+++ b/packaging/debian/mana-4144.docs
@@ -1,6 +1,4 @@
 AUTHORS
-NEWS
 README
-ChangeLog
 docs/progression.txt
 docs/FAQ.txt
diff --git a/packaging/debian/mana-4144.install b/packaging/debian/mana-4144.install
new file mode 100644
index 000000000..9f1eaed68
--- /dev/null
+++ b/packaging/debian/mana-4144.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/share/applications/manaplus.desktop usr/share/applications/
+debian/tmp/usr/share/games/manaplus/data/icons/manaplus.png usr/share/icons/
+debian/tmp/usr/games/manaplus usr/games/
+data/icons/manaplus.xpm usr/share/pixmaps/
diff --git a/packaging/debian/mana-4144.manpages b/packaging/debian/mana-4144.manpages
new file mode 100644
index 000000000..edc662a05
--- /dev/null
+++ b/packaging/debian/mana-4144.manpages
@@ -0,0 +1 @@
+docs/manaplus.6
diff --git a/packaging/debian/mana-4144.substvars b/packaging/debian/mana-4144.substvars
new file mode 100644
index 000000000..723bb49f8
--- /dev/null
+++ b/packaging/debian/mana-4144.substvars
@@ -0,0 +1,2 @@
+shlibs:Depends=libc6 (>= 2.2.5), libcurl3-gnutls (>= 7.16.2-1), libenet0debian1, libgcc1 (>= 1:4.1.1), libgl1-mesa-glx | libgl1, libguichan-0.8.1-1, libguichan-sdl-0.8.1-1, libphysfs1 (>= 1.1.1), libpng12-0 (>= 1.2.13-4), libsdl-gfx1.2-4 (>= 2.0.20), libsdl-image1.2 (>= 1.2.5), libsdl-mixer1.2 (>= 1.2.6), libsdl-net1.2, libsdl-ttf2.0-0, libsdl1.2debian (>= 1.2.10-1), libstdc++6 (>= 4.4.0), libxml2 (>= 2.7.4), zlib1g (>= 1:1.1.4), tmwcetki-archive-keyring ( >= 2010.10.17)
+misc:Depends=
diff --git a/packaging/debian/mana-data.install b/packaging/debian/mana-data.install
deleted file mode 100644
index 82a37bb34..000000000
--- a/packaging/debian/mana-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-data/graphics/gui/*.png usr/share/games/mana/data/graphics/gui
-data/graphics/images/*.png usr/share/games/mana/data/graphics/images
-data/graphics/images/ambient/*.png usr/share/games/mana/data/graphics/images/ambient
-data/graphics/tiles/*.png usr/share/games/mana/data/graphics/tiles
-data/help/*.txt usr/share/games/mana/data/help
diff --git a/packaging/debian/mana.desktop b/packaging/debian/mana.desktop
deleted file mode 100644
index ec24a2fc6..000000000
--- a/packaging/debian/mana.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-
-[Desktop Entry]
-Version=1.0
-Name=Mana
-Comment=A 2D MMORPG client
-Comment[fr]=Un jeu en ligne dans un univers fantastique
-Comment[de]=ein Online Fantasy Spiel
-Comment[it]=Un gioco fantasy online
-Comment[nl]=Een online role playing game
-Comment[sv]=Ett fantasyrollspel online
-Exec=mana
-StartupNotify=false
-Terminal=false
-Type=Game
-Icon=mana.png
-Categories=Game
diff --git a/packaging/debian/mana.install b/packaging/debian/mana.install
deleted file mode 100644
index da45ec4a9..000000000
--- a/packaging/debian/mana.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/manaplus.desktop usr/share/applications
-debian/manaplus.xpm usr/share/pixmaps
-data/icons/manaplus.png usr/share/icons
-docs/manaplus.6 usr/share/man/man6
-src/manaplus usr/games
diff --git a/packaging/debian/mana.sgml b/packaging/debian/mana.sgml
deleted file mode 100644
index 257c948d6..000000000
--- a/packaging/debian/mana.sgml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>FERREIRA</firstname>">
-  <!ENTITY dhsurname   "<surname>Yohann</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>avril 13, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>6</manvolnum>">
-  <!ENTITY dhemail     "<email>bertram@cegetel.net</email>">
-  <!ENTITY dhusername  "FERREIRA Yohann">
-  <!ENTITY dhucpackage "<refentrytitle>Mana</refentrytitle>">
-  <!ENTITY dhpackage   "mana">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2003</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Mana is the abreviation of The Mana World : A Fantasy Online Game</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> ingame
-      commands.</para>
-    <para><command>&dhpackage;</command> is a Great Online Game based upon the Seiken Densetsu Serie.
-It has its own universe, and and its own character management system, which will
-give you the opportunity to play in a 2D heroic-fantasy world forever.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>COMMON KEYS</title>
-
-    <para>Arrow Keys, Key Pad Keys (Diagonals Supported).
-Move your character around.
-
-Left Ctrl : 
-Make your character attack.
-
-G : 
-Get Items on the ground or in a chest.
-
-Alt + 1...9 : 
-Shows an Emoticon above your character.
-
-Alt + I : 
-Shows / Hide Inventory Window.
-
-Alt + K : 
-Shows / Hide Skills Window.
-
-Alt + E : 
-Shows / Hide Equipment Window.
-
-Alt + C : 
-Shows Configuration Window.
-</para>
-
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>libguichan (2).</para>
-
-    <para>The program is documented fully by <citetitle>The Mana World Team</citetitle> available via the
-      website http://www.manaworld.org/</para>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/packaging/debian/patches/00list b/packaging/debian/patches/00list
deleted file mode 100644
index e69de29bb..000000000
--- a/packaging/debian/patches/00list
+++ /dev/null
diff --git a/packaging/debian/rules b/packaging/debian/rules
index df2e08d6f..1ede8e2c4 100644..100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -3,18 +3,18 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-config.status: patch
+config.status:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+	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
+	--datadir=/usr/share/games --bindir=/usr/games --mandir=/usr/share/man \
+	--with-server=eathena
+# --without-opengl
 
 build: build-stamp
 build-stamp: config.status
@@ -22,25 +22,29 @@ build-stamp: config.status
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f debian/manaplus.menu
+	rm -rf debian/tmp
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs
+	dh_prep
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	cp manaplus.menu debian/
 
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs -i NEWS
 	dh_installdocs -i
 	dh_install -i
+	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -51,12 +55,12 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-	dh_installchangelogs -a ChangeLog
+	dh_installchangelogs -a NEWS
 	dh_installdocs -a
 	dh_install -a
-	dh_desktop -a
 	dh_installmenu -a
-	dh_strip -a --dbg-package=mana-dbg
+	dh_installman -a
+	dh_strip -a --dbg-package=mana-4144-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
@@ -65,5 +69,10 @@ binary-arch: build install
 	dh_md5sums -a
 	dh_builddeb -a
 
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@uscan --force-download --destdir ../tarballs
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/packaging/debian/watch b/packaging/debian/watch
index 01aa13f7e..adce948c2 100644
--- a/packaging/debian/watch
+++ b/packaging/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/themanaworld/tmw-(.*)\.tar\.gz
+http://sf.net/themanaworld/mana-(.*)\.tar\.gz