[SCM] crystalhd packaging branch, master, updated. upstream/0.0.git20100815.6df10a0-33-gd9e53d1

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 594510976778321cecb22acaa1c577bbfbaffdbb
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Aug 16 01:00:16 2010 -0400

    Modify packaging so that it can build binary packages again.
    make is invoked in linux_lib/libcrystalhd.
    Patch is applied to exclude installation of firmware which is not included with
    source package.

diff --git a/debian/patches/exclude-firmware.patch b/debian/patches/exclude-firmware.patch
new file mode 100644
index 0000000..92dc58a
--- /dev/null
+++ b/debian/patches/exclude-firmware.patch
@@ -0,0 +1,19 @@
+Patch to exclude firmware installation with library.
+==========================================================================
+--- a/linux_lib/libcrystalhd/Makefile
++++ b/linux_lib/libcrystalhd/Makefile
+@@ -53,14 +53,11 @@
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(LIBDIR)
+-	mkdir -p $(DESTDIR)/lib/firmware
+ 	mkdir -p $(DESTDIR)/usr/include/libcrystalhd
+ 	cp libcrystalhd_if.h $(DESTDIR)/usr/include/libcrystalhd/
+ 	cp $(ROOTDIR)/include/bc_dts_defs.h $(DESTDIR)/usr/include/libcrystalhd/
+ 	cp $(ROOTDIR)/include/bc_dts_types.h $(DESTDIR)/usr/include/libcrystalhd/
+ 	cp $(ROOTDIR)/include/libcrystalhd_version.h $(DESTDIR)/usr/include/libcrystalhd/
+-	cp $(ROOTDIR)/firmware/fwbin/70012/bcm70012fw.bin $(DESTDIR)/lib/firmware/
+-	cp $(ROOTDIR)/firmware/fwbin/70015/bcm70015fw.bin $(DESTDIR)/lib/firmware/
+ 	install -m 755 $(BCLIB) $(DESTDIR)$(LIBDIR)
+ 	(cd $(DESTDIR)$(LIBDIR); ln -sf $(BCLIB) $(BCLIB_NAME))
+ 	(cd $(DESTDIR)$(LIBDIR); ln -sf $(BCLIB) $(BCLIB_SL))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f8d7abc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+exclude-firmware.patch
diff --git a/debian/rules b/debian/rules
index bf034c5..5cb29d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh --with quilt $@
+
+override_dh_auto_build:
+	make -C linux_lib/libcrystalhd
 
 override_dh_auto_install:
-	make install destdir=$(CURDIR)/debian/tmp
+	make install -C linux_lib/libcrystalhd DESTDIR=$(CURDIR)/debian/tmp
 
+override_dh_auto_clean:
+	dh_clean
+	make clean -C linux_lib/libcrystalhd

-- 
crystalhd packaging