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 69745870ccd440bd89cef9f8f8d3759d2ea89d9c Author: Alexandre Detiste <[email protected]> Date: Sat Feb 13 23:38:07 2016 +0100 rpm: merge & unroll "conflicts" & "breaks" sets --- game_data_packager/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game_data_packager/build.py b/game_data_packager/build.py index 5c61367..d2a91b9 100644 --- a/game_data_packager/build.py +++ b/game_data_packager/build.py @@ -1403,7 +1403,7 @@ class PackagingTask(object): for p in self.__merge_relations(package, 'depends'): spec.write('Requires: %s\n' % p) - for p in (self.__merge_relations(package, 'conflicts'), + for p in (self.__merge_relations(package, 'conflicts') | self.__merge_relations(package, 'breaks')): spec.write('Conflicts: %s\n' % p) -- 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
