Merge branch '0.5'

9 files changed, 0 insertions, 131 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index e08ba335..00000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-SUBDIRS = fonts graphics help icons
-
-EXTRA_DIST = CMakeLists.txt
-
-manadatadir = $(pkgdatadir)/data
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
deleted file mode 100644
index 4fac5c9f..00000000
--- a/data/fonts/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-fontsdir = $(pkgdatadir)/data/fonts
-
-fonts_DATA =				\
-	dejavusans.ttf			\
-	dejavusans-bold.ttf
-
-EXTRA_DIST =				\
-	$(fonts_DATA) \
-	CMakeLists.txt
diff --git a/data/graphics/Makefile.am b/data/graphics/Makefile.am
deleted file mode 100644
index d2f93f58..00000000
--- a/data/graphics/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-
-graphicsdir = $(pkgdatadir)/data/graphics
-
-graphics_DATA =				\
-	target-cursor-in-range-l.png	\
-	target-cursor-in-range-m.png	\
-	target-cursor-in-range-s.png	\
-	target-cursor-normal-l.png	\
-	target-cursor-normal-m.png	\
-	target-cursor-normal-s.png
-
-EXTRA_DIST =			\
-	$(graphics_DATA)	\
-	CMakeLists.txt
-
-SUBDIRS = gui images sprites
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
deleted file mode 100644
index 04f957b7..00000000
--- a/data/graphics/gui/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-
-guidir = $(pkgdatadir)/data/graphics/gui
-
-gui_DATA =				\
-	bubble.png			\
-	button.png			\
-	button_disabled.png		\
-	buttonhi.png			\
-	buttonpress.png			\
-	checkbox.png			\
-	circle-gray.png			\
-	circle-green.png		\
-	close_button.png		\
-	colors.xml			\
-	deepbox.png			\
-	hscroll_left_default.png	\
-	hscroll_left_highlight.png	\
-	hscroll_left_pressed.png	\
-	hscroll_right_default.png	\
-	hscroll_right_highlight.png	\
-	hscroll_right_pressed.png	\
-	item_shortcut_bgr.png		\
-	mouse.png			\
-	progress-indicator.png		\
-	radioin.png			\
-	radioin_highlight.png		\
-	radioout.png			\
-	radioout_highlight.png		\
-	resize.png			\
-	selection.png			\
-	slider.png			\
-	slider_hilight.png		\
-	speechbubble.xml		\
-	sticky_button.png		\
-	tab.png				\
-	tab_hilight.png			\
-	tabselected.png			\
-	unknown-item.png		\
-	vscroll_down_default.png	\
-	vscroll_down_highlight.png	\
-	vscroll_down_pressed.png	\
-	vscroll_grey.png		\
-	vscroll_highlight.png		\
-	vscroll_up_default.png		\
-	vscroll_up_highlight.png	\
-	vscroll_up_pressed.png		\
-	window.png			\
-	window.xml
-
-EXTRA_DIST =				\
-	$(gui_DATA) \
-	CMakeLists.txt
diff --git a/data/graphics/images/Makefile.am b/data/graphics/images/Makefile.am
deleted file mode 100644
index 20ea859f..00000000
--- a/data/graphics/images/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-imagesdir = $(pkgdatadir)/data/graphics/images
-
-images_DATA =				\
-	login_wallpaper.png
-
-EXTRA_DIST =				\
-	$(images_DATA)			\
-	CMakeLists.txt
diff --git a/data/graphics/sprites/Makefile.am b/data/graphics/sprites/Makefile.am
deleted file mode 100644
index 249ca5cd..00000000
--- a/data/graphics/sprites/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-spritesdir = $(pkgdatadir)/data/graphics/sprites
-
-sprites_DATA =				\
-	error.png			\
-	error.xml
-
-EXTRA_DIST =				\
-	$(sprites_DATA)			\
-	CMakeLists.txt
diff --git a/data/help/Makefile.am b/data/help/Makefile.am
deleted file mode 100644
index f070fc39..00000000
--- a/data/help/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-helpdir = $(pkgdatadir)/data/help
-
-help_DATA =				\
-	about.txt			\
-	changes.txt			\
-	commands.txt		\
-	header.txt			\
-	index.txt			\
-	support.txt			\
-	windows.txt
-
-EXTRA_DIST =			\
-	$(help_DATA) \
-	CMakeLists.txt
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index aae3b58a..00000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-
-iconsdir = $(pkgdatadir)/data/icons
-
-icons_DATA = mana.png \
-	     mana.xpm
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datarootdir)/pixmaps
-	$(INSTALL) $(srcdir)/mana.png $(DESTDIR)$(datarootdir)/pixmaps/mana.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(datarootdir)/pixmaps/mana.png
-
-EXTRA_DIST =		\
-	$(icons_DATA) \
-	CMakeLists.txt
diff --git a/data/icons/Mana.icns b/data/icons/Mana.icns
new file mode 100644
index 00000000..7230a099
--- /dev/null
+++ b/data/icons/Mana.icns