Moved debian packaging scripts to packaging directory

Conflicts:

	debian/aethyra.docs
	debian/aethyra.sgml
	debian/tmw.docs
	debian/tmw.sgml
	packaging/debian/tmw.docs
	packaging/debian/tmw.sgml

Signed-off-by: Ira Rice <irarice@gmail.com>

15 files changed, 531 insertions, 36 deletions

diff --git a/packaging/debian/aethyra-data.install b/packaging/debian/aethyra-data.install
new file mode 100644
index 00000000..c652dff3
--- /dev/null
+++ b/packaging/debian/aethyra-data.install
@@ -0,0 +1,6 @@
+data/graphics/gui/*.png usr/share/games/aethyra/data/graphics/gui
+data/graphics/gui/*.xml usr/share/games/aethyra/data/graphics/gui
+data/graphics/images/*.png usr/share/games/aethyra/data/graphics/images
+data/graphics/images/ambient/*.png usr/share/games/aethyra/data/graphics/images/ambient
+data/graphics/tiles/*.png usr/share/games/aethyra/data/graphics/tiles
+data/help/*.txt usr/share/games/aethyra/data/help
diff --git a/packaging/debian/aethyra.desktop b/packaging/debian/aethyra.desktop
new file mode 100644
index 00000000..221d2258
--- /dev/null
+++ b/packaging/debian/aethyra.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Aethyra
+Comment=Aethyra is a 2D MMORPG using eAthena.
+Exec=aethyra
+StartupNotify=false
+Terminal=false
+Type=Game
+Icon=aethyra.png
+Categories=Game
diff --git a/packaging/debian/aethyra.docs b/packaging/debian/aethyra.docs
new file mode 100644
index 00000000..d622a527
--- /dev/null
+++ b/packaging/debian/aethyra.docs
@@ -0,0 +1,6 @@
+AUTHORS
+NEWS
+README
+ChangeLog
+docs/progression.txt
+docs/FAQ.txt
diff --git a/packaging/debian/aethyra.install b/packaging/debian/aethyra.install
new file mode 100644
index 00000000..66ba5126
--- /dev/null
+++ b/packaging/debian/aethyra.install
@@ -0,0 +1,5 @@
+debian/aethyra.desktop usr/share/applications
+debian/aethyra.xpm usr/share/pixmaps
+data/icons/aethyra.png usr/share/icons
+docs/aethyra.6 usr/share/man/man6
+src/aethyra usr/games
diff --git a/packaging/debian/aethyra.menu b/packaging/debian/aethyra.menu
new file mode 100644
index 00000000..42035107
--- /dev/null
+++ b/packaging/debian/aethyra.menu
@@ -0,0 +1,4 @@
+?package(aethyra):needs="X11" section="Games/Adventure"\
+ title="Aethyra"\
+ description="Aethyra is a 2D MMORPG using eAthena."\
+ command="/usr/games/aethyra" icon="/usr/share/pixmaps/aethyra.xpm"
diff --git a/packaging/debian/aethyra.sgml b/packaging/debian/aethyra.sgml
new file mode 100644
index 00000000..0ed18199
--- /dev/null
+++ b/packaging/debian/aethyra.sgml
@@ -0,0 +1,149 @@
+<!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>TMW</refentrytitle>">
+  <!ENTITY dhpackage   "tmw">
+
+  <!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>tmw 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/aethyra.xpm b/packaging/debian/aethyra.xpm
new file mode 100644
index 00000000..515be72e
--- /dev/null
+++ b/packaging/debian/aethyra.xpm
@@ -0,0 +1,312 @@
+/* XPM */

