Ubuntu
getstream package

Merge lp:~ubuntu-branches/ubuntu/raring/getstream/raring-201212060042 into lp:ubuntu/raring/getstream

  1. Raring (13.04)
  2. raring-201212060042
  3. Merge into raring
Proposed by Ubuntu Package Importer
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/raring/getstream/raring-201212060042
Merge into: lp:ubuntu/raring/getstream
Diff against target: 206 lines (+47/-15)
15 files modified
Makefile (+4/-4)
config.c (+1/-1)
config.h (+1/-1)
debian/patched/as-needed.dpatch (+1/-0)
debian/patched/getopt-return.dpatch (+1/-0)
debian/patched/glib-single-include.dpatch (+7/-0)
debian/patched/libhttp-memleak.dpatch (+1/-0)
debian/patched/use-pkgconfig.dpatch (+1/-0)
getstream.c (+1/-1)
getstream.h (+1/-1)
libhttp.c (+7/-3)
libhttp.h (+1/-2)
output.h (+1/-1)
output_http.c (+1/-1)
patch-stamp (+18/-0)
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/raring/getstream/raring-201212060042
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+138351@code.launchpad.net

Description of the change

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/raring/getstream reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/raring/getstream/raring-201212060042. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

To post a comment you must log in.

Unmerged revisions

10. By Charlie_Smotherman

* Merge from Debian unstable. Remaining changes:
  - Fix link order to allow building with 'ld --as-needed'.
  - debian/patches/getopt-return: Correctly cast getopt return to an int,
    solving runtime issues on platforms with unsigned chars.
  - debian/patches/glib-single-include: Fix FTBFS with newer glib versions.
