[Collab-qa-commits] r245 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-21 08:13:57 +0000 (Thu, 21 Jun 2007)
New Revision: 245

Modified:
   fileconflicts/testing-whitelist
Log:
.. testing 

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-06-21 08:10:46 UTC (rev 244)
+++ fileconflicts/testing-whitelist	2007-06-21 08:13:57 UTC (rev 245)
@@ -4,59 +4,42 @@
 cutils
 dclock
 ivtools-bin
-finger
-finger-ldap
+finger:finger-ldap
 g++
 pentium-builder
 loop-aes-utils
 mount
-runit
-runit-run
+runit:runit-run
 xmms:xmms-mpg123-ja
-amd64-libs-dev
-lib64bz2-dev
+amd64-libs-dev:lib64bz2-dev
 bnetd
 pvpgn
 mesa-common-dev
-nvidia-glx-legacy-dev
-nvidia-glx-dev
-nvidia-glx-dev
-nvidia-glx-legacy-dev
-festvox-rablpc16k
-festvox-rablpc8k
-exim4-daemon-heavy-dbg
-exim4-daemon-light-dbg
-x11proto-gl-dev
-nvidia-glx-legacy-dev
-cmap-adobe-cns1
-xpdf-chinese-traditional
-liblzo-dev
-liblzo2-dev
+nvidia-glx-legacy-dev:nvidia-glx-dev
+nvidia-glx-dev:nvidia-glx-legacy-dev
+festvox-rablpc16k:festvox-rablpc8k
+exim4-daemon-heavy-dbg:exim4-daemon-light-dbg
+x11proto-gl-dev:nvidia-glx-legacy-dev
+cmap-adobe-cns1:xpdf-chinese-traditional
+liblzo-dev:liblzo2-dev
 libtk-filedialog-perl
 horae
-libalps-light1
-libalps1
-crafty-books-medium
-crafty-books-small
+libalps-light1:libalps1
+crafty-books-medium:crafty-books-small
 crafty-books-medtosmall
 cmap-adobe-japan1
 xpdf-japanese
-amd64-libs
-lib64bz2-1.0
-nvidia-kernel-2.6.18-3-k7
-nvidia-kernel-legacy-2.6.18-3-k7
+amd64-libs:lib64bz2-1.0
+nvidia-kernel-2.6.18-3-k7:nvidia-kernel-legacy-2.6.18-3-k7
 gnome-applets-data
 trashapplet
 gnokii-smsd
 smstools
 pimppa
 parmetis-test
-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
+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
 nvidia-kernel-2.6.18-4-486
 nvidia-kernel-legacy-2.6.18-4-486
 nvidia-kernel-2.6.18-4-k7
@@ -67,6 +50,5 @@
 nvidia-glx-legacy:nvidia-glx
 sun-java5-fonts:sun-java6-fonts
 mediawiki1.7-math:mediawiki1.9-math
-git-completion 
-stgit
+git-completion:tgit
 debreaper