Ubuntu

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

Proposed by Florian Brandes on 2011-09-07
Status: Merged
Merged at revision: 9
Proposed branch: lp:~florian-brandes/ubuntu/oneiric/qc-usb/fix-for-770745
Merge into: lp:ubuntu/oneiric/qc-usb
Diff against target: 40 lines (+12/-3) 2 files modified
To merge this branch: bzr merge lp:~florian-brandes/ubuntu/oneiric/qc-usb/fix-for-770745
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2011-09-08
Ubuntu branches 2011-09-07 Pending
Review via email: mp+74389@code.launchpad.net

Description of the Change

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".

To post a comment you must log in.
Didier Roche (didrocks) wrote :

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) wrote :

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-04 18:12:00 +0000
3+++ debian/changelog 2011-09-07 10:51:18 +0000
4@@ -1,3 +1,9 @@
5+qc-usb (0.6.6-7ubuntu1) oneiric; urgency=low
6+
7+ * 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)
8+
9+ -- Florian Brandes <florian.brandes@gmx.de> Wed, 07 Sep 2011 12:36:55 +0200
10+
11 qc-usb (0.6.6-7) unstable; urgency=low
12
13 * debian/control: fix spelling error (Closes: #498530).
14
15=== modified file 'debian/patches/override_Makefile.patch'
16--- debian/patches/override_Makefile.patch 2010-02-04 18:12:00 +0000
17+++ debian/patches/override_Makefile.patch 2011-09-07 10:51:18 +0000
18@@ -1,9 +1,12 @@
19+## Description: add some description
20+## Origin/Author: add some origin or author
21+## Bug: bug URL
22 Replace upstream's Makefile for a simpler one that actually works.
23
24 Index: qc-usb/Makefile
25 ===================================================================
26---- qc-usb.orig/Makefile
27-+++ qc-usb/Makefile
28+--- qc-usb.orig/Makefile 2011-09-07 12:25:18.033818000 +0200
29++++ qc-usb/Makefile 2011-09-07 12:36:51.248551246 +0200
30 @@ -1,236 +1,53 @@
31 #
32 -# qc-usb, Logitech QuickCam video driver with V4L support
33@@ -269,6 +272,6 @@
34 -
35 -obj-m := quickcam.o
36 -quickcam-objs := qc-driver.o qc-hdcs.o qc-pb0100.o qc-vv6410.o qc-formats.o qc-mjpeg.o qc-memory.o
37-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -lm $<
38++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lm
39
40 endif

Subscribers

People subscribed via source and target branches