* Non-maintainer upload.
* Use pkg-config to get compiler flags for glib-2.0. Thanks to Steve
  Langasek <email address hidden> for the patch.
  (Closes: #622278, LP: #749147)
* Add dpatch targets in debian/rules to apply the patches during build.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-12-05 16:38:14 +0000
3+++ Makefile 2012-12-06 00:49:21 +0000
4@@ -1,6 +1,6 @@
5 CC=gcc
6-CFLAGS=-O0 -g -Wall -I. -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
7-LDFLAGS=-levent -lglib-2.0 -lpthread
8+CFLAGS=-O0 -g -Wall -I. $(shell pkg-config --cflags glib-2.0)
9+LDLIBS=-levent $(shell pkg-config --libs glib-2.0) -lpthread
10 OBJ-getstream=getstream.o fe.o crc32.o \
11 libhttp.o libconf.o config.o util.o logging.o \
12 stream.o input.o \
13@@ -15,10 +15,10 @@
14 all: getstream tsdecode
15
16 tsdecode: $(OBJ-tsdecode)
17- gcc $(LDFLAGS) -o $@ $+
18+ gcc -o $@ $+ $(LDLIBS)
19
20 getstream: $(OBJ-getstream)
21- gcc $(LDFLAGS) -o $@ $+
22+ gcc -o $@ $+ $(LDLIBS)
23
24 clean:
25 -rm -f $(OBJ-getstream) $(OBJ-tsdecode)
26
27=== modified file 'config.c'
28--- config.c 2012-12-05 16:38:14 +0000
29+++ config.c 2012-12-06 00:49:21 +0000
30@@ -10,7 +10,7 @@
31 #include <strings.h>
32 #include <string.h>
33
34-#include <glib/glist.h>
35+#include <glib.h>
36
37 #include "config.h"
38 #include "libconf.h"
39
40=== modified file 'config.h'
41--- config.h 2012-12-05 16:38:14 +0000
42+++ config.h 2012-12-06 00:49:21 +0000
43@@ -1,5 +1,5 @@
44
45-#include <glib/glist.h>
46+#include <glib.h>
47
48 #include "getstream.h"
49
50
51=== added directory 'debian/patched'
52=== added file 'debian/patched/as-needed.dpatch'
53--- debian/patched/as-needed.dpatch 1970-01-01 00:00:00 +0000
54+++ debian/patched/as-needed.dpatch 2012-12-06 00:49:21 +0000
55@@ -0,0 +1,1 @@
56+patching file Makefile
57
58=== added file 'debian/patched/getopt-return.dpatch'
59--- debian/patched/getopt-return.dpatch 1970-01-01 00:00:00 +0000
60+++ debian/patched/getopt-return.dpatch 2012-12-06 00:49:21 +0000
61@@ -0,0 +1,1 @@
62+patching file getstream.c
63
64=== added file 'debian/patched/glib-single-include.dpatch'
65--- debian/patched/glib-single-include.dpatch 1970-01-01 00:00:00 +0000
66+++ debian/patched/glib-single-include.dpatch 2012-12-06 00:49:21 +0000
67@@ -0,0 +1,7 @@
68+patching file config.c
69+patching file config.h
70+patching file getstream.h
71+patching file libhttp.c
72+patching file libhttp.h
73+patching file output.h
74+patching file output_http.c
75
76=== added file 'debian/patched/libhttp-memleak.dpatch'
77--- debian/patched/libhttp-memleak.dpatch 1970-01-01 00:00:00 +0000
78+++ debian/patched/libhttp-memleak.dpatch 2012-12-06 00:49:21 +0000
79@@ -0,0 +1,1 @@
80+patching file libhttp.c
81
82=== added file 'debian/patched/use-pkgconfig.dpatch'
83--- debian/patched/use-pkgconfig.dpatch 1970-01-01 00:00:00 +0000
84+++ debian/patched/use-pkgconfig.dpatch 2012-12-06 00:49:21 +0000
85@@ -0,0 +1,1 @@
86+patching file Makefile
87
88=== modified file 'getstream.c'
89--- getstream.c 2012-12-05 16:38:14 +0000
90+++ getstream.c 2012-12-06 00:49:21 +0000
91@@ -106,7 +106,7 @@
92
93 int main(int argc, char **argv) {
94 extern char *optarg;
95- char ch;
96+ int ch;
97 int timeout=0;
98 GList *al;
99 struct config_s *config=NULL;
100
101=== modified file 'getstream.h'
102--- getstream.h 2012-12-05 16:38:14 +0000
103+++ getstream.h 2012-12-06 00:49:21 +0000
104@@ -10,7 +10,7 @@
105 #include <linux/dvb/frontend.h>
106
107 #include <event.h>
108-#include <glib/glist.h>
109+#include <glib.h>
110
111 #include "sap.h"
112 #include "psi.h"
113
114=== modified file 'libhttp.c'
115--- libhttp.c 2012-12-05 16:38:14 +0000
116+++ libhttp.c 2012-12-06 00:49:21 +0000
117@@ -13,7 +13,7 @@
118 #include <stdio.h>
119 #include <stdarg.h>
120
121-#include <glib/glist.h>
122+#include <glib.h>
123
124 #include "libhttp.h"
125
126@@ -556,11 +556,15 @@
127 hs->sin.sin_addr.s_addr=INADDR_ANY;
128
129 if (bind(hs->fd, (struct sockaddr *) &hs->sin,
130- sizeof(struct sockaddr_in)))
131+ sizeof(struct sockaddr_in))) {
132+ free(hs);
133 return NULL;
134+ }
135
136- if (listen(hs->fd, 3))
137+ if (listen(hs->fd, 3)) {
138+ free(hs);
139 return NULL;
140+ }
141
142 flags=fcntl(hs->fd, F_GETFL);
143 fcntl(hs->fd, F_GETFL, flags | O_NONBLOCK);
144
145=== modified file 'libhttp.h'
146--- libhttp.h 2012-12-05 16:38:14 +0000
147+++ libhttp.h 2012-12-06 00:49:21 +0000
148@@ -7,8 +7,7 @@
149 #include <netinet/in.h>
150 #include <event.h>
151
152-#include <glib/glist.h>
153-#include <glib/ghash.h>
154+#include <glib.h>
155
156
157 #define MAX_HEADER_SIZE 3000
158
159=== modified file 'output.h'
160--- output.h 2012-12-05 16:38:14 +0000
161+++ output.h 2012-12-06 00:49:21 +0000
162@@ -4,7 +4,7 @@
163 #include "getstream.h"
164 #include "libhttp.h"
165
166-#include <glib/glist.h>
167+#include <glib.h>
168
169 #include <event.h>
170
171
172=== modified file 'output_http.c'
173--- output_http.c 2012-12-05 16:38:14 +0000
174+++ output_http.c 2012-12-06 00:49:21 +0000
175@@ -5,7 +5,7 @@
176 #include <string.h>
177 #include <stdio.h>
178
179-#include <glib/glist.h>
180+#include <glib.h>
181
182 #include "output.h"
183 #include "simplebuffer.h"
184
185=== added file 'patch-stamp'
186--- patch-stamp 1970-01-01 00:00:00 +0000
187+++ patch-stamp 2012-12-06 00:49:21 +0000
188@@ -0,0 +1,18 @@
189+Patches applied in the Debian version of :
190+
191+debian/patches/libhttp-memleak.dpatch (Herve Rousseau <herve@moulticast.net>):
192+ Fixes a memleak (danchev@spnet.net)
193+
194+debian/patches/use-pkgconfig.dpatch (Steve Langasek <steve.langasek@linaro.org>):
195+ Use pkg-config instead of hard-coding a glib header path, to fix
196+ build failure under multiarch.
197+
198+debian/patches/as-needed.dpatch (Colin Watson <cjwatson@ubuntu.com>):
199+ Fix link order to allow building with 'ld --as-needed'.
200+
201+debian/patches/getopt-return.dpatch (Adam Conrad <adconrad@ubuntu.com>):
202+ ch is used to store the return of getopt, which is an int, not a char
203+
204+debian/patches/glib-single-include.dpatch (Adam Conrad <adconrad@ubuntu.com>):
205+ Fix up glib includes to work with new glib's constraints
206+

Subscribers

People subscribed via source and target branches

to all changes: