[Collab-qa-commits] r243 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-21 07:40:55 +0000 (Thu, 21 Jun 2007)
New Revision: 243

Modified:
   fileconflicts/unstable-whitelist
Log:
lets convert some to the new whitelist layout

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-21 07:39:10 UTC (rev 242)
+++ fileconflicts/unstable-whitelist	2007-06-21 07:40:55 UTC (rev 243)
@@ -11,46 +11,34 @@
 mesa-common-dev
 nvidia-glx-legacy-dev
 nvidia-glx-dev
-amd64-libs-dev
-lib64bz2-dev
-nvidia-glx-dev
-nvidia-glx-legacy-dev
+amd64-libs-dev:lib64bz2-dev
+nvidia-glx-dev:nvidia-glx-legacy-dev
 runit-run
 sysvinit
 amavis-ng-milter-helper
 amavisd-new-milter
 bnetd
 pvpgn
-festvox-rablpc16k
-festvox-rablpc8k
-lesstif-bin
-libmotif-dev
+festvox-rablpc16k:festvox-rablpc8k
+lesstif-bin:libmotif-dev
 nvidia-kernel-2.6.18-3-486
 nvidia-kernel-legacy-2.6.18-3-486
-nvidia-glx
-nvidia-glx-legacy
-exim4-daemon-heavy-dbg
-exim4-daemon-light-dbg
-ggz-game-servers
-ggzd
+nvidia-glx:nvidia-glx-legacy
+exim4-daemon-heavy-dbg:exim4-daemon-light-dbg
+ggz-game-servers:ggzd
 x11proto-gl-dev
 nvidia-glx-legacy-dev
 cmap-adobe-cns1
 xpdf-chinese-traditional
-liblzo-dev
-liblzo2-dev
-finger
-finger-ldap
+liblzo-dev:liblzo2-dev
+finger:finger-ldap
 libtk-filedialog-perl
 horae
-libalps-light1
-libalps1
-dtc
-dtc-postfix-courier
+libalps-light1:libalps1
+dtc:dtc-postfix-courier
 dclock
 ivtools-bin
-crafty-books-medium
-crafty-books-small
+crafty-books-medium:crafty-books-small
 crafty-books-medtosmall
 cdecl
 cutils
@@ -58,8 +46,7 @@
 xpdf-japanese
 amd64-libs
 lib64bz2-1.0
-nvidia-kernel-2.6.18-3-k7
-nvidia-kernel-legacy-2.6.18-3-k7
+nvidia-kernel-2.6.18-3-k7:nvidia-kernel-legacy-2.6.18-3-k7
 gnome-applets-data
 trashapplet
 lesstif-bin
@@ -68,8 +55,7 @@
 smstools
 pimppa
 parmetis-test
-dbmail-mysql
-dbmail-pgsql
+dbmail-mysql:dbmail-pgsql
 libsablevm-classlib1-java
 libsablevm-native1
 nvidia-kernel-2.6.18-3-686