Merge lp:~garrotecruz/ubuntu/precise/freebirth/insert-homepage-field into lp:ubuntu/precise/freebirth

Proposed by Francisco Javier Garrote Cruz
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~garrotecruz/ubuntu/precise/freebirth/insert-homepage-field
Merge into: lp:ubuntu/precise/freebirth
Diff against target: 71 lines (+19/-4)
4 files modified
Makefile (+1/-1)
debian/changelog (+13/-0)
debian/control (+3/-1)
fuse_loops.c (+2/-2)
To merge this branch: bzr merge lp:~garrotecruz/ubuntu/precise/freebirth/insert-homepage-field
Reviewer Review Type Date Requested Status
Martin Pitt Disapprove
Review via email: mp+200916@code.launchpad.net

Description of the change

Homepages: http://freebirth.sourceforge.net/

Please review my first bug-fix.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks for your work here. We usually don't introduce Ubuntu delta for such minor things, so please submit your patch to Debian using instructions at <https://wiki.ubuntu.com/Debian/Bugs>.

Revision history for this message
Martin Pitt (pitti) wrote :

Indeed, as Dmitry says this is better as a Debian bug report. Also, we won't fix that in precise, non-critical bug fixes go into the development release only.

Thus I close this merge proposal. Thank you!

review: Disapprove

Unmerged revisions

7. By Francisco Javier Garrote Cruz

debian/control: inserted homepage information.

6. By Daniel T Chen

* Added missing math lib to link, fixing FTBFS.
* Added missing string format arguments.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2011-09-19 14:57:59 +0000
3+++ Makefile 2014-01-08 21:15:57 +0000
4@@ -4,7 +4,7 @@
5 CC=gcc
6 LOADLIBES=-lm -L/usr/lib -lgtk-x11-2.0
7 CFLAGS=-g -Wall $(shell pkg-config --cflags gtk+-2.0)
8-LDFLAGS=$(shell pkg-config --libs gtk+-2.0)
9+LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -lm
10
11 OFILES=\
12 oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2011-09-19 14:57:59 +0000
16+++ debian/changelog 2014-01-08 21:15:57 +0000
17@@ -1,3 +1,16 @@
18+freebirth (0.3.2-8ubuntu3) precise; urgency=low
19+
20+ * debian/control: inserted homepage information.
21+
22+ -- Francisco Javier Garrote Cruz <garrotecruz@gmail.com> Tue, 07 Jan 2014 23:02:06 +0100
23+
24+freebirth (0.3.2-8ubuntu2) raring; urgency=low
25+
26+ * Added missing math lib to link, fixing FTBFS.
27+ * Added missing string format arguments.
28+
29+ -- Daniel T Chen <crimsun@ubuntu.com> Sun, 07 Apr 2013 17:06:17 -0400
30+
31 freebirth (0.3.2-8ubuntu1) oneiric; urgency=low
32
33 * Fix FTBFS with ld --as-needed. LP: #749188.
34
35=== modified file 'debian/control'
36--- debian/control 2006-10-04 22:57:27 +0000
37+++ debian/control 2014-01-08 21:15:57 +0000
38@@ -1,9 +1,11 @@
39 Source: freebirth
40 Section: sound
41 Priority: extra
42-Maintainer: Paul Brossier <piem@debian.org>
43+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
44+XSBC-Original-Maintainer: Paul Brossier <piem@debian.org>
45 Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, docbook-to-man
46 Standards-Version: 3.7.2
47+Homepage: http://freebirth.sourceforge.net/
48
49 Package: freebirth
50 Architecture: any
51
52=== modified file 'fuse_loops.c'
53--- fuse_loops.c 2006-04-17 00:52:48 +0000
54+++ fuse_loops.c 2014-01-08 21:15:57 +0000
55@@ -63,7 +63,7 @@
56 for (; *tmpl; tmpl++) {
57 char buf[1024];
58 char *sp = *tmpl, *dp = buf;
59- dp += sprintf(dp, prefix);
60+ dp += sprintf(dp, "%s", prefix);
61
62 while (*sp) {
63 if (*sp == '$') {
64@@ -107,7 +107,7 @@
65 }
66 *dp++ = '\n';
67 *dp = '\0';
68- fprintf(file, buf);
69+ fprintf(file, "%s", buf);
70 }
71 }
72

Subscribers

People subscribed via source and target branches