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

[Ben Hutchings]

Author: benh
Date: Wed Jul 15 02:21:41 2009
New Revision: 13936

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

Added:
   dists/trunk/firmware-nonfree/debian/copyright.meta
   dists/trunk/firmware-nonfree/debian/templates/control.binary.meta.in
   dists/trunk/firmware-nonfree/linux-nonfree/
      - copied from r13934, dists/trunk/firmware-nonfree/linux/
Replaced:
   dists/trunk/firmware-nonfree/linux-nonfree/matrox/g200_warp.fw
      - copied unchanged from r13935, dists/trunk/firmware-nonfree/linux/matrox/g200_warp.fw
   dists/trunk/firmware-nonfree/linux-nonfree/matrox/g400_warp.fw
      - copied unchanged from r13935, dists/trunk/firmware-nonfree/linux/matrox/g400_warp.fw
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	Wed Jul 15 01:39:32 2009	(r13935)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Wed Jul 15 02:21:41 2009	(r13936)
@@ -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	Wed Jul 15 01:39:32 2009	(r13935)
+++ dists/trunk/firmware-nonfree/debian/changelog	Wed Jul 15 02:21:41 2009	(r13936)
@@ -7,6 +7,8 @@
   
   [ 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
 
  -- maximilian attems <maks at debian.org>  Wed, 01 Jul 2009 11:11:48 +0200
 

Added: dists/trunk/firmware-nonfree/debian/copyright.meta
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/firmware-nonfree/debian/copyright.meta	Wed Jul 15 02:21:41 2009	(r13936)
@@ -0,0 +1,23 @@
+Copyright:
+
+    Copyright 2006-2009 Bastian Blank <waldi at debian.org>
+    Copyright 2009 Ben Hutchings <ben at decadent.org.uk>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

Added: 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 Jul 15 02:21:41 2009	(r13936)
@@ -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	Wed Jul 15 01:39:32 2009	(r13935)
+++ dists/trunk/firmware-nonfree/defines	Wed Jul 15 02:21:41 2009	(r13936)
@@ -5,6 +5,6 @@
  ipw2x00
  ivtv
  iwlwifi
- linux
+ linux-nonfree
  qlogic
  ralink

Copied: dists/trunk/firmware-nonfree/linux-nonfree/matrox/g200_warp.fw (from r13935, dists/trunk/firmware-nonfree/linux/matrox/g200_warp.fw)
==============================================================================
Binary file (source and/or target). No diff available.

Copied: dists/trunk/firmware-nonfree/linux-nonfree/matrox/g400_warp.fw (from r13935, dists/trunk/firmware-nonfree/linux/matrox/g400_warp.fw)
==============================================================================
Binary file (source and/or target). No diff available.