rpms/fedora-package-config-apt/F-8 fedora-package-config-apt.spec, 1.6, 1.7 fedora.conf, 1.4, 1.5

[Axel Thimm]

Author: athimm

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

Modified Files:
	fedora-package-config-apt.spec fedora.conf 
Log Message:
Add debug kernel, fix licensing.


Index: fedora-package-config-apt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-8/fedora-package-config-apt.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-package-config-apt.spec	16 Nov 2007 06:40:06 -0000	1.6
+++ fedora-package-config-apt.spec	25 Aug 2008 12:15:07 -0000	1.7
@@ -1,8 +1,11 @@
 Summary: Fedora configuration files for the apt-rpm package manager
 Name: fedora-package-config-apt
 Version: 8
-Release: 1
-License: GPL
+Release: 2
+# Nothing in here has copyright, much less license attribution, however,
+# since this is "upstream", we'll take this statement as the author's intent,
+# and use GPL+ here (since no version is specified).
+License: GPL+
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 
@@ -62,6 +65,9 @@
 
 
 %changelog
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 9.89-2
+- fix license tag
+
 * Fri Nov 16 2007 Panu Matilainen <pmatilai at redhat.com> - 8.1
 - Update URL's for F8
 - Add separate sourcelist for development repository (disabled)


Index: fedora.conf
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-apt/F-8/fedora.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora.conf	22 Mar 2008 13:56:03 -0000	1.4
+++ fedora.conf	25 Aug 2008 12:15:07 -0000	1.5
@@ -20,13 +20,13 @@
   Order "true";
   // Allow multiple kernel and kernel-related packages to be installed
   Allow-Duplicated {
-    "^kernel(|-suspend2|-tuxonice)(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
-    "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
+    "^kernel(|-suspend2|-tuxonice)(-(debug|hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+    "^(GFS|cman|dlm|gnbd)-kernel(-(debug|hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
     "^kmod-.+$";
   };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade {
-  //  "^kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
+  //  "^kernel(-(debug|hugemem|kdump|smp|xen|xen[0U]|PAE))?(-devel)?$";
   //  "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen|xen[0U]|PAE))?$";
   //  "^kmod-.+$";
   //  "^gpg-pubkey$";