Merge lp:~xnox/ubuntu/quantal/bogl/merge-8 into lp:ubuntu/quantal/bogl
- Quantal (12.10)
- merge-8
- Merge into quantal
Proposed by
Dimitri John Ledkov
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Colin Watson | ||||
Proposed branch: | lp:~xnox/ubuntu/quantal/bogl/merge-8 | ||||
Merge into: | lp:ubuntu/quantal/bogl | ||||
Diff against target: |
790 lines (+206/-70) 28 files modified
Makefile (+20/-7) bogl-bgf.c (+1/-0) bogl-cfb.c (+2/-2) bogl-cfb.h (+7/-6) bogl-font.c (+1/-1) bogl-pcfb.c (+4/-4) bogl-tcfb.c (+4/-4) bogl-term.c (+1/-0) bogl-term.h (+1/-1) bogl-vga16.c (+2/-2) boml.c (+12/-7) bowl.c (+1/-1) debian/bogl-bterm.files (+0/-1) debian/changelog (+60/-4) debian/control (+12/-8) debian/libbogl-dev.dirs (+1/-0) debian/libbogl-dev.files (+2/-2) debian/libbogl-dev.files.hurd-i386 (+2/-0) debian/libbogl-dev.files.kfreebsd-amd64 (+2/-0) debian/libbogl-dev.files.kfreebsd-i386 (+2/-0) debian/libbogl-dev.manpages (+3/-0) debian/libbogl0.dirs (+1/-0) debian/libbogl0.files (+2/-2) debian/rules (+30/-9) mergebdf.1 (+8/-0) pngtobogl.1 (+8/-0) reduce-font.1 (+8/-0) reduce-font.c (+9/-9) |
||||
To merge this branch: | bzr merge lp:~xnox/ubuntu/quantal/bogl/merge-8 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email:
|
Commit message
Description of the change
bogl (0.1.18-8ubuntu1) quantal; urgency=low
.
* Merge with Debian remaining changes:
- update the hardcoded color map to the color palette selected by
the Canonical Design Team, LP: #730672;
- ideally, bterm.c would read these from the configuration file,
/etc/vtrgb
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Colin Watson (cjwatson) wrote : | # |
Unmerged revisions
- 22. By Dimitri John Ledkov
-
* Merge with Debian remaining changes:
- update the hardcoded color map to the color palette selected by
the Canonical Design Team, LP: #730672;
- ideally, bterm.c would read these from the configuration file,
/etc/vtrgb - 21. By Dimitri John Ledkov
-
Merging shared upstream rev into target branch.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' |
2 | --- Makefile 2006-12-19 12:21:12 +0000 |
3 | +++ Makefile 2012-05-22 12:18:18 +0000 |
4 | @@ -9,6 +9,7 @@ |
5 | ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS) |
6 | |
7 | architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) |
8 | +os := $(shell uname) |
9 | |
10 | LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS) \ |
11 | $(LIBRSRCOBJECTS) |
12 | @@ -18,9 +19,12 @@ |
13 | LIBRSRCOBJECTS = helvB10.o helvB12.o helvR10.o timBI18.o tux75.o |
14 | |
15 | SOURCES_DEP = arrow.c bdftobogl.c bogl-cfb.c bogl-cfb.h bogl-cfb8.c \ |
16 | -bogl-cfb8.h bogl-font.c bogl-font.h bogl-pcfb.c bogl-pcfb.h \ |
17 | -bogl-tcfb.c bogl-tcfb.h bogl-test.c bogl.c bogl.h boglP.h boml.c \ |
18 | -boml.h bowl-boxes.c bowl.c bowl.h pngtobogl.c |
19 | +bogl-cfb8.h bogl-font.c bogl-font.h \ |
20 | +bogl-test.c bogl.h boglP.h boml.c \ |
21 | +boml.h bowl.c bowl.h pngtobogl.c |
22 | + |
23 | +ifeq ($(os),Linux) |
24 | + SOURCES_DEP += bogl-pcfb.c bogl-pcfb.h bogl-tcfb.c bogl-tcfb.h bowl-boxes.c bogl.c |
25 | |
26 | ifeq (,) |
27 | FBCFLAGS += -DBOGL_CFB_FB=1 |
28 | @@ -32,13 +36,18 @@ |
29 | LIBBOGLOBJECTS += bogl-vga16.o |
30 | SOURCES_DEP += bogl-vga16.c bogl-vga16.h |
31 | endif |
32 | +endif |
33 | |
34 | OBJECTS = $(LIBOBJECTS) bowl-boxes.o |
35 | |
36 | GENERATED = helvB10.c helvB12.c helvR10.c timBI18.c tux75.c |
37 | |
38 | # libutf8/libutf8_plug.so unifont-reduced.bgf |
39 | -all: depend $(SHARED_LIB) $(LIB) bterm bdftobogl reduce-font |
40 | +all: depend |
41 | +ifeq ($(os),Linux) |
42 | +all: $(SHARED_LIB) $(LIB) bterm bdftobogl pngtobogl |
43 | +endif |
44 | +all: reduce-font |
45 | |
46 | %.lo: %.c |
47 | $(CC) $(ALLCFLAGS) -o $@ -fPIC -c $< |
48 | @@ -86,7 +95,7 @@ |
49 | ./bdftobogl $< > $@ |
50 | |
51 | pngtobogl: pngtobogl.o |
52 | - $(CC) $(ALLCFLAGS) -o pngtobogl pngtobogl.o -lgd -lpng -lm |
53 | + $(CC) $(ALLCFLAGS) -o pngtobogl pngtobogl.o -lgd |
54 | %.c: %.png pngtobogl |
55 | ./pngtobogl $< > $@ |
56 | |
57 | @@ -109,12 +118,16 @@ |
58 | endif |
59 | |
60 | install: all |
61 | - install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin |
62 | + install -d $(DESTDIR)/usr/bin |
63 | +ifeq ($(os),Linux) |
64 | + install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl |
65 | install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB) |
66 | ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK) |
67 | ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SONAME) |
68 | install -m644 $(LIB) $(DESTDIR)/usr/lib/$(LIB) |
69 | install -m644 *.h $(DESTDIR)/usr/include/bogl |
70 | - install -m755 bdftobogl mergebdf bterm pngtobogl reduce-font $(DESTDIR)/usr/bin |
71 | + install -m755 bdftobogl bterm pngtobogl $(DESTDIR)/usr/bin |
72 | install -d $(DESTDIR)/usr/share/terminfo |
73 | tic -o$(DESTDIR)/usr/share/terminfo bterm.ti |
74 | +endif |
75 | + install -m755 mergebdf reduce-font $(DESTDIR)/usr/bin |
76 | |
77 | === modified file 'bogl-bgf.c' |
78 | --- bogl-bgf.c 2009-05-15 15:46:19 +0000 |
79 | +++ bogl-bgf.c 2012-05-22 12:18:18 +0000 |
80 | @@ -7,6 +7,7 @@ |
81 | #include <unistd.h> |
82 | |
83 | #include "bogl.h" |
84 | +#include "boglP.h" |
85 | #include "bogl-font.h" |
86 | |
87 | struct bogl_font *bogl_mmap_font(char *file) |
88 | |
89 | === modified file 'bogl-cfb.c' |
90 | --- bogl-cfb.c 2002-03-31 15:43:27 +0000 |
91 | +++ bogl-cfb.c 2012-05-22 12:18:18 +0000 |
92 | @@ -55,7 +55,7 @@ |
93 | /* For anything else, assert that we are actually aligned on a pixel |
94 | boundary, otherwise we are sure to lose */ |
95 | dst = (unsigned char*) d + offset * b / 8; |
96 | - assert((((unsigned int)dst * 8) % b) == 0); |
97 | + assert((((unsigned long)dst * 8) % b) == 0); |
98 | |
99 | /* Sanity... */ |
100 | assert (b <= 32); |
101 | @@ -79,7 +79,7 @@ |
102 | |
103 | /* printf ("Filling %d pixels == %d bytes\n\r", len, len * b / 8); */ |
104 | /* Align to an int boundary */ |
105 | - while ((unsigned int)dst % sizeof(unsigned int)) |
106 | + while ((unsigned long)dst % sizeof(unsigned int)) |
107 | { |
108 | /* printf ("Aligning %d bytes\n\r", (unsigned int)dst % sizeof(unsigned int)); */ |
109 | if (b >= 8) |
110 | |
111 | === modified file 'bogl-cfb.h' |
112 | --- bogl-cfb.h 2002-03-31 15:43:27 +0000 |
113 | +++ bogl-cfb.h 2012-05-22 12:18:18 +0000 |
114 | @@ -27,12 +27,12 @@ |
115 | #include <endian.h> |
116 | |
117 | struct bits4 { |
118 | - unsigned int p0:4 __attribute__ ((packed)); |
119 | - unsigned int p1:4 __attribute__ ((packed)); |
120 | + unsigned int p0:4; |
121 | + unsigned int p1:4; |
122 | } __attribute__ ((packed)); |
123 | |
124 | struct bits24 { |
125 | - unsigned char bytes[3] __attribute__ ((packed)); |
126 | + unsigned char bytes[3]; |
127 | } __attribute__ ((packed)); |
128 | |
129 | static inline void |
130 | @@ -41,16 +41,17 @@ |
131 | switch (b) |
132 | { |
133 | case 32: |
134 | - /* FIXME: probably has endianness problems */ |
135 | + /* FIXME: has endianness problems */ |
136 | ((u_int32_t*)(dst))[off] = c; |
137 | break; |
138 | case 24: |
139 | - /* FIXME: probably also has endianness problems */ |
140 | + /* FIXME: also has endianness problems */ |
141 | ((struct bits24*)(dst))[off].bytes[2] = (c >> 16); |
142 | ((struct bits24*)(dst))[off].bytes[1] = (c >> 8); |
143 | ((struct bits24*)(dst))[off].bytes[0] = c; |
144 | break; |
145 | case 16: |
146 | + /* FIXME: also has endianness problems */ |
147 | ((unsigned short*)(dst))[off] = c; |
148 | break; |
149 | case 8: |
150 | @@ -93,7 +94,7 @@ |
151 | } |
152 | |
153 | /* Align to an int boundary */ |
154 | - while ((unsigned int)dst % sizeof(unsigned int)) |
155 | + while ((unsigned long)dst % sizeof(unsigned int)) |
156 | { |
157 | put_var(dst, 0, c, 24); |
158 | dst += 3; |
159 | |
160 | === modified file 'bogl-font.c' |
161 | --- bogl-font.c 2006-12-19 12:21:12 +0000 |
162 | +++ bogl-font.c 2012-05-22 12:18:18 +0000 |
163 | @@ -298,7 +298,7 @@ |
164 | goto lossage; |
165 | } |
166 | |
167 | - cp = strstr (font_name, ".bdf"); |
168 | + cp = (unsigned char *) strstr (font_name, ".bdf"); |
169 | if (cp) |
170 | *cp = 0; |
171 | for (cp = (unsigned char *) font_name; *cp; cp++) |
172 | |
173 | === modified file 'bogl-pcfb.c' |
174 | --- bogl-pcfb.c 2002-03-31 15:43:27 +0000 |
175 | +++ bogl-pcfb.c 2012-05-22 12:18:18 +0000 |
176 | @@ -110,7 +110,7 @@ |
177 | return; |
178 | |
179 | bogl_drawing = 1; |
180 | - dst = (char *) bogl_frame + (y1 * bogl_line_len); |
181 | + dst = (unsigned char *) bogl_frame + (y1 * bogl_line_len); |
182 | for (; y1 < y2; y1++) |
183 | { |
184 | memset_var (dst, cmap_lookup(c), x1, x2 - x1, bpp); |
185 | @@ -282,7 +282,7 @@ |
186 | |
187 | if (visible) |
188 | { |
189 | - char *dst = save; |
190 | + char *dst = (char *) save; |
191 | char *src = (char *) bogl_frame |
192 | + (sx_ofs * bpp / 8) |
193 | + (y1 * bogl_line_len); |
194 | @@ -300,7 +300,7 @@ |
195 | char *dst = (char *) bogl_frame |
196 | + (sx_ofs * bpp / 8) |
197 | + (y1 * bogl_line_len); |
198 | - char *src = save; |
199 | + char *src = (char *) save; |
200 | int y; |
201 | |
202 | for (y = 0; y < y_count; y++) |
203 | @@ -330,7 +330,7 @@ |
204 | unsigned short bg_bits, fg_bits; |
205 | int x; |
206 | |
207 | - dst = (char *) bogl_frame |
208 | + dst = (unsigned char *) bogl_frame |
209 | + ((y1 + y) * bogl_line_len); |
210 | bg_bits = *mask_p ^ *color_p; |
211 | fg_bits = *mask_p & *color_p; |
212 | |
213 | === modified file 'bogl-tcfb.c' |
214 | --- bogl-tcfb.c 2002-03-31 15:43:27 +0000 |
215 | +++ bogl-tcfb.c 2012-05-22 12:18:18 +0000 |
216 | @@ -137,7 +137,7 @@ |
217 | return; |
218 | |
219 | bogl_drawing = 1; |
220 | - dst = (char *) bogl_frame + (y1 * bogl_line_len); |
221 | + dst = (unsigned char *) bogl_frame + (y1 * bogl_line_len); |
222 | for (; y1 < y2; y1++) |
223 | { |
224 | memset_var (dst, cmap_lookup(c), x1, x2 - x1, bpp); |
225 | @@ -309,7 +309,7 @@ |
226 | |
227 | if (visible) |
228 | { |
229 | - char *dst = save; |
230 | + char *dst = (char *) save; |
231 | char *src = (char *) bogl_frame |
232 | + (sx_ofs * bpp / 8) |
233 | + (y1 * bogl_line_len); |
234 | @@ -327,7 +327,7 @@ |
235 | char *dst = (char *) bogl_frame |
236 | + (sx_ofs * bpp / 8) |
237 | + (y1 * bogl_line_len); |
238 | - char *src = save; |
239 | + char *src = (char *) save; |
240 | int y; |
241 | |
242 | for (y = 0; y < y_count; y++) |
243 | @@ -357,7 +357,7 @@ |
244 | unsigned short bg_bits, fg_bits; |
245 | int x; |
246 | |
247 | - dst = (char *) bogl_frame |
248 | + dst = (unsigned char *) bogl_frame |
249 | + ((y1 + y) * bogl_line_len); |
250 | bg_bits = *mask_p ^ *color_p; |
251 | fg_bits = *mask_p & *color_p; |
252 | |
253 | === modified file 'bogl-term.c' |
254 | --- bogl-term.c 2009-04-23 11:41:11 +0000 |
255 | +++ bogl-term.c 2012-05-22 12:18:18 +0000 |
256 | @@ -26,6 +26,7 @@ |
257 | |
258 | #include "bogl.h" |
259 | #include "bogl-term.h" |
260 | +#include <string.h> |
261 | |
262 | struct bogl_term *bogl_term_new(struct bogl_font *font) |
263 | { |
264 | |
265 | === modified file 'bogl-term.h' |
266 | --- bogl-term.h 2009-04-23 11:41:11 +0000 |
267 | +++ bogl-term.h 2012-05-22 12:18:18 +0000 |
268 | @@ -5,7 +5,7 @@ |
269 | #include <wchar.h> |
270 | |
271 | struct bogl_term { |
272 | - const struct bogl_font *font; |
273 | + struct bogl_font *font; |
274 | int xbase, ybase; |
275 | int xsize, ysize; |
276 | int xstep, ystep; |
277 | |
278 | === modified file 'bogl-vga16.c' |
279 | --- bogl-vga16.c 2004-05-05 22:44:29 +0000 |
280 | +++ bogl-vga16.c 2012-05-22 12:18:18 +0000 |
281 | @@ -563,7 +563,7 @@ |
282 | { |
283 | for (plane = 0; plane < 4; plane++) |
284 | { |
285 | - volatile char *dst = saved + plane * 16 * 3; |
286 | + volatile char *dst = (char *) saved + plane * 16 * 3; |
287 | volatile char *src = bogl_frame + sx_ofs + y1 * bogl_line_len; |
288 | int y = y_count; |
289 | |
290 | @@ -588,7 +588,7 @@ |
291 | for (plane = 0; plane < 4; plane++) |
292 | { |
293 | volatile char *dst = bogl_frame + sx_ofs + y1 * bogl_line_len; |
294 | - volatile char *src = saved + plane * 16 * 3; |
295 | + volatile char *src = (char *) saved + plane * 16 * 3; |
296 | int y = y_count; |
297 | |
298 | set_write_planes (1 << plane); |
299 | |
300 | === modified file 'boml.c' |
301 | --- boml.c 2009-05-15 15:46:19 +0000 |
302 | +++ boml.c 2012-05-22 12:18:18 +0000 |
303 | @@ -30,6 +30,7 @@ |
304 | #include <unistd.h> |
305 | #include <time.h> |
306 | #include "bogl.h" |
307 | +#include "boglP.h" |
308 | #include "boml.h" |
309 | |
310 | #define M_GPM |
311 | @@ -127,8 +128,10 @@ |
312 | |
313 | #define N_DETECT (N_SERIAL + N_MSBUS + N_PS2 + N_ADB + N_SUN) |
314 | |
315 | +#if N_DETECT > 0 |
316 | /* Detection progress. */ |
317 | static void inc (void); |
318 | +#endif |
319 | |
320 | static void (*detect_callback) (int); |
321 | static int detect_count; |
322 | @@ -323,6 +326,7 @@ |
323 | #endif |
324 | } |
325 | |
326 | +#if N_DETECT > 0 |
327 | /* Calls the callback, if any, with a report of the progress of mouse |
328 | detection in percent, incremented to the next mark (out of N_DETECT |
329 | marks total). */ |
330 | @@ -333,6 +337,7 @@ |
331 | if (detect_callback) |
332 | detect_callback (100 * detect_count / N_DETECT); |
333 | } |
334 | +#endif |
335 | |
336 | /* Reads mouse activities from the proper port and update the screen |
337 | pointer position. */ |
338 | @@ -1307,7 +1312,7 @@ |
339 | |
340 | int len; |
341 | |
342 | - unsigned char *endfield = strpbrk (++curpos, extension_delims); |
343 | + unsigned char *endfield = (unsigned char *) strpbrk ((char *) ++curpos, extension_delims); |
344 | if (!endfield) |
345 | return 0; |
346 | |
347 | @@ -1368,7 +1373,7 @@ |
348 | checksum -= 0x20 * (curpos - start + 1 - 2); |
349 | |
350 | sprintf (hex_checksum, "%.2X", checksum & 0xff); |
351 | - if (strncmp (hex_checksum, curpos, 2)) |
352 | + if (strncmp (hex_checksum, (char *) curpos, 2)) |
353 | return 0; |
354 | } |
355 | |
356 | @@ -1385,16 +1390,16 @@ |
357 | { |
358 | char *model; |
359 | |
360 | - model = strstr (pnp_id->driver_id, "PNP"); |
361 | + model = strstr ((char *) pnp_id->driver_id, "PNP"); |
362 | if (model) |
363 | model += 3; |
364 | else |
365 | - model = pnp_id->product_id; |
366 | + model = (char *) pnp_id->product_id; |
367 | |
368 | if (strncmp (model, "0F", 2)) |
369 | return -1; |
370 | } |
371 | - else if (strcmp (pnp_id->class_name, "MOUSE")) |
372 | + else if (strcmp ((char *) pnp_id->class_name, "MOUSE")) |
373 | return -1; |
374 | |
375 | /* It's a mouse. Default to Microsoft protocol--most common. */ |
376 | @@ -1402,8 +1407,8 @@ |
377 | |
378 | /* Test for some common mouse types. Send me more! */ |
379 | { |
380 | - const char *mfg = pnp_id->manufacturer; |
381 | - const char *model = pnp_id->product_id; |
382 | + const char *mfg = (char *) pnp_id->manufacturer; |
383 | + const char *model = (char *) pnp_id->product_id; |
384 | |
385 | if (!strcmp (mfg, "MSH") && !strcmp (model, "0001")) |
386 | type = T_MS3_SERIAL; |
387 | |
388 | === modified file 'bowl.c' |
389 | --- bowl.c 2010-01-10 11:33:52 +0000 |
390 | +++ bowl.c 2012-05-22 12:18:18 +0000 |
391 | @@ -458,7 +458,7 @@ |
392 | bogl_refresh = 0; |
393 | boml_drawn (0); |
394 | |
395 | - bogl_set_palette (0, 16, palette); |
396 | + bogl_set_palette (0, 16, (const unsigned char (*)[3]) palette); |
397 | bogl_clear (0, 0, bogl_xres, bogl_yres, wallpaper_color); |
398 | bogl_put (0, 0, &pixmap_tux75, pix_cmap); |
399 | bogl_text (55, 0, big_title, (int) strlen (big_title), big_title_color, -1, 0, |
400 | |
401 | === modified file 'debian/bogl-bterm.files' |
402 | --- debian/bogl-bterm.files 2002-03-31 15:43:27 +0000 |
403 | +++ debian/bogl-bterm.files 2012-05-22 12:18:18 +0000 |
404 | @@ -1,2 +1,1 @@ |
405 | usr/bin/bterm |
406 | -usr/share/terminfo/b/bterm |
407 | |
408 | === modified file 'debian/changelog' |
409 | --- debian/changelog 2011-03-17 15:02:28 +0000 |
410 | +++ debian/changelog 2012-05-22 12:18:18 +0000 |
411 | @@ -1,3 +1,63 @@ |
412 | +bogl (0.1.18-8ubuntu1) quantal; urgency=low |
413 | + |
414 | + * Merge with Debian remaining changes: |
415 | + - update the hardcoded color map to the color palette selected by |
416 | + the Canonical Design Team, LP: #730672; |
417 | + - ideally, bterm.c would read these from the configuration file, |
418 | + /etc/vtrgb |
419 | + |
420 | + -- Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> Tue, 22 May 2012 13:04:36 +0100 |
421 | + |
422 | +bogl (0.1.18-8) unstable; urgency=low |
423 | + |
424 | + * Fix non-linux archs build (Closes: Bug#671041). |
425 | + |
426 | + -- Samuel Thibault <sthibault@debian.org> Thu, 03 May 2012 01:15:04 +0200 |
427 | + |
428 | +bogl (0.1.18-7) unstable; urgency=low |
429 | + |
430 | + [ Samuel Thibault ] |
431 | + * control: |
432 | + - Bump Standards-Version to 3.9.3 (no changes). |
433 | + - Set libbogl0 multi-arch: same |
434 | + * rules: Move libraries to multi-arch path. |
435 | + * libbogl0, libbogl-dev: Use multi-arch path. |
436 | + |
437 | + [ Sven Joachim ] |
438 | + * control: |
439 | + - make libbogl0 pre-depend on multi-arch-support |
440 | + - Build-depend on recent debhelper to get misc:Pre-Depends. |
441 | + - Depend and build-depend on ncurses-term (>= 5.9-7) (see #562134). |
442 | + * bogl-bterm: Do not include /usr/share/terminfo/b/bterm anymore. |
443 | + * rules: install the bterm terminfo from ncurses-term into bogl-term-udeb. |
444 | + |
445 | + -- Samuel Thibault <sthibault@debian.org> Sat, 25 Feb 2012 17:26:32 +0100 |
446 | + |
447 | +bogl (0.1.18-6) unstable; urgency=low |
448 | + |
449 | + * Add VCS-Browser and VCS-Git fields. |
450 | + * control: |
451 | + - Depend on hardening-check. |
452 | + - Bump Standards-Version to 3.9.2 (No changes needed). |
453 | + * rules: |
454 | + - Set DEB_BUILD_HARDENING=1 to enable hardening. |
455 | + - Add build-{arch,indep}. |
456 | + - Build udeb separately with -Os (Closes: Bug#314353). |
457 | + |
458 | + -- Samuel Thibault <sthibault@debian.org> Sun, 05 Feb 2012 03:02:06 +0100 |
459 | + |
460 | +bogl (0.1.18-5) unstable; urgency=low |
461 | + |
462 | + * New maintainer (Closes: #385919). |
463 | + * Fix compilation warnings. |
464 | + * Drop -lpng and -lm, they are actually not needed. |
465 | + * Add manpages for mergebdf, pngtobogl, reduce-font. |
466 | + * Remove debian/libbogl0.postinst. |
467 | + * Bump Standards-Version to 3.9.1 (no change needed). |
468 | + * Fix non-Linux build (Closes: #589987). |
469 | + |
470 | + -- Samuel Thibault <sthibault@debian.org> Sun, 20 Mar 2011 19:03:58 +0100 |
471 | + |
472 | bogl (0.1.18-4ubuntu1) natty; urgency=low |
473 | |
474 | * bterm.c: |
475 | @@ -338,7 +398,3 @@ |
476 | |
477 | -- Daniel Jacobowitz <dan@debian.org> Wed, 20 Dec 2000 13:29:38 -0500 |
478 | |
479 | -Local variables: |
480 | -mode: debian-changelog |
481 | -add-log-mailing-address "dan@debian.org" |
482 | -End: |
483 | |
484 | === modified file 'debian/control' |
485 | --- debian/control 2011-03-17 15:02:28 +0000 |
486 | +++ debian/control 2012-05-22 12:18:18 +0000 |
487 | @@ -2,14 +2,16 @@ |
488 | Section: devel |
489 | Priority: optional |
490 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
491 | -XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org> |
492 | -Build-Depends: debhelper (>= 5.0.0), libgd2-noxpm-dev | libgd2-xpm-dev, libpng12-dev |
493 | -Standards-Version: 3.8.4 |
494 | +XSBC-Original-Maintainer: Samuel Thibault <sthibault@debian.org> |
495 | +Build-Depends: debhelper (>= 8.1.3), libgd2-noxpm-dev | libgd2-xpm-dev, hardening-wrapper, ncurses-term (>= 5.9-7) |
496 | +Standards-Version: 3.9.3 |
497 | +Vcs-Browser: http://git.debian.org/?p=collab-maint/bogl.git |
498 | +Vcs-Git: git://git.debian.org/collab-maint/bogl.git |
499 | |
500 | Package: libbogl-dev |
501 | Section: libdevel |
502 | Architecture: any |
503 | -Depends: libbogl0 (= ${binary:Version}), libc6-dev, ${shlibs:Depends}, ${misc:Depends} |
504 | +Depends: libbogl0 (= ${binary:Version}) [linux-any], libc6-dev, ${shlibs:Depends}, ${misc:Depends} |
505 | Description: Ben's Own Graphics Library - development files |
506 | Ben's Own Graphics Library is a small framebuffer library, |
507 | including basic widgets, support for text in multiple |
508 | @@ -20,7 +22,9 @@ |
509 | |
510 | Package: libbogl0 |
511 | Section: libs |
512 | -Architecture: any |
513 | +Architecture: linux-any |
514 | +Multi-Arch: same |
515 | +Pre-Depends: ${misc:Pre-Depends} |
516 | Depends: ${shlibs:Depends}, ${misc:Depends} |
517 | Description: Ben's Own Graphics Library - shared library |
518 | Ben's Own Graphics Library is a small framebuffer library, |
519 | @@ -31,8 +35,8 @@ |
520 | |
521 | Package: bogl-bterm |
522 | Section: utils |
523 | -Architecture: any |
524 | -Depends: ${shlibs:Depends}, ${misc:Depends} |
525 | +Architecture: linux-any |
526 | +Depends: ${shlibs:Depends}, ${misc:Depends}, ncurses-term (>= 5.9-7) |
527 | Description: Ben's Own Graphics Library - graphical terminal |
528 | Ben's Own Graphics Library is a small framebuffer library, |
529 | including basic widgets, support for text in multiple |
530 | @@ -43,7 +47,7 @@ |
531 | Package: bogl-bterm-udeb |
532 | XC-Package-Type: udeb |
533 | Section: debian-installer |
534 | -Architecture: any |
535 | +Architecture: linux-any |
536 | Priority: extra |
537 | Depends: ${shlibs:Depends} |
538 | Description: Ben's Own Graphics Library - graphical terminal |
539 | |
540 | === added file 'debian/libbogl-dev.dirs' |
541 | --- debian/libbogl-dev.dirs 1970-01-01 00:00:00 +0000 |
542 | +++ debian/libbogl-dev.dirs 2012-05-22 12:18:18 +0000 |
543 | @@ -0,0 +1,1 @@ |
544 | +usr/include/bogl |
545 | |
546 | === modified file 'debian/libbogl-dev.files' |
547 | --- debian/libbogl-dev.files 2002-03-31 15:43:27 +0000 |
548 | +++ debian/libbogl-dev.files 2012-05-22 12:18:18 +0000 |
549 | @@ -2,6 +2,6 @@ |
550 | usr/bin/pngtobogl |
551 | usr/bin/mergebdf |
552 | usr/bin/reduce-font |
553 | -usr/lib/libbogl.a |
554 | -usr/lib/libbogl.so |
555 | +usr/lib/*/libbogl.a |
556 | +usr/lib/*/libbogl.so |
557 | usr/include/bogl/* |
558 | |
559 | === added file 'debian/libbogl-dev.files.hurd-i386' |
560 | --- debian/libbogl-dev.files.hurd-i386 1970-01-01 00:00:00 +0000 |
561 | +++ debian/libbogl-dev.files.hurd-i386 2012-05-22 12:18:18 +0000 |
562 | @@ -0,0 +1,2 @@ |
563 | +usr/bin/mergebdf |
564 | +usr/bin/reduce-font |
565 | |
566 | === added file 'debian/libbogl-dev.files.kfreebsd-amd64' |
567 | --- debian/libbogl-dev.files.kfreebsd-amd64 1970-01-01 00:00:00 +0000 |
568 | +++ debian/libbogl-dev.files.kfreebsd-amd64 2012-05-22 12:18:18 +0000 |
569 | @@ -0,0 +1,2 @@ |
570 | +usr/bin/mergebdf |
571 | +usr/bin/reduce-font |
572 | |
573 | === added file 'debian/libbogl-dev.files.kfreebsd-i386' |
574 | --- debian/libbogl-dev.files.kfreebsd-i386 1970-01-01 00:00:00 +0000 |
575 | +++ debian/libbogl-dev.files.kfreebsd-i386 2012-05-22 12:18:18 +0000 |
576 | @@ -0,0 +1,2 @@ |
577 | +usr/bin/mergebdf |
578 | +usr/bin/reduce-font |
579 | |
580 | === modified file 'debian/libbogl-dev.manpages' |
581 | --- debian/libbogl-dev.manpages 2004-05-05 22:44:29 +0000 |
582 | +++ debian/libbogl-dev.manpages 2012-05-22 12:18:18 +0000 |
583 | @@ -1,1 +1,4 @@ |
584 | bdftobogl.1 |
585 | +mergebdf.1 |
586 | +pngtobogl.1 |
587 | +reduce-font.1 |
588 | |
589 | === added file 'debian/libbogl0.dirs' |
590 | --- debian/libbogl0.dirs 1970-01-01 00:00:00 +0000 |
591 | +++ debian/libbogl0.dirs 2012-05-22 12:18:18 +0000 |
592 | @@ -0,0 +1,1 @@ |
593 | +usr/lib |
594 | |
595 | === modified file 'debian/libbogl0.files' |
596 | --- debian/libbogl0.files 2002-03-31 15:43:27 +0000 |
597 | +++ debian/libbogl0.files 2012-05-22 12:18:18 +0000 |
598 | @@ -1,2 +1,2 @@ |
599 | -usr/lib/libbogl.so.0.1 |
600 | -usr/lib/libbogl.so.0 |
601 | +usr/lib/*/libbogl.so.0.1 |
602 | +usr/lib/*/libbogl.so.0 |
603 | |
604 | === modified file 'debian/rules' |
605 | --- debian/rules 2010-01-10 11:33:52 +0000 |
606 | +++ debian/rules 2012-05-22 12:18:18 +0000 |
607 | @@ -14,13 +14,28 @@ |
608 | #major=`ls src/.libs/lib*.so.* | \ |
609 | # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` |
610 | |
611 | -build: build-stamp |
612 | +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) |
613 | +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) |
614 | + |
615 | +build: build-arch |
616 | +build-indep: |
617 | +build-arch: build-stamp |
618 | build-stamp: |
619 | dh_testdir |
620 | |
621 | - # Add here commands to compile the package. |
622 | - $(MAKE) depend |
623 | - $(MAKE) |
624 | + mkdir -p build-udeb |
625 | + (cd build-udeb ; ln -sf ../* .) |
626 | + rm -f build-udeb/Makefile |
627 | + sed -e 's/-O2/-Os/' < Makefile > build-udeb/Makefile |
628 | + |
629 | + $(MAKE) -C build-udeb depend |
630 | + $(MAKE) -C build-udeb |
631 | + |
632 | + mkdir -p build |
633 | + (cd build ; ln -sf ../* .) |
634 | + |
635 | + $(MAKE) -C build depend |
636 | + DEB_BUILD_HARDENING=1 $(MAKE) -C build |
637 | |
638 | touch build-stamp |
639 | |
640 | @@ -28,7 +43,7 @@ |
641 | dh_testdir |
642 | rm -f build-stamp configure-stamp |
643 | |
644 | - # Add here commands to clean up after the build process. |
645 | + rm -fr build build-udeb |
646 | $(MAKE) clean |
647 | |
648 | dh_clean |
649 | @@ -42,14 +57,20 @@ |
650 | dh_testdir |
651 | dh_testroot |
652 | |
653 | - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp |
654 | + $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp |
655 | +ifeq ($(DEB_HOST_ARCH_OS), linux) |
656 | + mkdir $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) |
657 | + mv $(CURDIR)/debian/tmp/usr/lib/lib* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) |
658 | +endif |
659 | |
660 | dh_movefiles |
661 | |
662 | +ifeq ($(DEB_HOST_ARCH_OS), linux) |
663 | install -d debian/bogl-bterm-udeb/usr/bin |
664 | - install -m 755 debian/bogl-bterm/usr/bin/bterm debian/bogl-bterm-udeb/usr/bin/bterm |
665 | + install -m 755 build-udeb/bterm debian/bogl-bterm-udeb/usr/bin/bterm |
666 | install -d debian/bogl-bterm-udeb/usr/share/terminfo/b |
667 | - install -m 644 debian/bogl-bterm/usr/share/terminfo/b/bterm debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm |
668 | + install -m 644 /usr/share/terminfo/b/bterm debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm |
669 | +endif |
670 | |
671 | dh_installdocs |
672 | dh_installexamples |
673 | @@ -70,4 +91,4 @@ |
674 | dh_builddeb |
675 | |
676 | binary: binary-indep binary-arch |
677 | -.PHONY: build clean binary-indep binary-arch binary configure |
678 | +.PHONY: build build-indep build-arch clean binary-indep binary-arch binary configure |
679 | |
680 | === added file 'mergebdf.1' |
681 | --- mergebdf.1 1970-01-01 00:00:00 +0000 |
682 | +++ mergebdf.1 2012-05-22 12:18:18 +0000 |
683 | @@ -0,0 +1,8 @@ |
684 | +.TH "BOGL" "1" "March 2011" "BOGL" "BOGL" |
685 | +.SH NAME |
686 | +mergebdf \- Merge BDF fonts |
687 | +.SH SYNOPSIS |
688 | +\fBmergebdf\fR \fIfont1.bdf\fR ... > \fInewfont.bdf\fR |
689 | +.SH DESCRIPTION |
690 | +.B mergebdf |
691 | +merges several BDF fonts into one. There is no option. |
692 | |
693 | === added file 'pngtobogl.1' |
694 | --- pngtobogl.1 1970-01-01 00:00:00 +0000 |
695 | +++ pngtobogl.1 2012-05-22 12:18:18 +0000 |
696 | @@ -0,0 +1,8 @@ |
697 | +.TH "BOGL" "1" "March 2011" "BOGL" "BOGL" |
698 | +.SH NAME |
699 | +pngtobogl \- Convert PNG image to bogl C file |
700 | +.SH SYNOPSIS |
701 | +\fBpngtobogl\fR \fIgraphic.png\fR > \fIgraphic.c\fR |
702 | +.SH DESCRIPTION |
703 | +.B pngtobogl |
704 | +converts a PNG image into a C file that can be used with the bogl library. There is no option. |
705 | |
706 | === added file 'reduce-font.1' |
707 | --- reduce-font.1 1970-01-01 00:00:00 +0000 |
708 | +++ reduce-font.1 2012-05-22 12:18:18 +0000 |
709 | @@ -0,0 +1,8 @@ |
710 | +.TH "BOGL" "1" "March 2011" "BOGL" "BOGL" |
711 | +.SH NAME |
712 | +reduce-font \- reduce a font to a set of glyphs |
713 | +.SH SYNOPSIS |
714 | +\fBreduce-font\fR \fIfont.bdf\fR < \fItext\fR |
715 | +.SH DESCRIPTION |
716 | +.B reduce-font |
717 | +reduces the content of a font, provided the set of text that will have to be displayed with the reduced font. There is no option. |
718 | |
719 | === modified file 'reduce-font.c' |
720 | --- reduce-font.c 2002-03-31 15:43:27 +0000 |
721 | +++ reduce-font.c 2012-05-22 12:18:18 +0000 |
722 | @@ -39,7 +39,7 @@ |
723 | for (i = 0 ; i < 32 ; x <<= 1, ++i) |
724 | putchar (x & 0x80000000 ? '1' : '0'); |
725 | |
726 | - printf (": %d\n", l); |
727 | + printf (": %zu\n", l); |
728 | } |
729 | |
730 | int |
731 | @@ -57,7 +57,7 @@ |
732 | |
733 | fprintf (stderr, "setlocale: %s\n", locale); |
734 | #if 1 |
735 | - fprintf (stderr, "FYI: MB_CUR_MAX/MB_LEN_MAX: %d/%d\n", MB_CUR_MAX, MB_LEN_MAX); |
736 | + fprintf (stderr, "FYI: MB_CUR_MAX/MB_LEN_MAX: %zu/%d\n", MB_CUR_MAX, MB_LEN_MAX); |
737 | #endif |
738 | if (argc != 2) |
739 | usage (); |
740 | @@ -89,16 +89,16 @@ |
741 | switch (got = mbrtowc (&wc, buffer, avail, &wstate)) |
742 | { |
743 | case -1: /* An error occured */ |
744 | - fprintf (stderr, "error -1 at position %ld (bytes: %d %*.*s)\n", pos, avail, avail, avail, buffer); |
745 | + fprintf (stderr, "error -1 at position %ld (bytes: %zu %*.*s)\n", pos, avail, (int) avail, (int) avail, buffer); |
746 | error = 1; |
747 | break; |
748 | |
749 | case -2: |
750 | - fprintf (stderr, "-2: bytes: %d %*.*s\n", avail, avail, avail, buffer); |
751 | + fprintf (stderr, "-2: bytes: %zu %*.*s\n", avail, (int) avail, (int) avail, buffer); |
752 | continue; |
753 | |
754 | case 0: /* Nothing's read so far */ |
755 | - fprintf (stderr, "0: bytes: %d %*.*s\n", avail, avail, avail, buffer); |
756 | + fprintf (stderr, "0: bytes: %zu %*.*s\n", avail, (int) avail, (int) avail, buffer); |
757 | continue; |
758 | |
759 | default: /* Seems to read something reasonable */ |
760 | @@ -131,7 +131,7 @@ |
761 | for (chars = 0, i = 0 ; i < BITS_NO ; ++i) |
762 | chars += bits (used[i]); |
763 | |
764 | - fprintf (stderr, "Used chars: %d (%d processed)\n", chars, pos); |
765 | + fprintf (stderr, "Used chars: %zu (%zu processed)\n", chars, pos); |
766 | #if 1 |
767 | { |
768 | char *buf = (char *)malloc (1024); |
769 | @@ -142,11 +142,11 @@ |
770 | if (header) |
771 | { |
772 | if (strncmp (buf, "CHARS ", 6) == 0) |
773 | - printf ("CHARS %d\n", chars); |
774 | + printf ("CHARS %zu\n", chars); |
775 | else if (strncmp (buf, "STARTCHAR ", 10) == 0) |
776 | header = 0; |
777 | else |
778 | - fprintf (stdout, buf); |
779 | + fprintf (stdout, "%s", buf); |
780 | } |
781 | |
782 | if (!header) |
783 | @@ -159,7 +159,7 @@ |
784 | } |
785 | |
786 | if (docopy) |
787 | - fprintf (stdout, buf); |
788 | + fprintf (stdout, "%s", buf); |
789 | } |
790 | } |
791 |
I did this independently before seeing this. Sorry.