[kernel] r6553 - in people/fs/firmware-0.1/debian: .

[Frederik Schüler]

Author: fs
Date: Wed May 10 12:03:11 2006
New Revision: 6553

Removed:
   people/fs/firmware-0.1/debian/control
Modified:
   people/fs/firmware-0.1/debian/rules
   people/fs/firmware-0.1/debian/templates/control.binary.in
   people/fs/firmware-0.1/debian/templates/control.binary.udeb.in

Log:
remove control file.
remove debconf dependency.
do not put the copyright file into the udebs.


Modified: people/fs/firmware-0.1/debian/rules
==============================================================================
--- people/fs/firmware-0.1/debian/rules	(original)
+++ people/fs/firmware-0.1/debian/rules	Wed May 10 12:03:11 2006
@@ -1,21 +1,25 @@
 #!/usr/bin/make -f
 
 BLOBS   = $(subst _fw,, $(basename $(notdir $(wildcard qlogic-fw/*bin))))
-PACKAGES = firmware firmware-di
+PACKAGE = firmware 
+PKGUDEB = firmware-di
 
 build: build-indep
 
-build-indep: debian/control
-	for pkg in $(PACKAGES) ; do \
+build-indep: 
+	dh_testdir
+	for pkg in $(PKGUDEB) $(PACKAGE) ; do \
 		for fw in $(BLOBS) ; do \
 			mkdir -p $(CURDIR)/debian/$$pkg-$$fw/lib/firmware/ ; \
 			mkdir -p $(CURDIR)/debian/$$pkg-$$fw/usr/share/initramfs-tools/hooks/ ; \
-			mkdir -p $(CURDIR)/debian/$$pkg-$$fw/usr/share/doc/$$pkg-$$fw/ ; \
 			sed -e "s/@firmware@/$$fw/" < $(CURDIR)/initramfs-hook > $(CURDIR)/debian/$$pkg-$$fw/usr/share/initramfs-tools/hooks/firmware-$$fw ; \
 			chmod 755 $(CURDIR)/debian/$$pkg-$$fw/usr/share/initramfs-tools/hooks/firmware-$$fw ; \
 			install -o root -g root -m 644 $(CURDIR)/qlogic-fw/$$fw\_fw.bin $(CURDIR)/debian/$$pkg-$$fw/lib/firmware/ ; \
-			install -o root -g root -m 644 $(CURDIR)/qlogic-fw/LICENSE $(CURDIR)/debian/$$pkg-$$fw/usr/share/doc/$$pkg-$$fw/ ; \
 		done ; \
+	done ; \
+	for fw in $(BLOBS) ; do \
+		mkdir -p $(CURDIR)/debian/$$pkg-$$fw/usr/share/doc/$$pkg-$$fw/ ; \
+		install -o root -g root -m 644 $(CURDIR)/debian/copyright $(CURDIR)/debian/$$pkg-$$fw/usr/share/doc/$$pkg-$$fw/ ; \
 	done
 
 debian/control:
@@ -24,13 +28,15 @@
 	for fw in $(BLOBS);	do cat debian/templates/control.binary.udeb.in | sed "s/@controller@/$$fw/" ; done >> debian/control
 
 clean: debian/control
+	dh_testdir
 	dh_clean
 
 install: install-indep
 install-indep:
 
+binary-arch:
 
-binary-common:
+binary-indep:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -41,5 +47,5 @@
 	dh_md5sums
 	dh_builddeb
 	
-binary: binary-common
+binary: binary-indep
 

Modified: people/fs/firmware-0.1/debian/templates/control.binary.in
==============================================================================
--- people/fs/firmware-0.1/debian/templates/control.binary.in	(original)
+++ people/fs/firmware-0.1/debian/templates/control.binary.in	Wed May 10 12:03:11 2006
@@ -2,7 +2,7 @@
 Architecture: all
 Section: non-free/base
 Priority: optional
-Depends: debhelper (>= 4.2), initramfs-tools, linux-image-2.6 (>= 2.6.16-1)
+Depends: initramfs-tools, linux-image-2.6 (>= 2.6.16-1)
 Description: binary firmware for Qlogic @controller@ FC HBAs
  This package contains the binary firmware blob for @controller@ fibre-channel
  HBAs, and an udev hook to load the firmware into the initramfs.

Modified: people/fs/firmware-0.1/debian/templates/control.binary.udeb.in
==============================================================================
--- people/fs/firmware-0.1/debian/templates/control.binary.udeb.in	(original)
+++ people/fs/firmware-0.1/debian/templates/control.binary.udeb.in	Wed May 10 12:03:11 2006
@@ -3,7 +3,7 @@
 Section: non-free/debian-installer
 Priority: optional
 Architecture: all
-Depends: debhelper (>= 4.2), initramfs-tools, linux-image-2.6 (>= 2.6.16-1)
+Depends: initramfs-tools, linux-image-2.6 (>= 2.6.16-1)
 Description: binary firmware for Qlogic @controller@ FC HBAs
  This package contains the binary firmware blob for @controller@ fibre-channel
  HBAs, and an udev hook to load the firmware into the initramfs.