[kernel] r10348 - in dists/trunk/firmware-nonfree/debian: . bin

[Bastian Blank]

Author: waldi
Date: Thu Jan 31 19:22:30 2008
New Revision: 10348

Log:
debian/bin/gencontrol.py, debian/changelog, debian/rules.real:
Drop udeb support. Request from d-i team.


Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/rules.real

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	(original)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Thu Jan 31 19:22:30 2008
@@ -87,7 +87,6 @@
         makeflags['PACKAGE'] = package
 
         binary = self.templates["control.binary"]
-        binary_udeb = self.templates["control.binary.udeb"]
         copyright = self.templates["copyright.binary"]
 
         vars['license'] = file("%s/LICENSE" % package).read()
@@ -118,7 +117,6 @@
             files_desc.append(" * %s, version %s" % (desc, version))
 
         packages_binary = self.process_packages(binary, vars)
-        packages_binary_udeb = self.process_packages(binary_udeb, vars)
 
         packages_binary[0]['Description'].append_pre(files_desc)
 
@@ -131,7 +129,6 @@
             file("debian/firmware-%s.postinst" % package, 'w').write(self.substitute(postinst, vars))
 
         packages.extend(packages_binary)
-        packages.extend(packages_binary_udeb)
 
         makefile.add('binary-indep', cmds = ["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
 

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	(original)
+++ dists/trunk/firmware-nonfree/debian/changelog	Thu Jan 31 19:22:30 2008
@@ -6,6 +6,7 @@
   [ Bastian Blank ]
   * Update iwl4965 firmware, version 4.44.1.20. (closes: #463052)
   * Updating to 2.6.24-1.
+  * Drop udeb support.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 31 Jan 2008 20:19:15 +0100
 

Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real	(original)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Thu Jan 31 19:22:30 2008
@@ -14,8 +14,7 @@
 binary-indep: install
 
 install: PACKAGE_NAME = firmware-$(PACKAGE)
-install: PACKAGE_NAME_UDEB = firmware-$(PACKAGE)-di
-install: DH_OPTIONS = -p$(PACKAGE_NAME) -p$(PACKAGE_NAME_UDEB)
+install: DH_OPTIONS = -p$(PACKAGE_NAME)
 install:
 	dh_testdir
 	dh_testroot
@@ -24,8 +23,6 @@
 	  d=/lib/firmware/"$${i#*:}"; \
 	  echo install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
 	  install -m644 -D "$$s" debian/$(PACKAGE_NAME)"$$d"; \
-	  echo install -m644 -D "$$s" debian/$(PACKAGE_NAME_UDEB)"$$d"; \
-	  install -m644 -D "$$s" debian/$(PACKAGE_NAME_UDEB)"$$d"; \
 	done
 	@if [ -e debian/$(PACKAGE_NAME).hook.initramfs-tools ]; then \
 	  echo install -D debian/$(PACKAGE_NAME).hook.initramfs-tools debian/$(PACKAGE_NAME)/usr/share/initramfs-tools/hooks/firmware_$(PACKAGE); \