[Collab-qa-commits] r260 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-07-01 18:17:45 +0000 (Sun, 01 Jul 2007)
New Revision: 260

Modified:
   fileconflicts/unstable-whitelist
Log:
some more usage of new whitelist format

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-27 12:21:05 UTC (rev 259)
+++ fileconflicts/unstable-whitelist	2007-07-01 18:17:45 UTC (rev 260)
@@ -8,91 +8,60 @@
 erlang-manpages:erlang-x11
 gstreamer0.10-plugins-bad:gstreamer0.10-plugins-good 
 erlang-manpages:erlang-nox
-nvidia-glx:nvidia-glx-legacy-96xx:nvidia-glx-legacy-71xx
+nvidia-glx:nvidia-glx-legacy-96xx
+nvidia-glx:nvidia-glx-legacy-71xx
 cyrus-sasl2-dbg:cyrus-sasl2-heimdal-dbg
-loop-aes-utils
-mount
-mesa-common-dev
-nvidia-glx-legacy-dev
-nvidia-glx-dev
+loop-aes-utils:mount
+nvidia-glx-legacy-dev:nvidia-glx-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
+runit-run:sysvinit
+amavis-ng-milter-helper:amavisd-new-milter
+bnetd:pvpgn
 festvox-rablpc16k:festvox-rablpc8k
 lesstif-bin:libmotif-dev
-nvidia-kernel-2.6.18-3-486
-nvidia-kernel-legacy-2.6.18-3-486
+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
-x11proto-gl-dev
-nvidia-glx-legacy-dev
-cmap-adobe-cns1
-xpdf-chinese-traditional
+x11proto-gl-dev:nvidia-glx-legacy-dev
+cmap-adobe-cns1:xpdf-chinese-traditional
 liblzo-dev:liblzo2-dev
 finger:finger-ldap
 libtk-filedialog-perl
-horae
 libalps-light1:libalps1
 dtc:dtc-postfix-courier
-dclock
-ivtools-bin
+dclock:ivtools-bin
 crafty-books-medium:crafty-books-small
 crafty-books-medtosmall
-cdecl
-cutils
+cdecl:cutils
 cmap-adobe-japan1
 xpdf-japanese
-amd64-libs
-lib64bz2-1.0
+amd64-libs:lib64bz2-1.0
 nvidia-kernel-2.6.18-3-k7:nvidia-kernel-legacy-2.6.18-3-k7
-gnome-applets-data
-trashapplet
-lesstif-bin
-motif-clients
-gnokii-smsd
-smstools
-pimppa
-parmetis-test
+gnome-applets-data:trashapplet
+lesstif-bin:motif-clients
+gnokii-smsd:smstools
+pimppa:parmetis-test
 dbmail-mysql:dbmail-pgsql
 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
+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
-nvidia-kernel-2.6.18-4-486
-nvidia-kernel-legacy-2.6.18-4-486
-nvidia-kernel-2.6.18-4-k7
-nvidia-kernel-legacy-2.6.18-4-k7
-nvidia-kernel-2.6.18-4-686
-nvidia-kernel-legacy-2.6.18-4-686
-dvipsk-ja
-texlive-chemistry
-texlive-science 
-texlive-extra-utils
-texlive-pdfetex
-texlive-pstricks
-texlive-latex-recommended
-texlive-generic-extra
+nvidia-kernel-2.6.18-4-486:nvidia-kernel-legacy-2.6.18-4-486
+nvidia-kernel-2.6.18-4-k7:nvidia-kernel-legacy-2.6.18-4-k7
+nvidia-kernel-2.6.18-4-686:nvidia-kernel-legacy-2.6.18-4-686
+dvipsk-ja:texlive-chemistry
+texlive-science:texlive-extra-utils
+texlive-pdfetex:texlive-pstricks
+texlive-latex-recommended:texlive-generic-extra
 mediawiki1.7-math:mediawiki1.9-math
-capplets-data
-libgnomekbd-common
-basket
-gcpegg
-debreaper
-libgnomeui-0
-git-completion
-stgit
-gij-4.1
-libgcj7-0
+capplets-data:libgnomekbd-common
+basket:gcpegg
+debreaper:libgnomeui-0
+git-completion:stgit
+gij-4.1:libgcj7-0
 libcunit1-dev:libcunit1-ncurses-dev
 libtododb-dev:libtododb0-dev
 libqt0-ruby1.8:libqt4-ruby1.8