[kernel] r14382 - in dists/trunk/firmware-nonfree: . debian debian/bin debian/templates linux linux-nonfree

[Ben Hutchings]

Author: benh
Date: Wed Oct 14 01:43:19 2009
New Revision: 14382

Log:
Make firmware-linux a metapackage and move previous contents to firmware-linux-nonfree

Added:
   dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in
      - copied unchanged from r13936, dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in
   dists/trunk/firmware-nonfree/linux-nonfree/
      - copied from r14381, dists/trunk/firmware-nonfree/linux/
Deleted:
   dists/trunk/firmware-nonfree/linux/
Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/defines

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Tue Oct 13 19:50:51 2009	(r14381)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Wed Oct 14 01:43:19 2009	(r14382)
@@ -143,6 +143,7 @@
         makefile = Makefile()
 
         self.do_source(packages)
+        self.do_meta(packages, makefile)
         self.do_main(packages, makefile)
 
         self.write(packages, makefile)
@@ -152,6 +153,26 @@
         packages['source'] = self.process_package(source[0], ())
         packages['source']['Build-Depends'].append('linux-support-%s' % self.kernelversion)
 
+    def do_meta(self, packages, makefile):
+        config_entry = self.config['base',]
+        vars = {}
+        vars.update(config_entry)
+
+        for entry in self.templates["control.binary.meta"]:
+            package_binary = self.process_package(entry, {})
+            assert package_binary['Package'].startswith('firmware-')
+            package = package_binary['Package'].replace('firmware-', '')
+
+            f = open('debian/copyright.meta')
+            file("debian/firmware-%s.copyright" % package, 'w').write(f.read())
+
+            makeflags = MakeFlags()
+            makeflags['FILES'] = ''
+            makeflags['PACKAGE'] = package
+            makefile.add('binary-indep', cmds = ["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
+
+            packages.append(package_binary)
+
     def do_main(self, packages, makefile):
         config_entry = self.config['base',]
         vars = {}

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	Tue Oct 13 19:50:51 2009	(r14381)
+++ dists/trunk/firmware-nonfree/debian/changelog	Wed Oct 14 01:43:19 2009	(r14382)
@@ -1,8 +1,13 @@
 firmware-nonfree (0.19) UNRELEASED; urgency=low
 
+  [ dann frazier ]
   * Correct 'Homepage' control data for firmware-bnx2 and firmware-bnx2x
     (closes: #546899)
 
+  [ Ben Hutchings ]
+  * Make firmware-linux a metapackage and move previous contents to
+    firmware-linux-nonfree
+
  -- dann frazier <dannf at debian.org>  Wed, 16 Sep 2009 16:34:59 -0600
 
 firmware-nonfree (0.18) unstable; urgency=low

Copied: dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in (from r13936, dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in	Wed Oct 14 01:43:19 2009	(r14382, copy of r13936, dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in)
@@ -0,0 +1,7 @@
+Package: firmware-linux
+Architecture: all
+Depends: firmware-linux-free, firmware-linux-nonfree (= ${binary:Version})
+Description: Binary firmware for various drivers in the Linux kernel
+ This package depends on both free and non-free firmware which was
+ previously included in the Linux kernel.
+

Modified: dists/trunk/firmware-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/defines	Tue Oct 13 19:50:51 2009	(r14381)
+++ dists/trunk/firmware-nonfree/defines	Wed Oct 14 01:43:19 2009	(r14382)
@@ -5,6 +5,6 @@
  ipw2x00
  ivtv
  iwlwifi
- linux
+ linux-nonfree
  qlogic
  ralink