+static char * Aethyra_xpm[] = {

+"32 32 277 2",

+"  	c None",

+". 	c #840000",

+"+ 	c #7E0000",

+"@ 	c #4F0000",

+"# 	c #810000",

+"$ 	c #830000",

+"% 	c #7B0000",

+"& 	c #460000",

+"* 	c #4C0000",

+"= 	c #4B0000",

+"- 	c #750000",

+"; 	c #860000",

+"> 	c #850000",

+", 	c #5D0000",

+"' 	c #490000",

+") 	c #450000",

+"! 	c #4A0000",

+"~ 	c #440000",

+"{ 	c #6A0000",

+"] 	c #7A0000",

+"^ 	c #8B0000",

+"/ 	c #990000",

+"( 	c #960000",

+"_ 	c #720000",

+": 	c #6E0000",

+"< 	c #740000",

+"[ 	c #6B0202",

+"} 	c #550505",

+"| 	c #420404",

+"1 	c #440101",

+"2 	c #4D0000",

+"3 	c #4E0000",

+"4 	c #480000",

+"5 	c #9D0000",

+"6 	c #9B0000",

+"7 	c #6F0000",

+"8 	c #710000",

+"9 	c #760000",

+"0 	c #680404",

+"a 	c #4B0C0C",

+"b 	c #3C0909",

+"c 	c #470202",

+"d 	c #450101",

+"e 	c #500000",

+"f 	c #510000",

+"g 	c #790000",

+"h 	c #890000",

+"i 	c #920000",

+"j 	c #710706",

+"k 	c #7D381F",

+"l 	c #934A1A",

+"m 	c #7B1A09",

+"n 	c #6B1609",

+"o 	c #521E13",

+"p 	c #4F2517",

+"q 	c #5D230F",

+"r 	c #4D0F04",

+"s 	c #350A0A",

+"t 	c #360909",

+"u 	c #470303",

+"v 	c #930000",

+"w 	c #840202",

+"x 	c #712C1C",

+"y 	c #A58248",

+"z 	c #866621",

+"A 	c #835819",

+"B 	c #98681F",

+"C 	c #845C1D",

+"D 	c #BB964A",

+"E 	c #856225",

+"F 	c #3D1B0B",

+"G 	c #241818",

+"H 	c #251717",

+"I 	c #360A0A",

+"J 	c #430000",

+"K 	c #6C0000",

+"L 	c #800000",

+"M 	c #730404",

+"N 	c #6A431E",

+"O 	c #473C1C",

+"P 	c #534420",

+"Q 	c #806125",

+"R 	c #53290B",

+"S 	c #461C09",

+"T 	c #BB9432",

+"U 	c #65490F",

+"V 	c #1F1110",

+"W 	c #1A2323",

+"X 	c #1A2222",

+"Y 	c #261212",

+"Z 	c #440202",

+"` 	c #7F0000",

+" .	c #870000",

+"..	c #6D0505",

+"+.	c #422522",

+"@.	c #454434",

+"#.	c #A18744",

+"$.	c #8F7237",

+"%.	c #A37F48",

+"&.	c #AD8847",

+"*.	c #C6A657",

+"=.	c #644C14",

+"-.	c #211615",

+";.	c #1C2626",

+">.	c #1B2323",

+",.	c #231313",

+"'.	c #420202",

+").	c #6C0404",

+"!.	c #532D23",

+"~.	c #A8915B",

+"{.	c #967C37",

+"].	c #6E5926",

+"^.	c #453512",

+"/.	c #473713",

+"(.	c #A4832A",

+"_.	c #594310",

+":.	c #241F1E",

+"<.	c #232828",

+"[.	c #1C2020",

+"}.	c #241111",

+"|.	c #430202",

+"1.	c #7C5030",

+"2.	c #967C3D",

+"3.	c #3E3318",

+"4.	c #3D3930",

+"5.	c #454442",

+"6.	c #524D44",

+"7.	c #C09E45",

+"8.	c #654F17",

+"9.	c #262524",

+"0.	c #252929",

+"a.	c #410202",

+"b.	c #6B0302",

+"c.	c #A78041",

+"d.	c #6A5621",

+"e.	c #414543",

+"f.	c #696B6B",

+"g.	c #747676",

+"h.	c #7B7566",

+"i.	c #C9A84F",

+"j.	c #665017",

+"k.	c #282725",

+"l.	c #252A2A",

+"m.	c #1B2222",

+"n.	c #3D0202",

+"o.	c #750802",

+"p.	c #B48E41",

+"q.	c #564418",

+"r.	c #4A4B4B",

+"s.	c #6D6F6F",

+"t.	c #797A7A",

+"u.	c #867C62",

+"v.	c #AE9040",

+"w.	c #664F12",

+"x.	c #2D2A25",

+"y.	c #242828",

+"z.	c #1E1E1E",

+"A.	c #291010",

+"B.	c #400202",

+"C.	c #860B02",

+"D.	c #B78C32",

+"E.	c #594013",

+"F.	c #433E3E",

+"G.	c #606464",

+"H.	c #74736C",

+"I.	c #7C6D44",

+"J.	c #433719",

+"K.	c #413311",

+"L.	c #322F1E",

+"M.	c #1C2121",

+"N.	c #271212",

+"O.	c #3C0606",

+"P.	c #8C0200",

+"Q.	c #B5771D",

+"R.	c #765513",

+"S.	c #3F3636",

+"T.	c #555B5B",

+"U.	c #686969",

+"V.	c #5A5957",

+"W.	c #3C3832",

+"X.	c #403826",

+"Y.	c #2F3023",

+"Z.	c #1C1F1D",

+"`.	c #2E0A0A",

+" +	c #460101",

+".+	c #8F0101",

+"++	c #A03F0C",

+"@+	c #AC7E19",

+"#+	c #4B3625",

+"$+	c #474747",

+"%+	c #5B5C5A",

+"&+	c #83775A",

+"*+	c #8C7539",

+"=+	c #67541F",

+"-+	c #6B551C",

+";+	c #8C6D24",

+">+	c #4E1C09",

+",+	c #4A0101",

+"'+	c #8A0606",

+")+	c #8D1203",

+"!+	c #A76713",

+"~+	c #87611B",

+"{+	c #453A32",

+"]+	c #52554E",

+"^+	c #A38A45",

+"/+	c #715818",

+"(+	c #7A6424",

+"_+	c #443212",

+":+	c #947026",

+"<+	c #7D4E11",

+"[+	c #490400",

+"}+	c #420000",

+"|+	c #7F0808",

+"1+	c #8B0101",

+"2+	c #800F01",

+"3+	c #915E11",

+"4+	c #504F40",

+"5+	c #4E4834",

+"6+	c #5A4715",

+"7+	c #5B4814",

+"8+	c #382813",

+"9+	c #917035",

+"0+	c #533209",

+"a+	c #3F0400",

+"b+	c #8E0101",

+"c+	c #8A0000",

+"d+	c #671104",

+"e+	c #663D12",

+"f+	c #786023",

+"g+	c #74612B",

+"h+	c #665320",

+"i+	c #675321",

+"j+	c #785C24",

+"k+	c #684718",

+"l+	c #380B00",

+"m+	c #400000",

+"n+	c #8C0303",

+"o+	c #8D0000",

+"p+	c #780101",

+"q+	c #510808",

+"r+	c #291A16",

+"s+	c #26291C",

+"t+	c #2D2B18",

+"u+	c #321F0E",

+"v+	c #370A02",

+"w+	c #3E0100",

+"x+	c #850202",

+"y+	c #600202",

+"z+	c #331313",

+"A+	c #1E2121",

+"B+	c #1A1E1E",

+"C+	c #270D0D",

+"D+	c #470000",

+"E+	c #7B0404",

+"F+	c #720101",

+"G+	c #4B0D0D",

+"H+	c #2D1717",

+"I+	c #261414",

+"J+	c #380808",

+"K+	c #7E0202",

+"L+	c #5D0606",

+"M+	c #3B0E0E",

+"N+	c #300C0C",

+"O+	c #430303",

+"P+	c #7A0505",

+"Q+	c #7C0000",

+"R+	c #640404",

+"S+	c #430D0D",

+"T+	c #460202",

+"U+	c #610505",

+"V+	c #440E0E",

+"W+	c #390B0B",

+"X+	c #560202",

+"Y+	c #480707",

+"Z+	c #410505",

+"`+	c #4B0101",

+" @	c #480101",

+"                                                                ",

+"                                                                ",

+"                                                                ",

+"          . +                                     @             ",

+"          # $ %                               & * @ =           ",

+"          - # ; > $           , '           ) ! @ * ~           ",

+"          { ] ^ / ( $ _ : < [ } | 1 ) ~ ' 2 2 3 3 4             ",

+"            ] ^ 5 6 . 7 8 9 0 a b c * d 4 e f @ 3 4             ",

+"            g h / i j k l m n o p q r s t u e 3 2 4             ",

+"            8 > v w x y z A B C D E F G H I = @ ' J             ",

+"            K L ^ M N O P Q R S T U V W X Y Z e )               ",

+"              `  ...+.@.#.$.%.&.*.=.-.;.>.,.'.e &               ",

+"              ` . ).!.~.{.].^./.(._.:.<.[.}.|.@ 4               ",

+"                # [ 1.2.3.4.5.6.7.8.9.0.[.}.a.=                 ",

+"                ` b.c.d.e.f.g.h.i.j.k.l.m.,.n.)                 ",

+"                L o.p.q.r.s.t.u.v.w.x.y.z.A.B.~                 ",

+"                ; C.D.E.F.G.H.I.J.K.L.M.N.O.4                   ",

+"                  P.Q.R.S.T.U.V.W.X.Y.Z.`. +2                   ",

+"                  .+++@+#+$+%+&+*+=+-+;+>+,+=                   ",

+"                  '+)+!+~+{+]+^+/+(+_+:+<+[+}+                  ",

+"                  |+1+2+3+z 4+5+6+7+8+9+0+a+                    ",

+"                    b+c+d+e+f+g+h+i+j+k+l+m+                    ",

+"                    n+o+p+q+r+s+t+u+v+w+) )                     ",

+"                      x+` y+z+A+B+C+1 e D+                      ",

+"                      E+# F+G+H+I+J+3 @ ~                       ",

+"                        K+% L+M+N+O+e '                         ",

+"                        P+Q+R+S+I T+@ )                         ",

+"                          9 U+V+W+u 2                           ",

+"                            X+Y+Z+ +                            ",

+"                            * `+ @                              ",

+"                                                                ",

+"                                                                "};

