[Collab-qa-commits] r244 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-21 08:10:46 +0000 (Thu, 21 Jun 2007)
New Revision: 244

Modified:
   fileconflicts/unstable-whitelist
Log:
some more new whitelist formats, im going to break this all badly just before is tart over to have fun at the southside festival

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-21 07:40:55 UTC (rev 243)
+++ fileconflicts/unstable-whitelist	2007-06-21 08:10:46 UTC (rev 244)
@@ -56,16 +56,14 @@
 pimppa
 parmetis-test
 dbmail-mysql:dbmail-pgsql
-libsablevm-classlib1-java
-libsablevm-native1
+libsablevm-classlib1-java:libsablevm-native1
 nvidia-kernel-2.6.18-3-686
 nvidia-kernel-legacy-2.6.18-3-686
 cmap-adobe-gb1
 xpdf-chinese-simplified
 openmpi-dev
 pgapack
-sun-java5-fonts
-sun-java6-fonts
+sun-java5-fonts:sun-java6-fonts
 nvidia-kernel-2.6.18-4-486
 nvidia-kernel-legacy-2.6.18-4-486
 nvidia-kernel-2.6.18-4-k7
@@ -80,8 +78,7 @@
 texlive-pstricks
 texlive-latex-recommended
 texlive-generic-extra
-mediawiki1.7-math
-mediawiki1.9-math
+mediawiki1.7-math:mediawiki1.9-math
 capplets-data
 libgnomekbd-common
 basket
@@ -92,14 +89,10 @@
 stgit
 gij-4.1
 libgcj7-0
-libcunit1-dev
-libcunit1-ncurses-dev
-libtododb-dev 
-libtododb0-dev
-libqt0-ruby1.8
-libqt4-ruby1.8
-libasm-dev
-libelfsh0-dev
+libcunit1-dev:libcunit1-ncurses-dev
+libtododb-dev:libtododb0-dev
+libqt0-ruby1.8:libqt4-ruby1.8
+libasm-dev:libelfsh0-dev
 manpages-tr
 libblitz0
 libufsparse-dbg