--- bogl-0.1.18.orig/bogl-pcfb.c +++ bogl-0.1.18/bogl-pcfb.c @@ -110,7 +110,7 @@ return; bogl_drawing = 1; - dst = (char *) bogl_frame + (y1 * bogl_line_len); + dst = (unsigned char *) bogl_frame + (y1 * bogl_line_len); for (; y1 < y2; y1++) { memset_var (dst, cmap_lookup(c), x1, x2 - x1, bpp); @@ -282,7 +282,7 @@ if (visible) { - char *dst = save; + char *dst = (char *) save; char *src = (char *) bogl_frame + (sx_ofs * bpp / 8) + (y1 * bogl_line_len); @@ -300,7 +300,7 @@ char *dst = (char *) bogl_frame + (sx_ofs * bpp / 8) + (y1 * bogl_line_len); - char *src = save; + char *src = (char *) save; int y; for (y = 0; y < y_count; y++) @@ -330,7 +330,7 @@ unsigned short bg_bits, fg_bits; int x; - dst = (char *) bogl_frame + dst = (unsigned char *) bogl_frame + ((y1 + y) * bogl_line_len); bg_bits = *mask_p ^ *color_p; fg_bits = *mask_p & *color_p; --- bogl-0.1.18.orig/bogl-term.c +++ bogl-0.1.18/bogl-term.c @@ -26,6 +26,7 @@ #include "bogl.h" #include "bogl-term.h" +#include struct bogl_term *bogl_term_new(struct bogl_font *font) { --- bogl-0.1.18.orig/bogl-bgf.c +++ bogl-0.1.18/bogl-bgf.c @@ -7,6 +7,7 @@ #include #include "bogl.h" +#include "boglP.h" #include "bogl-font.h" struct bogl_font *bogl_mmap_font(char *file) --- bogl-0.1.18.orig/pngtobogl.1 +++ bogl-0.1.18/pngtobogl.1 @@ -0,0 +1,8 @@ +.TH "BOGL" "1" "March 2011" "BOGL" "BOGL" +.SH NAME +pngtobogl \- Convert PNG image to bogl C file +.SH SYNOPSIS +\fBpngtobogl\fR \fIgraphic.png\fR > \fIgraphic.c\fR +.SH DESCRIPTION +.B pngtobogl +converts a PNG image into a C file that can be used with the bogl library. There is no option. --- bogl-0.1.18.orig/bogl-font.c +++ bogl-0.1.18/bogl-font.c @@ -298,7 +298,7 @@ goto lossage; } - cp = strstr (font_name, ".bdf"); + cp = (unsigned char *) strstr (font_name, ".bdf"); if (cp) *cp = 0; for (cp = (unsigned char *) font_name; *cp; cp++) --- bogl-0.1.18.orig/reduce-font.c +++ bogl-0.1.18/reduce-font.c @@ -39,7 +39,7 @@ for (i = 0 ; i < 32 ; x <<= 1, ++i) putchar (x & 0x80000000 ? '1' : '0'); - printf (": %d\n", l); + printf (": %zu\n", l); } int @@ -57,7 +57,7 @@ fprintf (stderr, "setlocale: %s\n", locale); #if 1 - fprintf (stderr, "FYI: MB_CUR_MAX/MB_LEN_MAX: %d/%d\n", MB_CUR_MAX, MB_LEN_MAX); + fprintf (stderr, "FYI: MB_CUR_MAX/MB_LEN_MAX: %zu/%d\n", MB_CUR_MAX, MB_LEN_MAX); #endif if (argc != 2) usage (); @@ -89,16 +89,16 @@ switch (got = mbrtowc (&wc, buffer, avail, &wstate)) { case -1: /* An error occured */ - fprintf (stderr, "error -1 at position %ld (bytes: %d %*.*s)\n", pos, avail, avail, avail, buffer); + fprintf (stderr, "error -1 at position %ld (bytes: %zu %*.*s)\n", pos, avail, (int) avail, (int) avail, buffer); error = 1; break; case -2: - fprintf (stderr, "-2: bytes: %d %*.*s\n", avail, avail, avail, buffer); + fprintf (stderr, "-2: bytes: %zu %*.*s\n", avail, (int) avail, (int) avail, buffer); continue; case 0: /* Nothing's read so far */ - fprintf (stderr, "0: bytes: %d %*.*s\n", avail, avail, avail, buffer); + fprintf (stderr, "0: bytes: %zu %*.*s\n", avail, (int) avail, (int) avail, buffer); continue; default: /* Seems to read something reasonable */ @@ -131,7 +131,7 @@ for (chars = 0, i = 0 ; i < BITS_NO ; ++i) chars += bits (used[i]); - fprintf (stderr, "Used chars: %d (%d processed)\n", chars, pos); + fprintf (stderr, "Used chars: %zu (%zu processed)\n", chars, pos); #if 1 { char *buf = (char *)malloc (1024); @@ -142,11 +142,11 @@ if (header) { if (strncmp (buf, "CHARS ", 6) == 0) - printf ("CHARS %d\n", chars); + printf ("CHARS %zu\n", chars); else if (strncmp (buf, "STARTCHAR ", 10) == 0) header = 0; else - fprintf (stdout, buf); + fprintf (stdout, "%s", buf); } if (!header) @@ -159,7 +159,7 @@ } if (docopy) - fprintf (stdout, buf); + fprintf (stdout, "%s", buf); } } --- bogl-0.1.18.orig/mergebdf.1 +++ bogl-0.1.18/mergebdf.1 @@ -0,0 +1,8 @@ +.TH "BOGL" "1" "March 2011" "BOGL" "BOGL" +.SH NAME +mergebdf \- Merge BDF fonts +.SH SYNOPSIS +\fBmergebdf\fR \fIfont1.bdf\fR ... > \fInewfont.bdf\fR +.SH DESCRIPTION +.B mergebdf +merges several BDF fonts into one. There is no option. --- bogl-0.1.18.orig/bterm.c +++ bogl-0.1.18/bterm.c @@ -44,15 +44,16 @@ static const unsigned char palette[16][3] = { - {0x00, 0x00, 0x00}, /* 0: Black. */ - {0xaa, 0x00, 0x00}, /* 1: Red. */ - {0x00, 0xaa, 0x00}, /* 2: Green. */ - {0xaa, 0xaa, 0x00}, /* 3: Brown. */ - {0x00, 0x00, 0xaa}, /* 4: Blue. */ - {0xaa, 0x00, 0xaa}, /* 5: Magenta. */ - {0x00, 0xaa, 0xaa}, /* 6: Cyan. */ - {0xaa, 0xaa, 0xaa}, /* 7: Light gray. */ - {0x55, 0x55, 0x55}, /* 0: Light Gray. */ + /* Colors selected by Canonical's Design Team */ + {0x01, 0x01, 0x01}, /* 0: Black. */ + {0xde, 0x38, 0x2b}, /* 1: Red. */ + {0x39, 0xb5, 0x4a}, /* 2: Green. */ + {0xff, 0xc7, 0x06}, /* 3: Brown. */ + {0x00, 0x6f, 0xb8}, /* 4: Blue. */ + {0x76, 0x26, 0x71}, /* 5: Magenta. */ + {0x2c, 0xb5, 0xe9}, /* 6: Cyan. */ + {0xe1, 0xe1, 0xe1}, /* 7: Light gray. */ + {0x80, 0x80, 0x80}, /* 0: Light Gray. */ {0xff, 0x00, 0x00}, /* 1: Light Red. */ {0x00, 0xff, 0x00}, /* 2: Light Green. */ {0xff, 0xff, 0x00}, /* 3: Yellow. */ --- bogl-0.1.18.orig/bogl-cfb.c +++ bogl-0.1.18/bogl-cfb.c @@ -55,7 +55,7 @@ /* For anything else, assert that we are actually aligned on a pixel boundary, otherwise we are sure to lose */ dst = (unsigned char*) d + offset * b / 8; - assert((((unsigned int)dst * 8) % b) == 0); + assert((((unsigned long)dst * 8) % b) == 0); /* Sanity... */ assert (b <= 32); @@ -79,7 +79,7 @@ /* printf ("Filling %d pixels == %d bytes\n\r", len, len * b / 8); */ /* Align to an int boundary */ - while ((unsigned int)dst % sizeof(unsigned int)) + while ((unsigned long)dst % sizeof(unsigned int)) { /* printf ("Aligning %d bytes\n\r", (unsigned int)dst % sizeof(unsigned int)); */ if (b >= 8) --- bogl-0.1.18.orig/bowl.c +++ bogl-0.1.18/bowl.c @@ -458,7 +458,7 @@ bogl_refresh = 0; boml_drawn (0); - bogl_set_palette (0, 16, palette); + bogl_set_palette (0, 16, (const unsigned char (*)[3]) palette); bogl_clear (0, 0, bogl_xres, bogl_yres, wallpaper_color); bogl_put (0, 0, &pixmap_tux75, pix_cmap); bogl_text (55, 0, big_title, (int) strlen (big_title), big_title_color, -1, 0, --- bogl-0.1.18.orig/Makefile +++ bogl-0.1.18/Makefile @@ -9,6 +9,7 @@ ALLCFLAGS = $(CFLAGS) $(WARNCFLAGS) $(FBCFLAGS) architecture := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU) +os := $(shell uname) LIBOBJECTS = $(LIBBOGLOBJECTS) $(LIBBOMLOBJECTS) $(LIBBOWLOBJECTS) \ $(LIBRSRCOBJECTS) @@ -18,9 +19,12 @@ LIBRSRCOBJECTS = helvB10.o helvB12.o helvR10.o timBI18.o tux75.o SOURCES_DEP = arrow.c bdftobogl.c bogl-cfb.c bogl-cfb.h bogl-cfb8.c \ -bogl-cfb8.h bogl-font.c bogl-font.h bogl-pcfb.c bogl-pcfb.h \ -bogl-tcfb.c bogl-tcfb.h bogl-test.c bogl.c bogl.h boglP.h boml.c \ -boml.h bowl-boxes.c bowl.c bowl.h pngtobogl.c +bogl-cfb8.h bogl-font.c bogl-font.h \ +bogl-test.c bogl.h boglP.h boml.c \ +boml.h bowl.c bowl.h pngtobogl.c + +ifeq ($(os),Linux) + SOURCES_DEP += bogl-pcfb.c bogl-pcfb.h bogl-tcfb.c bogl-tcfb.h bowl-boxes.c bogl.c ifeq (,) FBCFLAGS += -DBOGL_CFB_FB=1 @@ -32,13 +36,18 @@ LIBBOGLOBJECTS += bogl-vga16.o SOURCES_DEP += bogl-vga16.c bogl-vga16.h endif +endif OBJECTS = $(LIBOBJECTS) bowl-boxes.o GENERATED = helvB10.c helvB12.c helvR10.c timBI18.c tux75.c # libutf8/libutf8_plug.so unifont-reduced.bgf -all: depend $(SHARED_LIB) $(LIB) bterm bdftobogl reduce-font +all: depend +ifeq ($(os),Linux) +all: $(SHARED_LIB) $(LIB) bterm bdftobogl pngtobogl +endif +all: reduce-font %.lo: %.c $(CC) $(ALLCFLAGS) -o $@ -fPIC -c $< @@ -86,7 +95,7 @@ ./bdftobogl $< > $@ pngtobogl: pngtobogl.o - $(CC) $(ALLCFLAGS) -o pngtobogl pngtobogl.o -lgd -lpng -lm + $(CC) $(ALLCFLAGS) -o pngtobogl pngtobogl.o -lgd %.c: %.png pngtobogl ./pngtobogl $< > $@ @@ -109,12 +118,16 @@ endif install: all - install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl $(DESTDIR)/usr/bin + install -d $(DESTDIR)/usr/bin +ifeq ($(os),Linux) + install -d $(DESTDIR)/usr/lib $(DESTDIR)/usr/include/bogl install -m644 $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SHARED_LIB) ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(DEVLINK) ln -s $(SHARED_LIB) $(DESTDIR)/usr/lib/$(SONAME) install -m644 $(LIB) $(DESTDIR)/usr/lib/$(LIB) install -m644 *.h $(DESTDIR)/usr/include/bogl - install -m755 bdftobogl mergebdf bterm pngtobogl reduce-font $(DESTDIR)/usr/bin + install -m755 bdftobogl bterm pngtobogl $(DESTDIR)/usr/bin install -d $(DESTDIR)/usr/share/terminfo tic -o$(DESTDIR)/usr/share/terminfo bterm.ti +endif + install -m755 mergebdf reduce-font $(DESTDIR)/usr/bin --- bogl-0.1.18.orig/bogl-tcfb.c +++ bogl-0.1.18/bogl-tcfb.c @@ -137,7 +137,7 @@ return; bogl_drawing = 1; - dst = (char *) bogl_frame + (y1 * bogl_line_len); + dst = (unsigned char *) bogl_frame + (y1 * bogl_line_len); for (; y1 < y2; y1++) { memset_var (dst, cmap_lookup(c), x1, x2 - x1, bpp); @@ -309,7 +309,7 @@ if (visible) { - char *dst = save; + char *dst = (char *) save; char *src = (char *) bogl_frame + (sx_ofs * bpp / 8) + (y1 * bogl_line_len); @@ -327,7 +327,7 @@ char *dst = (char *) bogl_frame + (sx_ofs * bpp / 8) + (y1 * bogl_line_len); - char *src = save; + char *src = (char *) save; int y; for (y = 0; y < y_count; y++) @@ -357,7 +357,7 @@ unsigned short bg_bits, fg_bits; int x; - dst = (char *) bogl_frame + dst = (unsigned char *) bogl_frame + ((y1 + y) * bogl_line_len); bg_bits = *mask_p ^ *color_p; fg_bits = *mask_p & *color_p; --- bogl-0.1.18.orig/reduce-font.1 +++ bogl-0.1.18/reduce-font.1 @@ -0,0 +1,8 @@ +.TH "BOGL" "1" "March 2011" "BOGL" "BOGL" +.SH NAME +reduce-font \- reduce a font to a set of glyphs +.SH SYNOPSIS +\fBreduce-font\fR \fIfont.bdf\fR < \fItext\fR +.SH DESCRIPTION +.B reduce-font +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. --- bogl-0.1.18.orig/bogl-vga16.c +++ bogl-0.1.18/bogl-vga16.c @@ -563,7 +563,7 @@ { for (plane = 0; plane < 4; plane++) { - volatile char *dst = saved + plane * 16 * 3; + volatile char *dst = (char *) saved + plane * 16 * 3; volatile char *src = bogl_frame + sx_ofs + y1 * bogl_line_len; int y = y_count; @@ -588,7 +588,7 @@ for (plane = 0; plane < 4; plane++) { volatile char *dst = bogl_frame + sx_ofs + y1 * bogl_line_len; - volatile char *src = saved + plane * 16 * 3; + volatile char *src = (char *) saved + plane * 16 * 3; int y = y_count; set_write_planes (1 << plane); --- bogl-0.1.18.orig/boml.c +++ bogl-0.1.18/boml.c @@ -30,6 +30,7 @@ #include #include #include "bogl.h" +#include "boglP.h" #include "boml.h" #define M_GPM @@ -127,8 +128,10 @@ #define N_DETECT (N_SERIAL + N_MSBUS + N_PS2 + N_ADB + N_SUN) +#if N_DETECT > 0 /* Detection progress. */ static void inc (void); +#endif static void (*detect_callback) (int); static int detect_count; @@ -323,6 +326,7 @@ #endif } +#if N_DETECT > 0 /* Calls the callback, if any, with a report of the progress of mouse detection in percent, incremented to the next mark (out of N_DETECT marks total). */ @@ -333,6 +337,7 @@ if (detect_callback) detect_callback (100 * detect_count / N_DETECT); } +#endif /* Reads mouse activities from the proper port and update the screen pointer position. */ @@ -1307,7 +1312,7 @@ int len; - unsigned char *endfield = strpbrk (++curpos, extension_delims); + unsigned char *endfield = (unsigned char *) strpbrk ((char *) ++curpos, extension_delims); if (!endfield) return 0; @@ -1368,7 +1373,7 @@ checksum -= 0x20 * (curpos - start + 1 - 2); sprintf (hex_checksum, "%.2X", checksum & 0xff); - if (strncmp (hex_checksum, curpos, 2)) + if (strncmp (hex_checksum, (char *) curpos, 2)) return 0; } @@ -1385,16 +1390,16 @@ { char *model; - model = strstr (pnp_id->driver_id, "PNP"); + model = strstr ((char *) pnp_id->driver_id, "PNP"); if (model) model += 3; else - model = pnp_id->product_id; + model = (char *) pnp_id->product_id; if (strncmp (model, "0F", 2)) return -1; } - else if (strcmp (pnp_id->class_name, "MOUSE")) + else if (strcmp ((char *) pnp_id->class_name, "MOUSE")) return -1; /* It's a mouse. Default to Microsoft protocol--most common. */ @@ -1402,8 +1407,8 @@ /* Test for some common mouse types. Send me more! */ { - const char *mfg = pnp_id->manufacturer; - const char *model = pnp_id->product_id; + const char *mfg = (char *) pnp_id->manufacturer; + const char *model = (char *) pnp_id->product_id; if (!strcmp (mfg, "MSH") && !strcmp (model, "0001")) type = T_MS3_SERIAL; --- bogl-0.1.18.orig/bogl-term.h +++ bogl-0.1.18/bogl-term.h @@ -5,7 +5,7 @@ #include struct bogl_term { - const struct bogl_font *font; + struct bogl_font *font; int xbase, ybase; int xsize, ysize; int xstep, ystep; --- bogl-0.1.18.orig/bogl-cfb.h +++ bogl-0.1.18/bogl-cfb.h @@ -27,12 +27,12 @@ #include struct bits4 { - unsigned int p0:4 __attribute__ ((packed)); - unsigned int p1:4 __attribute__ ((packed)); + unsigned int p0:4; + unsigned int p1:4; } __attribute__ ((packed)); struct bits24 { - unsigned char bytes[3] __attribute__ ((packed)); + unsigned char bytes[3]; } __attribute__ ((packed)); static inline void @@ -41,16 +41,17 @@ switch (b) { case 32: - /* FIXME: probably has endianness problems */ + /* FIXME: has endianness problems */ ((u_int32_t*)(dst))[off] = c; break; case 24: - /* FIXME: probably also has endianness problems */ + /* FIXME: also has endianness problems */ ((struct bits24*)(dst))[off].bytes[2] = (c >> 16); ((struct bits24*)(dst))[off].bytes[1] = (c >> 8); ((struct bits24*)(dst))[off].bytes[0] = c; break; case 16: + /* FIXME: also has endianness problems */ ((unsigned short*)(dst))[off] = c; break; case 8: @@ -93,7 +94,7 @@ } /* Align to an int boundary */ - while ((unsigned int)dst % sizeof(unsigned int)) + while ((unsigned long)dst % sizeof(unsigned int)) { put_var(dst, 0, c, 24); dst += 3; --- bogl-0.1.18.orig/debian/changelog +++ bogl-0.1.18/debian/changelog @@ -1,3 +1,74 @@ +bogl (0.1.18-8ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Update the hardcoded color map to the color palette selected by the + Canonical design team. + * The .orig.tar.gz differs from Debian because 0.1.18-4ubuntu1 incorrectly + included an .orig.tar.gz. Unfortunately there's nothing we can do to + fix this mistake until the upstream version number changes. + + -- Colin Watson Mon, 11 Jun 2012 15:44:31 +0100 + +bogl (0.1.18-8) unstable; urgency=low + + * Fix non-linux archs build (Closes: Bug#671041). + + -- Samuel Thibault Thu, 03 May 2012 01:15:04 +0200 + +bogl (0.1.18-7) unstable; urgency=low + + [ Samuel Thibault ] + * control: + - Bump Standards-Version to 3.9.3 (no changes). + - Set libbogl0 multi-arch: same + * rules: Move libraries to multi-arch path. + * libbogl0, libbogl-dev: Use multi-arch path. + + [ Sven Joachim ] + * control: + - make libbogl0 pre-depend on multi-arch-support + - Build-depend on recent debhelper to get misc:Pre-Depends. + - Depend and build-depend on ncurses-term (>= 5.9-7) (see #562134). + * bogl-bterm: Do not include /usr/share/terminfo/b/bterm anymore. + * rules: install the bterm terminfo from ncurses-term into bogl-term-udeb. + + -- Samuel Thibault Sat, 25 Feb 2012 17:26:32 +0100 + +bogl (0.1.18-6) unstable; urgency=low + + * Add VCS-Browser and VCS-Git fields. + * control: + - Depend on hardening-check. + - Bump Standards-Version to 3.9.2 (No changes needed). + * rules: + - Set DEB_BUILD_HARDENING=1 to enable hardening. + - Add build-{arch,indep}. + - Build udeb separately with -Os (Closes: Bug#314353). + + -- Samuel Thibault Sun, 05 Feb 2012 03:02:06 +0100 + +bogl (0.1.18-5) unstable; urgency=low + + * New maintainer (Closes: #385919). + * Fix compilation warnings. + * Drop -lpng and -lm, they are actually not needed. + * Add manpages for mergebdf, pngtobogl, reduce-font. + * Remove debian/libbogl0.postinst. + * Bump Standards-Version to 3.9.1 (no change needed). + * Fix non-Linux build (Closes: #589987). + + -- Samuel Thibault Sun, 20 Mar 2011 19:03:58 +0100 + +bogl (0.1.18-4ubuntu1) natty; urgency=low + + * bterm.c: + - 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 + + -- Dustin Kirkland Thu, 17 Mar 2011 15:02:28 -0500 + bogl (0.1.18-4) unstable; urgency=low * QA upload. --- bogl-0.1.18.orig/debian/rules +++ bogl-0.1.18/debian/rules @@ -14,13 +14,28 @@ #major=`ls src/.libs/lib*.so.* | \ # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` -build: build-stamp +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +build: build-arch +build-indep: +build-arch: build-stamp build-stamp: dh_testdir - # Add here commands to compile the package. - $(MAKE) depend - $(MAKE) + mkdir -p build-udeb + (cd build-udeb ; ln -sf ../* .) + rm -f build-udeb/Makefile + sed -e 's/-O2/-Os/' < Makefile > build-udeb/Makefile + + $(MAKE) -C build-udeb depend + $(MAKE) -C build-udeb + + mkdir -p build + (cd build ; ln -sf ../* .) + + $(MAKE) -C build depend + DEB_BUILD_HARDENING=1 $(MAKE) -C build touch build-stamp @@ -28,7 +43,7 @@ dh_testdir rm -f build-stamp configure-stamp - # Add here commands to clean up after the build process. + rm -fr build build-udeb $(MAKE) clean dh_clean @@ -42,14 +57,20 @@ dh_testdir dh_testroot - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp +ifeq ($(DEB_HOST_ARCH_OS), linux) + mkdir $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + mv $(CURDIR)/debian/tmp/usr/lib/lib* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) +endif dh_movefiles +ifeq ($(DEB_HOST_ARCH_OS), linux) install -d debian/bogl-bterm-udeb/usr/bin - install -m 755 debian/bogl-bterm/usr/bin/bterm debian/bogl-bterm-udeb/usr/bin/bterm + install -m 755 build-udeb/bterm debian/bogl-bterm-udeb/usr/bin/bterm install -d debian/bogl-bterm-udeb/usr/share/terminfo/b - install -m 644 debian/bogl-bterm/usr/share/terminfo/b/bterm debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm + install -m 644 /usr/share/terminfo/b/bterm debian/bogl-bterm-udeb/usr/share/terminfo/b/bterm +endif dh_installdocs dh_installexamples @@ -70,4 +91,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary configure +.PHONY: build build-indep build-arch clean binary-indep binary-arch binary configure --- bogl-0.1.18.orig/debian/libbogl0.files +++ bogl-0.1.18/debian/libbogl0.files @@ -1,2 +1,2 @@ -usr/lib/libbogl.so.0.1 -usr/lib/libbogl.so.0 +usr/lib/*/libbogl.so.0.1 +usr/lib/*/libbogl.so.0 --- bogl-0.1.18.orig/debian/libbogl0.dirs +++ bogl-0.1.18/debian/libbogl0.dirs @@ -0,0 +1 @@ +usr/lib --- bogl-0.1.18.orig/debian/libbogl-dev.files.hurd-i386 +++ bogl-0.1.18/debian/libbogl-dev.files.hurd-i386 @@ -0,0 +1,2 @@ +usr/bin/mergebdf +usr/bin/reduce-font --- bogl-0.1.18.orig/debian/libbogl-dev.files.kfreebsd-i386 +++ bogl-0.1.18/debian/libbogl-dev.files.kfreebsd-i386 @@ -0,0 +1,2 @@ +usr/bin/mergebdf +usr/bin/reduce-font --- bogl-0.1.18.orig/debian/control +++ bogl-0.1.18/debian/control @@ -1,14 +1,17 @@ Source: bogl Section: devel Priority: optional -Maintainer: Debian QA Group -Build-Depends: debhelper (>= 5.0.0), libgd2-noxpm-dev | libgd2-xpm-dev, libpng12-dev -Standards-Version: 3.8.4 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Samuel Thibault +Build-Depends: debhelper (>= 8.1.3), libgd2-noxpm-dev | libgd2-xpm-dev, hardening-wrapper, ncurses-term (>= 5.9-7) +Standards-Version: 3.9.3 +Vcs-Browser: http://git.debian.org/?p=collab-maint/bogl.git +Vcs-Git: git://git.debian.org/collab-maint/bogl.git Package: libbogl-dev Section: libdevel Architecture: any -Depends: libbogl0 (= ${binary:Version}), libc6-dev, ${shlibs:Depends}, ${misc:Depends} +Depends: libbogl0 (= ${binary:Version}) [linux-any], libc6-dev, ${shlibs:Depends}, ${misc:Depends} Description: Ben's Own Graphics Library - development files Ben's Own Graphics Library is a small framebuffer library, including basic widgets, support for text in multiple @@ -19,7 +22,9 @@ Package: libbogl0 Section: libs -Architecture: any +Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Ben's Own Graphics Library - shared library Ben's Own Graphics Library is a small framebuffer library, @@ -30,8 +35,8 @@ Package: bogl-bterm Section: utils -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: linux-any +Depends: ${shlibs:Depends}, ${misc:Depends}, ncurses-term (>= 5.9-7) Description: Ben's Own Graphics Library - graphical terminal Ben's Own Graphics Library is a small framebuffer library, including basic widgets, support for text in multiple @@ -42,7 +47,7 @@ Package: bogl-bterm-udeb XC-Package-Type: udeb Section: debian-installer -Architecture: any +Architecture: linux-any Priority: extra Depends: ${shlibs:Depends} Description: Ben's Own Graphics Library - graphical terminal --- bogl-0.1.18.orig/debian/libbogl-dev.manpages +++ bogl-0.1.18/debian/libbogl-dev.manpages @@ -1 +1,4 @@ bdftobogl.1 +mergebdf.1 +pngtobogl.1 +reduce-font.1 --- bogl-0.1.18.orig/debian/libbogl-dev.files.kfreebsd-amd64 +++ bogl-0.1.18/debian/libbogl-dev.files.kfreebsd-amd64 @@ -0,0 +1,2 @@ +usr/bin/mergebdf +usr/bin/reduce-font --- bogl-0.1.18.orig/debian/bogl-bterm.files +++ bogl-0.1.18/debian/bogl-bterm.files @@ -1,2 +1 @@ usr/bin/bterm -usr/share/terminfo/b/bterm --- bogl-0.1.18.orig/debian/libbogl-dev.dirs +++ bogl-0.1.18/debian/libbogl-dev.dirs @@ -0,0 +1 @@ +usr/include/bogl --- bogl-0.1.18.orig/debian/libbogl-dev.files +++ bogl-0.1.18/debian/libbogl-dev.files @@ -2,6 +2,6 @@ usr/bin/pngtobogl usr/bin/mergebdf usr/bin/reduce-font -usr/lib/libbogl.a -usr/lib/libbogl.so +usr/lib/*/libbogl.a +usr/lib/*/libbogl.so usr/include/bogl/*