rpms/fedora-package-config-apt/F-8 fedora.conf, 1.3, 1.4 fedora-extras.list, 1.1, NONE

[Axel Thimm (athimm)]

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-apt/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6014/fedora-package-config-apt/F-8

Modified Files:
	fedora.conf 
Removed Files:
	fedora-extras.list 
Log Message:
Sync fixes across releases, simplify switching to and from rawhide, (prepare for GA)


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-8/fedora.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora.conf	23 Nov 2006 17:28:16 -0000	1.3
+++ fedora.conf	22 Mar 2008 13:56:03 -0000	1.4
@@ -20,7 +20,7 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^kernel(|-suspend2|-tuxonice)(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
     "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };


--- fedora-extras.list DELETED ---