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 3c0fffd8b08251f759816464ea3605211090c69a Author: Alexandre Detiste <[email protected]> Date: Mon Apr 27 23:00:42 2015 +0200 merge doom2-masterlevels into main package --- data/doom2.yaml | 7 +++++-- debian/control | 20 +++----------------- debian/doom2-masterlevels.install | 1 - debian/doom2-masterlevels.manpages | 1 - debian/game-data-packager.install | 1 + debian/game-data-packager.manpages | 1 + debian/rules | 2 +- runtime/doom2-masterlevels.desktop | 1 + 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/data/doom2.yaml b/data/doom2.yaml index a0e21f6..ce65e23 100644 --- a/data/doom2.yaml +++ b/data/doom2.yaml @@ -30,7 +30,7 @@ packages: - doom2.wad doom2-nerve-wad: - longname: "No Rest for the Living" + longname: "Doom 2: No Rest for the Living" expansion_for: doom2-wad engine: prboom-plus | boom-engine steam: @@ -48,8 +48,11 @@ packages: id: 9160 path: "common/Master Levels of Doom" debian: - recommends: doom2-masterlevels + recommends: game-data-packager install_to: usr/share/games/doom + symlinks: + usr/share/games/doom/doom2-masterlevels-tryexec: + etc/alternatives/doom install: - attack.wad - blacktwr.wad diff --git a/debian/control b/debian/control index 6cd1f94..60f00e0 100644 --- a/debian/control +++ b/debian/control @@ -51,6 +51,9 @@ Suggests: unace-nonfree, # for Arx Fatalis unrar-nonfree, +# for Doom2 Master Levels launcher + python3-gi, + gir1.2-gtk-3.0, Architecture: all Multi-Arch: foreign Description: Installer for game data files @@ -86,20 +89,3 @@ Description: Installer for game data files * Tyrian * Wolfenstein 3D, Spear of Destiny and Return to Castle Wolfenstein -Package: doom2-masterlevels -Depends: chocolate-doom | doom-engine, - doom2-masterlevels-wad | game-data-packager, - python3, - python3-gi, - gir1.2-gtk-3.0, - ${python3:Depends}, - ${misc:Depends}, -Architecture: all -Multi-Arch: foreign -Description: graphical launcher for DOOM II Master Levels - This tool provides a graphical interface to - choose one of DOOM II's Master Levels, read its description - and start it with the engine of your choice. - . - This replicates the functionality of the doomit.exe utility - that was shipped with the game. diff --git a/debian/doom2-masterlevels.install b/debian/doom2-masterlevels.install deleted file mode 100644 index 0a313f1..0000000 --- a/debian/doom2-masterlevels.install +++ /dev/null @@ -1 +0,0 @@ -runtime/doom2-masterlevels.desktop usr/share/applications diff --git a/debian/doom2-masterlevels.manpages b/debian/doom2-masterlevels.manpages deleted file mode 100644 index b86947d..0000000 --- a/debian/doom2-masterlevels.manpages +++ /dev/null @@ -1 +0,0 @@ -doc/doom2-masterlevels.6 diff --git a/debian/game-data-packager.install b/debian/game-data-packager.install index 4fd7583..929bd83 100644 --- a/debian/game-data-packager.install +++ b/debian/game-data-packager.install @@ -13,3 +13,4 @@ out/bash_completion usr/share/games/game-data-packager out/changelog.gz usr/share/games/game-data-packager out/copyright usr/share/games/game-data-packager out/*.json usr/share/games/game-data-packager +runtime/doom2-masterlevels.desktop usr/share/applications diff --git a/debian/game-data-packager.manpages b/debian/game-data-packager.manpages index 39a2f89..84258bb 100644 --- a/debian/game-data-packager.manpages +++ b/debian/game-data-packager.manpages @@ -1 +1,2 @@ doc/game-data-packager.6 +doc/doom2-masterlevels.6 diff --git a/debian/rules b/debian/rules index 2842e11..7829031 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ override_dh_auto_clean: override_dh_install: dh_install echo 'GAME_PACKAGE_VERSION = """$(DEB_VERSION)"""' > debian/game-data-packager/usr/share/games/game-data-packager/game_data_packager/version.py - install -D -m755 runtime/doom2-masterlevels.py debian/doom2-masterlevels/usr/games/doom2-masterlevels + install -D -m755 runtime/doom2-masterlevels.py debian/game-data-packager/usr/games/doom2-masterlevels override_dh_installdocs: dh_installdocs -XTODO diff --git a/runtime/doom2-masterlevels.desktop b/runtime/doom2-masterlevels.desktop index cd3bd6a..b034e84 100644 --- a/runtime/doom2-masterlevels.desktop +++ b/runtime/doom2-masterlevels.desktop @@ -2,6 +2,7 @@ Name=Doom 2: Master Levels GenericName=First Person Shooter Game Exec=doom2-masterlevels +TryExec=/usr/share/games/doom/doom2-masterlevels-tryexec Icon=doom2 Terminal=false Type=Application -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
