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
=== modified file 'Makefile'
--- Makefile 2011-09-19 14:57:59 +0000
+++ Makefile 2014-01-08 21:15:57 +0000
@@ -4,7 +4,7 @@
4CC=gcc4CC=gcc
5LOADLIBES=-lm -L/usr/lib -lgtk-x11-2.05LOADLIBES=-lm -L/usr/lib -lgtk-x11-2.0
6CFLAGS=-g -Wall $(shell pkg-config --cflags gtk+-2.0)6CFLAGS=-g -Wall $(shell pkg-config --cflags gtk+-2.0)
7LDFLAGS=$(shell pkg-config --libs gtk+-2.0)7LDFLAGS=$(shell pkg-config --libs gtk+-2.0) -lm
88
9OFILES=\9OFILES=\
10oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \10oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \
1111
=== modified file 'debian/changelog'
--- debian/changelog 2011-09-19 14:57:59 +0000
+++ debian/changelog 2014-01-08 21:15:57 +0000
@@ -1,3 +1,16 @@
1freebirth (0.3.2-8ubuntu3) precise; urgency=low
2
3 * debian/control: inserted homepage information.
4
5 -- Francisco Javier Garrote Cruz <garrotecruz@gmail.com> Tue, 07 Jan 2014 23:02:06 +0100
6
7freebirth (0.3.2-8ubuntu2) raring; urgency=low
8
9 * Added missing math lib to link, fixing FTBFS.
10 * Added missing string format arguments.
11
12 -- Daniel T Chen <crimsun@ubuntu.com> Sun, 07 Apr 2013 17:06:17 -0400
13
1freebirth (0.3.2-8ubuntu1) oneiric; urgency=low14freebirth (0.3.2-8ubuntu1) oneiric; urgency=low
215
3 * Fix FTBFS with ld --as-needed. LP: #749188.16 * Fix FTBFS with ld --as-needed. LP: #749188.
417
=== modified file 'debian/control'
--- debian/control 2006-10-04 22:57:27 +0000
+++ debian/control 2014-01-08 21:15:57 +0000
@@ -1,9 +1,11 @@
1Source: freebirth1Source: freebirth
2Section: sound2Section: sound
3Priority: extra3Priority: extra
4Maintainer: Paul Brossier <piem@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Paul Brossier <piem@debian.org>
5Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, docbook-to-man6Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, docbook-to-man
6Standards-Version: 3.7.27Standards-Version: 3.7.2
8Homepage: http://freebirth.sourceforge.net/
79
8Package: freebirth10Package: freebirth
9Architecture: any11Architecture: any
1012
=== modified file 'fuse_loops.c'
--- fuse_loops.c 2006-04-17 00:52:48 +0000
+++ fuse_loops.c 2014-01-08 21:15:57 +0000
@@ -63,7 +63,7 @@
63 for (; *tmpl; tmpl++) {63 for (; *tmpl; tmpl++) {
64 char buf[1024];64 char buf[1024];
65 char *sp = *tmpl, *dp = buf;65 char *sp = *tmpl, *dp = buf;
66 dp += sprintf(dp, prefix);66 dp += sprintf(dp, "%s", prefix);
6767
68 while (*sp) {68 while (*sp) {
69 if (*sp == '$') {69 if (*sp == '$') {
@@ -107,7 +107,7 @@
107 }107 }
108 *dp++ = '\n';108 *dp++ = '\n';
109 *dp = '\0';109 *dp = '\0';
110 fprintf(file, buf);110 fprintf(file, "%s", buf);
111 }111 }
112}112}
113113

Subscribers

People subscribed via source and target branches