diff --git a/debian/changelog b/packaging/debian/changelog
index bc5b7579..bc5b7579 100644
--- a/debian/changelog
+++ b/packaging/debian/changelog
diff --git a/debian/compat b/packaging/debian/compat
index 7ed6ff82..7ed6ff82 100644
--- a/debian/compat
+++ b/packaging/debian/compat
diff --git a/debian/control b/packaging/debian/control
index 0d94b4fd..0d94b4fd 100644
--- a/debian/control
+++ b/packaging/debian/control
diff --git a/debian/copyright b/packaging/debian/copyright
index a6a2b687..a6a2b687 100644
--- a/debian/copyright
+++ b/packaging/debian/copyright
diff --git a/debian/patches/00list b/packaging/debian/patches/00list
index e69de29b..e69de29b 100644
--- a/debian/patches/00list
+++ b/packaging/debian/patches/00list
diff --git a/debian/rules b/packaging/debian/rules
index 6ee08a3b..6ee08a3b 100755..100644
--- a/debian/rules
+++ b/packaging/debian/rules
diff --git a/packaging/debian/watch b/packaging/debian/watch
new file mode 100644
index 00000000..5fd35272
--- /dev/null
+++ b/packaging/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://aethyra.org/downloads/aethyra-(.*)\.tar\.gz
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index f6dfa798..71a75346 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,14 +3,14 @@ SetCompress off
 SetCompressor /SOLID lzma
 
 ;--- (and without !defines ) ---
