Merge lp:~jtaylor/ubuntu/oneiric/gpac/fix-749110 into lp:ubuntu/oneiric/gpac

Proposed by Julian Taylor
Status: Merged
Merged at revision: 19
Proposed branch: lp:~jtaylor/ubuntu/oneiric/gpac/fix-749110
Merge into: lp:ubuntu/oneiric/gpac
Diff against target: 43 lines (+23/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/05_warn-common-typo.diff (+15/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~jtaylor/ubuntu/oneiric/gpac/fix-749110
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+67307@code.launchpad.net

Description of the change

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-10 03:28:42 +0000
3+++ debian/changelog 2011-07-08 10:45:00 +0000
4@@ -1,3 +1,10 @@
5+gpac (0.4.5-0.3ubuntu9) oneiric; urgency=low
6+
7+ * debian/patches/05_warn-common-typo.diff: (LP: #749110)
8+ - fix typo in ld option: s/-Wl --warn-common/-Wl,--warn-common/ configure
9+
10+ -- Julian Taylor <jtaylor.debian@googlemail.com> Fri, 08 Jul 2011 12:29:02 +0200
11+
12 gpac (0.4.5-0.3ubuntu8) oneiric; urgency=low
13
14 * Drop xulrunner-dev build-dep. Neither Mozilla or Spidermonkey support
15
16=== added file 'debian/patches/05_warn-common-typo.diff'
17--- debian/patches/05_warn-common-typo.diff 1970-01-01 00:00:00 +0000
18+++ debian/patches/05_warn-common-typo.diff 2011-07-08 10:45:00 +0000
19@@ -0,0 +1,15 @@
20+Description: fix typo
21+Author: Julian Taylor <jtaylor.debian@googlemail.com>
22+Index: gpac/configure
23+===================================================================
24+--- gpac.orig/configure 2011-07-08 12:27:04.975776050 +0200
25++++ gpac/configure 2011-07-08 12:27:12.175776056 +0200
26+@@ -102,7 +102,7 @@
27+ bigendian="no"
28+ SHFLAGS=-shared
29+ need_inet_aton="no"
30+-LDFLAGS="$LDFLAGS -Wl --warn-common"
31++LDFLAGS="$LDFLAGS -Wl,--warn-common"
32+ CFLAGS=""
33+ CPPFLAGS=""
34+ GPAC_SH_FLAGS=-lpthread
35
36=== modified file 'debian/patches/series'
37--- debian/patches/series 2009-09-10 10:06:36 +0000
38+++ debian/patches/series 2011-07-08 10:45:00 +0000
39@@ -2,3 +2,4 @@
40 02_amd64.diff
41 03_memeset-typo.diff
42 04_glx-func-def.diff
43+05_warn-common-typo.diff

Subscribers

People subscribed via source and target branches

to all changes: