[game-data-packager] 08/11: jedi-academy-demo-data: be co-installable with jedi-academy-data

[Simon McVittie]

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 af3af527c524ad69a08fc45a3e49862c938bc487
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 31 10:11:40 2015 +0100

    jedi-academy-demo-data: be co-installable with jedi-academy-data
---
 data/ja.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/data/ja.yaml b/data/ja.yaml
index e359b19..32146b9 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -42,9 +42,7 @@ packages:
   jedi-academy-demo-data:
     engine: openjk-academy
     demo_for: jedi-academy-data
-    debian:
-      conflicts: jedi-academy-data
-    install_to: usr/share/games/jedi-academy-data/base
+    install_to: usr/share/games/jedi-academy-demo/base
     install:
     - assets0.pk3_demo
     optional:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git