[Collab-qa-commits] r238 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-18 10:24:43 +0000 (Mon, 18 Jun 2007)
New Revision: 238

Modified:
   fileconflicts/testing-whitelist
Log:
lets check out new whitelist format here aswell

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-06-18 10:22:48 UTC (rev 237)
+++ fileconflicts/testing-whitelist	2007-06-18 10:24:43 UTC (rev 238)
@@ -1,7 +1,5 @@
-unace
-unace-nonfree
-bitchx
-bitchx-ssl
+unace:unace-nonfree
+bitchx:bitchx-ssl
 cdecl
 cutils
 dclock
@@ -14,8 +12,7 @@
 mount
 runit
 runit-run
-xmms
-xmms-mpg123-ja
+xmms:xmms-mpg123-ja
 amd64-libs-dev
 lib64bz2-dev
 bnetd
@@ -66,14 +63,10 @@
 nvidia-kernel-legacy-2.6.18-4-k7
 nvidia-kernel-2.6.18-4-686
 nvidia-kernel-legacy-2.6.18-4-686
-libc6-i686
-libc6-xen
-nvidia-glx-legacy
-nvidia-glx
-sun-java5-fonts
-sun-java6-fonts
-mediawiki1.7-math
-mediawiki1.9-math
+libc6-i686:libc6-xen
+nvidia-glx-legacy:nvidia-glx
+sun-java5-fonts:sun-java6-fonts
+mediawiki1.7-math:mediawiki1.9-math
 git-completion 
 stgit
 debreaper