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

[Bastian Blank]

Author: waldi
Date: Tue Sep  1 23:06:33 2009
New Revision: 14198

Log:
Revert linux-nonfree introduction.

Added:
   dists/trunk/firmware-nonfree/linux/
      - copied from r14197, dists/trunk/firmware-nonfree/linux-nonfree/
Deleted:
   dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in
   dists/trunk/firmware-nonfree/linux-nonfree/
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 Sep  1 22:59:17 2009	(r14197)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Tue Sep  1 23:06:33 2009	(r14198)
@@ -143,7 +143,6 @@
         makefile = Makefile()
 
         self.do_source(packages)
-        self.do_meta(packages, makefile)
         self.do_main(packages, makefile)
 
         self.write(packages, makefile)
@@ -153,26 +152,6 @@
         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 Sep  1 22:59:17 2009	(r14197)
+++ dists/trunk/firmware-nonfree/debian/changelog	Tue Sep  1 23:06:33 2009	(r14198)
@@ -7,8 +7,6 @@
   
   [ Ben Hutchings ]
   * Fix Matrox G200/G400/G550 firmware image format (closes: #531367)
-  * Make firmware-linux a metapackage and move previous contents to
-    firmware-linux-nonfree
   * Add Broadcom Tigon3 firmware for use with tg3 driver (closes: 543233)
   * Add QLogic IBA7220 serdes firmware for use with ip_iband driver
   * Add Chelsio T3 firmware for use with cxgb3 driver

Modified: dists/trunk/firmware-nonfree/defines
==============================================================================
--- dists/trunk/firmware-nonfree/defines	Tue Sep  1 22:59:17 2009	(r14197)
+++ dists/trunk/firmware-nonfree/defines	Tue Sep  1 23:06:33 2009	(r14198)
@@ -5,6 +5,6 @@
  ipw2x00
  ivtv
  iwlwifi
- linux-nonfree
+ linux
  qlogic
  ralink