-!System "%ProgramFiles%\upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d tmw.exe"
+!System "%ProgramFiles%\upx\upx.exe --best --crp-ms=999999 --compress-icons=0 --nrv2d aethyra.exe"
 
 ; HM NIS Edit helper defines
-!define PRODUCT_NAME "The Mana World"
-!define PRODUCT_VERSION "0.0.26"
-!define PRODUCT_PUBLISHER "The Mana World Development Team"
-!define PRODUCT_WEB_SITE "http://themanaworld.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tmw.exe"
+!define PRODUCT_NAME "Aethyra"
+!define PRODUCT_VERSION "0.0.27"
+!define PRODUCT_PUBLISHER "Aethyra Development Team"
+!define PRODUCT_WEB_SITE "http://aethyra.org"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\aethyra.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
@@ -20,14 +20,14 @@ SetCompressor /SOLID lzma
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "data\icons\tmw.ico"
+!define MUI_ICON "data\icons\aethyra.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "data\icons\tmw.ico"
+!define MUI_UNICON "data\icons\aethyra.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
 !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
-!define MUI_LANGDLL_REGISTRY_KEY "Software\The Mana World"
+!define MUI_LANGDLL_REGISTRY_KEY "Software\Aethyra"
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
 
 !define MUI_WELCOMEFINISHPAGE_BITMAP "setup_welcome.bmp"
@@ -45,16 +45,16 @@ SetCompressor /SOLID lzma
 !insertmacro MUI_PAGE_INSTFILES
 ; Finish page
 !define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_FUNCTION RunTMW
+!define MUI_FINISHPAGE_RUN_FUNCTION Runaethyra
 !define MUI_FINISHPAGE_SHOWREADME 'notepad.exe "$\"$INSTDIR\README$\""'
 !define MUI_PAGE_CUSTOMFUNCTION_PRE changeFinishBmp
