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 8433ded176db16cea9f315a79cca1dba5bfd11ff Author: Alexandre Detiste <[email protected]> Date: Wed Jan 21 22:19:56 2015 +0100 move conflicts: from .control files into yaml some where already copied into yaml; so the extraneous copy has been removed. when "debian: replace:" is present in a yaml; the same value is _also_ added to "control['Conflicts']" --- data/doom-common.control.in | 2 -- data/doom.yaml | 1 + data/doom2.yaml | 1 + data/final-doom.yaml | 2 ++ data/rott-data.control.in | 2 -- data/rott-extreme-data.control.in | 2 -- data/rott-registered-data.control.in | 2 -- data/wolf3d-demo-data.control.in | 2 -- 8 files changed, 4 insertions(+), 10 deletions(-) diff --git a/data/doom-common.control.in b/data/doom-common.control.in index 2bd5c63..a302f77 100644 --- a/data/doom-common.control.in +++ b/data/doom-common.control.in @@ -1,5 +1,3 @@ -Provides: doom-wad -Conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4) Description: IWAD from ID Software's "LONG" computer game Doom requires both a doom-engine and a doom-wad to play. This package contains the IWAD from ID Software's game "LONG" diff --git a/data/doom.yaml b/data/doom.yaml index b8b36f1..e19492c 100644 --- a/data/doom.yaml +++ b/data/doom.yaml @@ -24,6 +24,7 @@ packages: doom-wad: debian: engine: "chocolate-doom | doom-engine" + conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4) install_to: usr/share/games/doom longname: Doom install: diff --git a/data/doom2.yaml b/data/doom2.yaml index 537b8c5..d73a910 100644 --- a/data/doom2.yaml +++ b/data/doom2.yaml @@ -19,6 +19,7 @@ packages: debian: engine: "chocolate-doom | doom-engine" provides: doom-wad + conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4) install_to: usr/share/games/doom install: - doom2.wad diff --git a/data/final-doom.yaml b/data/final-doom.yaml index 8ac4fa3..0f66c9f 100644 --- a/data/final-doom.yaml +++ b/data/final-doom.yaml @@ -19,6 +19,7 @@ packages: debian: engine: "chocolate-doom | doom-engine" provides: doom-wad + conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4) install: - tnt.wad install_to: usr/share/games/doom @@ -28,6 +29,7 @@ packages: debian: engine: "chocolate-doom | doom-engine" provides: doom-wad + conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4) install: - plutonia.wad install_to: usr/share/games/doom diff --git a/data/rott-data.control.in b/data/rott-data.control.in index f95e1b7..903de3a 100644 --- a/data/rott-data.control.in +++ b/data/rott-data.control.in @@ -1,5 +1,3 @@ -Conflicts: rott (<< 1.1.1-4) -Replaces: rott (<< 1.1.1-4) Description: Game data for Rise of the Triad Rise of the Triad requires game data to play. This package contains the game data from the shareware episode of Rise of the Triad and diff --git a/data/rott-extreme-data.control.in b/data/rott-extreme-data.control.in index f8badca..9e74abd 100644 --- a/data/rott-extreme-data.control.in +++ b/data/rott-extreme-data.control.in @@ -1,5 +1,3 @@ -Conflicts: rott (<< 1.1.1-4) -Replaces: rott (<< 1.1.1-4) Description: Extreme Rise of the Triad These are extra levels for "Rise of the Triad". This package was generated using the "game-data-packager" program. diff --git a/data/rott-registered-data.control.in b/data/rott-registered-data.control.in index fb4799e..d2b80f6 100644 --- a/data/rott-registered-data.control.in +++ b/data/rott-registered-data.control.in @@ -1,5 +1,3 @@ -Conflicts: rott (<< 1.1.1-4) -Replaces: rott (<< 1.1.1-4) Description: Game data for Rise of the Triad: Dark War Rise of the Triad requires game data to play. This package contains the extra episodes from the commercial edition of Rise of the Triad diff --git a/data/wolf3d-demo-data.control.in b/data/wolf3d-demo-data.control.in index 59362ee..17fed58 100644 --- a/data/wolf3d-demo-data.control.in +++ b/data/wolf3d-demo-data.control.in @@ -1,5 +1,3 @@ -Conflicts: wolf3d-data-wl1 -Replaces: wolf3d-data-wl1 Description: Game data for Wolfenstein 3D Wolfenstein 3D requires game data to play. This package contains the game data from the shareware episode of Wolfenstein 3D and -- 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
