Merge lp:~florian-brandes/ubuntu/oneiric/qc-usb/fix-for-770745 into lp:ubuntu/oneiric/qc-usb

[Florian Brandes]

Changed the order of the make line, so that "-lm" stands at the end. This fixed the FTBFS bug. The change was committed with the dquilt patch system as an edit to the latest patch "overrive_Makefile".

[Didier Roche-Tolomelli (didrocks)]

Thanks for your patch and for helping to make ubuntu better!

The patch looks good and build fine. However, please note the following:
- we change the maintainer address (set to an ubuntu address) when the package is changed in ubuntu, you have a handy script for that "update-maintainer" in ubuntu-dev-tools. Please use it for further sponsoring (I did the change for you).
- we try to be good citizen and to forward our patch upstream, FYI, I sent your patch to the qce mailing list (you can see the homepage in debian/copyright).

Otherwise, everything looks good and build fine, sponsored! Thanks again.

review: Approve

[Florian Brandes (florian-brandes)]

Hello Didier,

thanks for the information and for doing all that on my behalf! I'll keep that in mind the next time I upload something.
Thanks for sponsoring :-)
Regards, Florian

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-04 18:12:00 +0000
+++ debian/changelog	2011-09-07 10:51:18 +0000
@@ -1,3 +1,9 @@
+qc-usb (0.6.6-7ubuntu1) oneiric; urgency=low
+
+  * debian/patches/override_Makefile.patch: Changed Makefile to include libraries at the end of the command line to fix FTBFS in ubuntu 11.10 (LP: #770745)
+
+ -- Florian Brandes <[e-mail]>  Wed, 07 Sep 2011 12:36:55 +0200
+
 qc-usb (0.6.6-7) unstable; urgency=low
 
   * debian/control: fix spelling error (Closes: #498530).

=== modified file 'debian/patches/override_Makefile.patch'
--- debian/patches/override_Makefile.patch	2010-02-04 18:12:00 +0000
+++ debian/patches/override_Makefile.patch	2011-09-07 10:51:18 +0000
@@ -1,9 +1,12 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
 Replace upstream's Makefile for a simpler one that actually works.
 
 Index: qc-usb/Makefile
 ===================================================================
---- qc-usb.orig/Makefile
-+++ qc-usb/Makefile
+--- qc-usb.orig/Makefile	2011-09-07 12:25:18.033818000 +0200
++++ qc-usb/Makefile	2011-09-07 12:36:51.248551246 +0200
 @@ -1,236 +1,53 @@
  #
 -# qc-usb, Logitech QuickCam video driver with V4L support
@@ -269,6 +272,6 @@
 -
 -obj-m := quickcam.o
 -quickcam-objs := qc-driver.o qc-hdcs.o qc-pb0100.o qc-vv6410.o qc-formats.o qc-mjpeg.o qc-memory.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -lm $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lm
  
  endif