Attachment #136381 for bug #88621




	package_dir={'xgngeo': 'data/py'},
	data_files=[
		#Images.
		(os.path.join("share", "games", "xgngeo", "img"),glob.glob(os.path.join("data", "img", "*.png"))),
		#ROM info.
		(os.path.join("share", "games", "xgngeo"),glob.glob(os.path.join("data", "rominfos.*"))),
		#License text.
		(os.path.join("share", "games", "xgngeo"),['LICENSE.txt']),
		#Plain text documentation.
		(os.path.join("share", "games", "xgngeo","doc"),[os.path.join("doc", "xgngeo-doc.txt")]),
		# *.desktop (menu entry)
		(os.path.join("share", "applications"), [os.path.join("data", "misc", "xgngeo.desktop")]),
		#Localization files.
		#Spanish
		(os.path.join("share", "games", "xgngeo", "locale", "es", "LC_MESSAGES"),
			[os.path.join("data", "locale", "es", "LC_MESSAGES", "xgngeo.mo")]),
		#German
		(os.path.join("share", "games", "xgngeo", "locale", "de", "LC_MESSAGES"),
			[os.path.join("data", "locale", "de", "LC_MESSAGES", "xgngeo.mo")]),
		#French
		(os.path.join("share", "games", "xgngeo", "locale", "fr", "LC_MESSAGES"),
			[os.path.join("data", "locale", "fr", "LC_MESSAGES", "xgngeo.mo")]),
		#Polish
		(os.path.join("share", "games", "xgngeo", "locale", "pl", "LC_MESSAGES"),
			[os.path.join("data", "locale", "pl", "LC_MESSAGES", "xgngeo.mo")]),
		#Portuguese of Brazil
		(os.path.join("share", "games", "xgngeo", "locale", "pt_BR", "LC_MESSAGES"),
			[os.path.join("data", "locale", "pt_BR", "LC_MESSAGES", "xgngeo.mo")])
		]
	)

		if not prefix:
			prefix = sys.prefix #Use Python prefix.

		startup_script = os.path.join(prefix, "games", "bin", "xgngeo") #Startup script path.
		startup_script_dir = os.path.dirname(startup_script) 
		
		import shutil

Lines 60-66 Link Here

(-)data/py/__init__.py.orig (-1 / +1 lines)
60	VERSION = "16"	60	VERSION = "16"
61	xgngeoUserDir = os.path.expanduser("~/.xgngeo")	61	xgngeoUserDir = os.path.expanduser("~/.xgngeo")
62	gngeoUserDir = os.path.expanduser("~/.gngeo")	62	gngeoUserDir = os.path.expanduser("~/.gngeo")
63	datarootpath = os.path.join(sys.prefix, 'share', 'xgngeo')	63	datarootpath = os.path.join(sys.prefix, 'share', 'games', 'xgngeo')
64		64
65	# Internationalization.	65	# Internationalization.
66	gettext.install("xgngeo", os.path.join(datarootpath, "locale"))	66	gettext.install("xgngeo", os.path.join(datarootpath, "locale"))

Return to bug 88621

Lines 44-73 Link Here

(-)setup.py.orig (-10 / +10 lines)
44	package_dir={'xgngeo': 'data/py'},	44	package_dir={'xgngeo': 'data/py'},
45	data_files=[	45	data_files=[
46	#Images.	46	#Images.
47	(os.path.join("share", "xgngeo", "img"),glob.glob(os.path.join("data", "img", "*.png"))),	47	(os.path.join("share", "games", "xgngeo", "img"),glob.glob(os.path.join("data", "img", "*.png"))),
48	#ROM info.	48	#ROM info.
49	(os.path.join("share", "xgngeo"),glob.glob(os.path.join("data", "rominfos.*"))),	49	(os.path.join("share", "games", "xgngeo"),glob.glob(os.path.join("data", "rominfos.*"))),
50	#License text.	50	#License text.
51	(os.path.join("share", "xgngeo"),['LICENSE.txt']),	51	(os.path.join("share", "games", "xgngeo"),['LICENSE.txt']),
52	#Plain text documentation.	52	#Plain text documentation.
53	(os.path.join("share", "xgngeo","doc"),[os.path.join("doc", "xgngeo-doc.txt")]),	53	(os.path.join("share", "games", "xgngeo","doc"),[os.path.join("doc", "xgngeo-doc.txt")]),
54	# *.desktop (menu entry)	54	# *.desktop (menu entry)
55	(os.path.join("share", "applications"), [os.path.join("data", "misc", "xgngeo.desktop")]),	55	(os.path.join("share", "applications"), [os.path.join("data", "misc", "xgngeo.desktop")]),
56	#Localization files.	56	#Localization files.
57	#Spanish	57	#Spanish
58	(os.path.join("share", "xgngeo", "locale", "es", "LC_MESSAGES"),	58	(os.path.join("share", "games", "xgngeo", "locale", "es", "LC_MESSAGES"),
59	[os.path.join("data", "locale", "es", "LC_MESSAGES", "xgngeo.mo")]),	59	[os.path.join("data", "locale", "es", "LC_MESSAGES", "xgngeo.mo")]),
60	#German	60	#German
61	(os.path.join("share", "xgngeo", "locale", "de", "LC_MESSAGES"),	61	(os.path.join("share", "games", "xgngeo", "locale", "de", "LC_MESSAGES"),
62	[os.path.join("data", "locale", "de", "LC_MESSAGES", "xgngeo.mo")]),	62	[os.path.join("data", "locale", "de", "LC_MESSAGES", "xgngeo.mo")]),
63	#French	63	#French
64	(os.path.join("share", "xgngeo", "locale", "fr", "LC_MESSAGES"),	64	(os.path.join("share", "games", "xgngeo", "locale", "fr", "LC_MESSAGES"),
65	[os.path.join("data", "locale", "fr", "LC_MESSAGES", "xgngeo.mo")]),	65	[os.path.join("data", "locale", "fr", "LC_MESSAGES", "xgngeo.mo")]),
66	#Polish	66	#Polish
67	(os.path.join("share", "xgngeo", "locale", "pl", "LC_MESSAGES"),	67	(os.path.join("share", "games", "xgngeo", "locale", "pl", "LC_MESSAGES"),
68	[os.path.join("data", "locale", "pl", "LC_MESSAGES", "xgngeo.mo")]),	68	[os.path.join("data", "locale", "pl", "LC_MESSAGES", "xgngeo.mo")]),
69	#Portuguese of Brazil	69	#Portuguese of Brazil
70	(os.path.join("share", "xgngeo", "locale", "pt_BR", "LC_MESSAGES"),	70	(os.path.join("share", "games", "xgngeo", "locale", "pt_BR", "LC_MESSAGES"),
71	[os.path.join("data", "locale", "pt_BR", "LC_MESSAGES", "xgngeo.mo")])	71	[os.path.join("data", "locale", "pt_BR", "LC_MESSAGES", "xgngeo.mo")])
72	]	72	]
73	)	73	)
Lines 87-93 Link Here
87	if not prefix:	87	if not prefix:
88	prefix = sys.prefix #Use Python prefix.	88	prefix = sys.prefix #Use Python prefix.
89		89
90	startup_script = os.path.join(prefix, "bin", "xgngeo") #Startup script path.	90	startup_script = os.path.join(prefix, "games", "bin", "xgngeo") #Startup script path.
91	startup_script_dir = os.path.dirname(startup_script)	91	startup_script_dir = os.path.dirname(startup_script)
92		92
93	import shutil	93	import shutil