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 25c5e06ed7552f6154ba9d58e11d6e7c29ef4a9b Author: Simon McVittie <[email protected]> Date: Thu Apr 30 09:55:25 2015 +0100 Add provides/conflicts/replaces for packages that had a -full- version in v40 --- data/descent1.yaml | 6 ++++-- data/descent2.yaml | 4 ++++ data/theme-hospital.yaml | 6 ++++-- data/wolf3d.yaml | 7 ++++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/data/descent1.yaml b/data/descent1.yaml index ccf762a..72306ed 100644 --- a/data/descent1.yaml +++ b/data/descent1.yaml @@ -8,7 +8,7 @@ packages: descent1-demo-data: demo_for: descent1-data debian: - conflicts: descent1-data + conflicts: [descent1-full-data, descent1-data] install: - descent.hog - descent.pig @@ -20,7 +20,9 @@ packages: descent1-data: debian: - conflicts: descent1-demo-data + conflicts: [descent1-full-data, descent1-demo-data] + provides: descent1-full-data + replaces: descent1-full-data gog: # http://www.gog.com/game/${url} url: descent_1_descent_2 diff --git a/data/descent2.yaml b/data/descent2.yaml index 0284816..2c808f8 100644 --- a/data/descent2.yaml +++ b/data/descent2.yaml @@ -18,6 +18,10 @@ packages: descent2-data: gog: url: descent_1_descent_2 + debian: + conflicts: descent2-full-data + provides: descent2-full-data + replaces: descent2-full-data install: - alien1.pig - alien2.pig diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml index 82e2705..055a9c1 100644 --- a/data/theme-hospital.yaml +++ b/data/theme-hospital.yaml @@ -18,7 +18,9 @@ help_text: | packages: theme-hospital-data: debian: - conflicts: theme-hospital-demo-data + conflicts: [theme-hospital-demo-data, theme-hospital-full-data] + provides: theme-hospital-full-data + replaces: theme-hospital-full-data gog: url: theme_hospital origin: @@ -494,7 +496,7 @@ packages: install_to: usr/share/games/theme-hospital demo_for: theme-hospital-data debian: - conflicts: theme-hospital-data + conflicts: [theme-hospital-data, theme-hospital-full-data] install: - anims/winlevel.smk_demo - data/award03v.dat diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml index c391969..fc4b99c 100644 --- a/data/wolf3d.yaml +++ b/data/wolf3d.yaml @@ -30,7 +30,7 @@ packages: better_version: wolf3d-v14-data debian: provides: wolf3d-data - conflicts: wolf3d-v14-data + conflicts: [wolf3d-v14-data, wolf3d-full-v14-data, wolf3d-full-v12-data] install_to: usr/share/games/wolf3d install: - audiohed.wl6_1.0 @@ -45,8 +45,9 @@ packages: wolf3d-v14-data: longname: Wolfenstein 3D v1.4 debian: - provides: wolf3d-data - conflicts: wolf3d-v12-data + provides: [wolf3d-data, wolf3d-full-v14-data] + conflicts: [wolf3d-v12-data, wolf3d-full-v12-data, wolf3d-full-v14-data] + replaces: wolf3d-full-v14-data steam: id: 2270 path: common/Wolfenstein 3D -- 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
