This is an automated email from the git hooks/post-receive script. detiste-guest pushed a commit to branch master in repository game-data-packager.
commit 83d743be7ccebdcce60b57a25b1b9ebce4e3e9c3 Author: Alexandre Detiste <[email protected]> Date: Sat Feb 13 23:25:15 2016 +0100 conflicts against old freedoom are always Debian-only --- data/doom2.yaml | 4 ++-- data/final-doom.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/doom2.yaml b/data/doom2.yaml index e15cb57..175f447 100644 --- a/data/doom2.yaml +++ b/data/doom2.yaml @@ -21,8 +21,8 @@ packages: langs: [en,fr] provides: doom-wad conflicts: - - "freedoom (<< 0.6.4-4)" - - "freedm (<< 0.6.4-4)" + - deb: "freedoom (<< 0.6.4-4)" + - deb: "freedm (<< 0.6.4-4)" steam: id: 2300 path: "common/Doom 2" diff --git a/data/final-doom.yaml b/data/final-doom.yaml index 9f46c8b..2734a0c 100644 --- a/data/final-doom.yaml +++ b/data/final-doom.yaml @@ -27,8 +27,8 @@ packages: aliases: [tnt, t] provides: doom-wad conflicts: - - "freedoom (<< 0.6.4-4)" - - "freedm (<< 0.6.4-4)" + - deb: "freedoom (<< 0.6.4-4)" + - deb: "freedm (<< 0.6.4-4)" install: - tnt.wad - tnt31.wad @@ -43,8 +43,8 @@ packages: aliases: [plutonia, p] provides: doom-wad conflicts: - - "freedoom (<< 0.6.4-4)" - - "freedm (<< 0.6.4-4)" + - deb: "freedoom (<< 0.6.4-4)" + - deb: "freedm (<< 0.6.4-4)" install: - plutonia.wad doc: -- 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
