From dcd4f9a9781b4c8e5508dbb21dda0d2ce1dc8c80 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 22 Aug 2010 10:41:52 +0100
Subject: [PATCH] Put data files under new "shared" directory

Avoids Python 2.7 warning about conflict with Python's 'locales' module name, and
mirrors more closely the layout in an traditional installation.
---
 setup.py                                                    |  10 +++++-----
 .../applications}/zeroinstall-add.desktop                   |   0
 .../applications}/zeroinstall-manage.desktop                |   0
 {applications => share/applications}/zeroinstall.menu       |   0
 .../desktop-directories}/zeroinstall.directory              |   0
 {applications => share/icons}/24x24/zeroinstall.png         | Bin
 {applications => share/icons}/48x48/zeroinstall.png         | Bin
 {locale => share/locale}/es/LC_MESSAGES/zero-install.po     |   0
 {locale => share/locale}/sv/LC_MESSAGES/zero-install.po     |   0
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename {applications => share/applications}/zeroinstall-add.desktop (100%)
 rename {applications => share/applications}/zeroinstall-manage.desktop (100%)
 rename {applications => share/applications}/zeroinstall.menu (100%)
 rename {applications => share/desktop-directories}/zeroinstall.directory (100%)
 rename {applications => share/icons}/24x24/zeroinstall.png (100%)
 rename {applications => share/icons}/48x48/zeroinstall.png (100%)
 rename {locale => share/locale}/es/LC_MESSAGES/zero-install.po (100%)
 rename {locale => share/locale}/sv/LC_MESSAGES/zero-install.po (100%)

diff --git a/setup.py b/setup.py
index 5b6ac8e..0e7bb1f 100644
--- a/setup.py
+++ b/setup.py
@@ -104,7 +104,7 @@ class my_install(install):
 		install.run(self)	# super.run()
 		menus_dir = os.path.join(self.__config_dir, 'menus/applications-merged')
 		self.mkpath(menus_dir)
-		menu = convert_path('applications/zeroinstall.menu')
+		menu = convert_path('share/applications/zeroinstall.menu')
 		self.copy_file(menu, menus_dir)
 
 		if self.home:
@@ -118,10 +118,10 @@ setup(name="zeroinstall-injector",
       url="http://0install.net",
       scripts=['0launch', '0alias', '0store', '0store-secure-add', '0desktop'],
       data_files = [('man/man1', ['0launch.1', '0alias.1', '0store-secure-add.1', '0store.1', '0desktop.1']),
-		    ('share/applications', ['applications/zeroinstall-add.desktop', 'applications/zeroinstall-manage.desktop']),
-		    ('share/desktop-directories', ['applications/zeroinstall.directory']),
-		    ('share/icons/hicolor/24x24/apps', ['applications/24x24/zeroinstall.png']),
-		    ('share/icons/hicolor/48x48/apps', ['applications/48x48/zeroinstall.png'])],
+		    ('share/applications', ['share/applications/zeroinstall-add.desktop', 'share/applications/zeroinstall-manage.desktop']),
+		    ('share/desktop-directories', ['share/desktop-directories/zeroinstall.directory']),
+		    ('share/icons/hicolor/24x24/apps', ['share/icons/24x24/zeroinstall.png']),
+		    ('share/icons/hicolor/48x48/apps', ['share/icons/48x48/zeroinstall.png'])],
       license='LGPL',
       cmdclass={
 	'build_py': build_with_data,
diff --git a/applications/zeroinstall-add.desktop b/share/applications/zeroinstall-add.desktop
similarity index 100%
rename from applications/zeroinstall-add.desktop
rename to share/applications/zeroinstall-add.desktop
diff --git a/applications/zeroinstall-manage.desktop b/share/applications/zeroinstall-manage.desktop
similarity index 100%
rename from applications/zeroinstall-manage.desktop
rename to share/applications/zeroinstall-manage.desktop
diff --git a/applications/zeroinstall.menu b/share/applications/zeroinstall.menu
similarity index 100%
rename from applications/zeroinstall.menu
rename to share/applications/zeroinstall.menu
diff --git a/applications/zeroinstall.directory b/share/desktop-directories/zeroinstall.directory
similarity index 100%
rename from applications/zeroinstall.directory
rename to share/desktop-directories/zeroinstall.directory
diff --git a/applications/24x24/zeroinstall.png b/share/icons/24x24/zeroinstall.png
similarity index 100%
rename from applications/24x24/zeroinstall.png
rename to share/icons/24x24/zeroinstall.png
diff --git a/applications/48x48/zeroinstall.png b/share/icons/48x48/zeroinstall.png
similarity index 100%
rename from applications/48x48/zeroinstall.png
rename to share/icons/48x48/zeroinstall.png
diff --git a/locale/es/LC_MESSAGES/zero-install.po b/share/locale/es/LC_MESSAGES/zero-install.po
similarity index 100%
rename from locale/es/LC_MESSAGES/zero-install.po
rename to share/locale/es/LC_MESSAGES/zero-install.po
diff --git a/locale/sv/LC_MESSAGES/zero-install.po b/share/locale/sv/LC_MESSAGES/zero-install.po
similarity index 100%
rename from locale/sv/LC_MESSAGES/zero-install.po
rename to share/locale/sv/LC_MESSAGES/zero-install.po
-- 
2.11.4.GIT