[game-data-packager] 14/18: Move game_data_packager to . (uninstalled) or DATADIR (installed)
Simon McVittie
smcv at debian.org
Thu Jan 22 12:40:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 6879cc80f2f187e4545e960d77f6cceaa3cec7a9
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jan 22 11:33:08 2015 +0000
Move game_data_packager to . (uninstalled) or DATADIR (installed)
There's nothing architecture-dependent there, it doesn't need to be
in /usr/lib.
---
Makefile | 8 ++++----
debian/copyright | 5 +++--
debian/dirs | 1 -
debian/game-data-packager.install | 2 +-
debian/rules | 2 +-
doc/adding_a_game.mdwn | 2 +-
game-data-packager | 4 ++--
{lib/game_data_packager => game_data_packager}/__init__.py | 0
{lib/game_data_packager => game_data_packager}/__main__.py | 0
{lib/game_data_packager => game_data_packager}/check_syntax.py | 0
{lib/game_data_packager => game_data_packager}/config.py | 0
{lib/game_data_packager => game_data_packager}/games/__init__.py | 0
.../games/doom_common.py | 0
{lib/game_data_packager => game_data_packager}/games/lgeneral.py | 0
{lib/game_data_packager => game_data_packager}/games/quake.py | 0
{lib/game_data_packager => game_data_packager}/games/quake2.py | 0
{lib/game_data_packager => game_data_packager}/games/rott.py | 0
{lib/game_data_packager => game_data_packager}/games/tyrian.py | 0
{lib/game_data_packager => game_data_packager}/games/wolf3d.py | 0
{lib/game_data_packager => game_data_packager}/make_template.py | 0
{lib/game_data_packager => game_data_packager}/paths.py | 2 --
{lib/game_data_packager => game_data_packager}/util.py | 0
{lib/game_data_packager => game_data_packager}/version.py | 0
23 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/Makefile b/Makefile
index e42a9a5..3297173 100644
--- a/Makefile
+++ b/Makefile
@@ -47,18 +47,18 @@ clean:
rm -f ./out/*.README.Debian.in
rm -f ./out/*.png
rm -f ./out/*.yaml
- rm -rf lib/game_data_packager/__pycache__
+ rm -rf game_data_packager/__pycache__
for d in $(DIRS); do [ ! -d "$$d" ] || rmdir "$$d"; done
check:
- GDP_UNINSTALLED=1 PYTHONPATH=lib python3 -m game_data_packager.check_syntax
- pyflakes3 lib/game_data_packager/*.py lib/game_data_packager/*/*.py || :
+ GDP_UNINSTALLED=1 PYTHONPATH=. python3 -m game_data_packager.check_syntax
+ pyflakes3 game_data_packager/*.py game_data_packager/*/*.py || :
# Requires additional setup, so not part of "make check"
manual-check:
install -d tmp/
for game in $(TEST_SUITE); do \
- GDP_MIRROR=$(GDP_MIRROR) GDP_UNINSTALLED=1 PYTHONPATH=lib \
+ GDP_MIRROR=$(GDP_MIRROR) GDP_UNINSTALLED=1 PYTHONPATH=. \
python3 -m game_data_packager -d ./tmp --no-search --no-compress $$game || exit $$?; \
done
rm -fr tmp/
diff --git a/debian/copyright b/debian/copyright
index d9147eb..ff25a62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,10 +13,11 @@ License: GPL-2
/usr/share/common-licenses/GPL-2.
Files:
- lib/game_data_packager/*.py
- lib/game_data_packager/*/*.py
+ game_data_packager/*.py
+ game_data_packager/*/*.py
Copyright:
© 2014-2015 Simon McVittie
+ © 2015 Alexandre Detiste
License: GPL-2+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/debian/dirs b/debian/dirs
index 0bee199..c8651bc 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,5 +1,4 @@
usr/games
usr/share/man/man6
usr/share/games/game-data-packager
-usr/lib/game-data-packager
etc
diff --git a/debian/game-data-packager.install b/debian/game-data-packager.install
index aed11ad..d80c04b 100644
--- a/debian/game-data-packager.install
+++ b/debian/game-data-packager.install
@@ -1,7 +1,7 @@
-lib/* usr/lib/game-data-packager
game-data-packager usr/games
etc/game-data-packager.conf etc
etc/*-mirrors etc/game-data-packager
+game_data_packager usr/share/games/game-data-packager
out/*.control.in usr/share/games/game-data-packager
out/*.copyright usr/share/games/game-data-packager
out/*.copyright.in usr/share/games/game-data-packager
diff --git a/debian/rules b/debian/rules
index db46bbf..65ca632 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_auto_clean:
override_dh_install:
dh_install
- echo 'GAME_PACKAGE_VERSION = """$(DEB_VERSION)"""' > debian/game-data-packager/usr/lib/game-data-packager/game_data_packager/version.py
+ echo 'GAME_PACKAGE_VERSION = """$(DEB_VERSION)"""' > debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py
override_dh_installdocs:
dh_installdocs -XTODO
diff --git a/doc/adding_a_game.mdwn b/doc/adding_a_game.mdwn
index 2a2f075..a7e5179 100644
--- a/doc/adding_a_game.mdwn
+++ b/doc/adding_a_game.mdwn
@@ -137,6 +137,6 @@ to mapping:
### Step 3: advanced
-You can write a Python plugin in `lib/game_data_packager/games/SHORTNAME.py`
+You can write a Python plugin in `game_data_packager/games/SHORTNAME.py`
if you need to implement different command-line parsing or behaviour.
Please don't do this unless you really need to.
diff --git a/game-data-packager b/game-data-packager
index 790e738..bed1fce 100755
--- a/game-data-packager
+++ b/game-data-packager
@@ -6,9 +6,9 @@ set -u
if [ "$0" = "./game-data-packager" ]; then
GDP_UNINSTALLED=1
export GDP_UNINSTALLED
- PYTHONPATH="$(pwd)/lib"
+ PYTHONPATH="$(pwd)"
else
- PYTHONPATH=/usr/lib/game-data-packager
+ PYTHONPATH=/usr/share/games/game-data-packager
fi
export PYTHONPATH
diff --git a/lib/game_data_packager/__init__.py b/game_data_packager/__init__.py
similarity index 100%
rename from lib/game_data_packager/__init__.py
rename to game_data_packager/__init__.py
diff --git a/lib/game_data_packager/__main__.py b/game_data_packager/__main__.py
similarity index 100%
rename from lib/game_data_packager/__main__.py
rename to game_data_packager/__main__.py
diff --git a/lib/game_data_packager/check_syntax.py b/game_data_packager/check_syntax.py
similarity index 100%
rename from lib/game_data_packager/check_syntax.py
rename to game_data_packager/check_syntax.py
diff --git a/lib/game_data_packager/config.py b/game_data_packager/config.py
similarity index 100%
rename from lib/game_data_packager/config.py
rename to game_data_packager/config.py
diff --git a/lib/game_data_packager/games/__init__.py b/game_data_packager/games/__init__.py
similarity index 100%
rename from lib/game_data_packager/games/__init__.py
rename to game_data_packager/games/__init__.py
diff --git a/lib/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
similarity index 100%
rename from lib/game_data_packager/games/doom_common.py
rename to game_data_packager/games/doom_common.py
diff --git a/lib/game_data_packager/games/lgeneral.py b/game_data_packager/games/lgeneral.py
similarity index 100%
rename from lib/game_data_packager/games/lgeneral.py
rename to game_data_packager/games/lgeneral.py
diff --git a/lib/game_data_packager/games/quake.py b/game_data_packager/games/quake.py
similarity index 100%
rename from lib/game_data_packager/games/quake.py
rename to game_data_packager/games/quake.py
diff --git a/lib/game_data_packager/games/quake2.py b/game_data_packager/games/quake2.py
similarity index 100%
rename from lib/game_data_packager/games/quake2.py
rename to game_data_packager/games/quake2.py
diff --git a/lib/game_data_packager/games/rott.py b/game_data_packager/games/rott.py
similarity index 100%
rename from lib/game_data_packager/games/rott.py
rename to game_data_packager/games/rott.py
diff --git a/lib/game_data_packager/games/tyrian.py b/game_data_packager/games/tyrian.py
similarity index 100%
rename from lib/game_data_packager/games/tyrian.py
rename to game_data_packager/games/tyrian.py
diff --git a/lib/game_data_packager/games/wolf3d.py b/game_data_packager/games/wolf3d.py
similarity index 100%
rename from lib/game_data_packager/games/wolf3d.py
rename to game_data_packager/games/wolf3d.py
diff --git a/lib/game_data_packager/make_template.py b/game_data_packager/make_template.py
similarity index 100%
rename from lib/game_data_packager/make_template.py
rename to game_data_packager/make_template.py
diff --git a/lib/game_data_packager/paths.py b/game_data_packager/paths.py
similarity index 81%
rename from lib/game_data_packager/paths.py
rename to game_data_packager/paths.py
index abb80c5..6affc0f 100644
--- a/lib/game_data_packager/paths.py
+++ b/game_data_packager/paths.py
@@ -4,9 +4,7 @@ if os.environ.get('GDP_UNINSTALLED'):
CONFIG = './etc/game-data-packager.conf'
DATADIR = './out'
ETCDIR = './etc'
- LIBDIR = './lib'
else:
CONFIG = '/etc/game-data-packager.conf'
DATADIR = '/usr/share/games/game-data-packager'
ETCDIR = '/etc/game-data-packager'
- LIBDIR = '/usr/lib/game-data-packager'
diff --git a/lib/game_data_packager/util.py b/game_data_packager/util.py
similarity index 100%
rename from lib/game_data_packager/util.py
rename to game_data_packager/util.py
diff --git a/lib/game_data_packager/version.py b/game_data_packager/version.py
similarity index 100%
rename from lib/game_data_packager/version.py
rename to game_data_packager/version.py
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list