-!define MUI_FINISHPAGE_LINK "Visit TMW website for the latest news, FAQs and support"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://themanaworld.org"
+!define MUI_FINISHPAGE_LINK "Visit the Aethyra website for the latest news, FAQs and support"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://aethyra.org"
 !insertmacro MUI_PAGE_FINISH
 
-Function RunTMW
+Function Runaethyra
 SetOutPath $INSTDIR
-Exec "$INSTDIR\tmw.exe"
+Exec "$INSTDIR\aethyra.exe"
 FunctionEnd
 
 Function changeFinishBmp
@@ -126,8 +126,8 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "tmw-${PRODUCT_VERSION}-win32.exe"
-InstallDir "$PROGRAMFILES\The Mana World"
+OutFile "aethyra-${PRODUCT_VERSION}-win32.exe"
+InstallDir "$PROGRAMFILES\Aethyra"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -142,9 +142,9 @@ Section "Core files (required)" SecCore
   SectionIn RO
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
-  CreateDirectory "$SMPROGRAMS\The Mana World"
-  CreateShortCut "$SMPROGRAMS\The Mana World\The Mana World.lnk" "$INSTDIR\tmw.exe"
-  CreateShortCut "$DESKTOP\The Mana World.lnk" "$INSTDIR\tmw.exe"
+  CreateDirectory "$SMPROGRAMS\Aethyra"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Aethyra.lnk" "$INSTDIR\aethyra.exe"
+  CreateShortCut "$DESKTOP\Aethyra.lnk" "$INSTDIR\aethyra.exe"
   CreateDirectory "$INSTDIR\data"
   CreateDirectory "$INSTDIR\data\graphics"
   CreateDirectory "$INSTDIR\data\help"
@@ -162,7 +162,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
   
-  File "tmw.exe"
+  File "aethyra.exe"
   File "*.dll"
   File "AUTHORS"
   File "ChangeLog"
@@ -182,7 +182,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help"
   File "data\help\*.txt"
   SetOutPath "$INSTDIR\data\icons\"
-  File "data\icons\tmw.ico"
+  File "data\icons\aethyra.ico"
   SetOutPath "$INSTDIR\data\music"
   File /nonfatal "data\music\*.ogg"
   SetOutPath "$INSTDIR\docs"
@@ -191,18 +191,18 @@ SectionEnd
 
 Section -AdditionalIcons
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-  CreateShortCut "$SMPROGRAMS\The Mana World\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\The Mana World\Readme.lnk" "notepad.exe" "$INSTDIR\README"
-  CreateShortCut "$SMPROGRAMS\The Mana World\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
-  CreateShortCut "$SMPROGRAMS\The Mana World\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Readme.lnk" "notepad.exe" "$INSTDIR\README"
+  CreateShortCut "$SMPROGRAMS\Aethyra\FAQ.lnk" "$INSTDIR\docs\FAQ.txt"
+  CreateShortCut "$SMPROGRAMS\Aethyra\Uninstall.lnk" "$INSTDIR\uninst.exe"
 SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\tmw.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\aethyra.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\tmw.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\aethyra.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
@@ -213,18 +213,18 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
-  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\The Mana World"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Aethyra"
 
   Delete "$INSTDIR\*.*"
 
-  Delete "$SMPROGRAMS\The Mana World\Uninstall.lnk"
-  Delete "$DESKTOP\The Mana World.lnk"
-  Delete "$SMPROGRAMS\The Mana World\The Mana World.lnk"
-  Delete "$SMPROGRAMS\The Mana World\Website.lnk"
-  Delete "$SMPROGRAMS\The Mana World\Readme.lnk"
-  Delete "$SMPROGRAMS\The Mana World\FAQ.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Uninstall.lnk"
+  Delete "$DESKTOP\Aethyra.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Aethyra.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Website.lnk"
+  Delete "$SMPROGRAMS\Aethyra\Readme.lnk"
+  Delete "$SMPROGRAMS\Aethyra\FAQ.lnk"
 
-  RMDir "$SMPROGRAMS\The Mana World"
+  RMDir "$SMPROGRAMS\Aethyra"
   
   RMDir /r "$INSTDIR\data"
   RMDir /r "$INSTDIR\docs"
@@ -234,4 +234,4 @@ Section Uninstall
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
   SetAutoClose true
-SectionEnd
\ No newline at end of file
+SectionEnd