11 files changed, 21 insertions, 40 deletions
diff --git a/packaging/debian/changelog.in b/packaging/debian/changelog.in
index b107dd24e..4e1a85704 100644
--- a/packaging/debian/changelog.in
+++ b/packaging/debian/changelog.in
@@ -1,3 +1,10 @@
+manaplus (1:1.1.3.30-1%DIST%) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed license, authors, news and different package info.
+
+ -- Andrei Karas <akaras@inbox.ru>  Sat, 19 Mar 2011 04:38:59 +0200
+
 mana-4144 (1.1.git-1.1.3.6-1%DIST%) unstable; urgency=low
 
   * New upstream release.
diff --git a/packaging/debian/control b/packaging/debian/control
index 899c7d2d0..e7c3a465c 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,37 +1,40 @@
-Source: mana-4144
+Source: manaplus
 Section: games
 Priority: optional
-Homepage: http://tmw.cetki.com/4144/
+Homepage: http://manaplus.evolonline.org/
 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-4144
+Package: manaplus
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, mana-4144-data (= ${source:Version}), tmwcetki-archive-keyring (>= 2010.10.17)
-Recommends: mana-music
+Depends: ${shlibs:Depends}, ${misc:Depends}, manaplus-data (= ${source:Version}), tmwcetki-archive-keyring (>= 2010.10.17)
+Recommends: manaplus-music, manaplus-themes
 Suggests: mumble
+Replaces: mana-4144
 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
+Package: manaplus-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, mana-4144 (= ${binary:Version})
+Depends: ${misc:Depends}, manaplus (= ${binary:Version})
+Replaces: mana-4144-dbg
 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.
+ This package provides debugging symbols for the manaplus package.
 
-Package: mana-4144-data
+Package: manaplus-data
 Architecture: all
 Depends: ${misc:Depends}, ttf-dejavu-core, ttf-liberation
-Recommends: mana-4144, ttf-mplus
+Recommends: manaplus, ttf-mplus
+Replaces: mana-4144-data
 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.
diff --git a/packaging/debian/files b/packaging/debian/files
deleted file mode 100644
index 816aadf47..000000000
--- a/packaging/debian/files
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 32b040f58..000000000
--- a/packaging/debian/mana-4144-data.install
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 53c8b7458..000000000
--- a/packaging/debian/mana-4144-data.links
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index abd3ebebc..000000000
--- a/packaging/debian/mana-4144-data.substvars
+++ /dev/null
@@ -1 +0,0 @@
-misc:Depends=
diff --git a/packaging/debian/mana-4144.docs b/packaging/debian/mana-4144.docs
deleted file mode 100644
index 594403310..000000000
--- a/packaging/debian/mana-4144.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-AUTHORS
-README
-docs/FAQ.txt
diff --git a/packaging/debian/mana-4144.install b/packaging/debian/mana-4144.install
deleted file mode 100644
index 9f1eaed68..000000000
--- a/packaging/debian/mana-4144.install
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index edc662a05..000000000
--- a/packaging/debian/mana-4144.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/manaplus.6
diff --git a/packaging/debian/mana-4144.substvars b/packaging/debian/mana-4144.substvars
deleted file mode 100644
index 723bb49f8..000000000
--- a/packaging/debian/mana-4144.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-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/rules b/packaging/debian/rules
index 549c2eb9e..1a88b6f52 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -59,7 +59,7 @@ binary-arch: build install
 	dh_install -a
 	dh_installmenu -a
 	dh_installman -a
-	dh_strip -a --dbg-package=mana-4144-dbg
+	dh_strip -a --dbg-package=manaplus-dbg
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a