Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #552898.
See the debian/patches directory for the important fixes. Feel free to
contact if you have any questions.
Thank you for maintaining the package,
Jari Aalto
[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html
lsdiff(1) of changes:
gbdfed-1.5/debian/changelog
gbdfed-1.5/debian/patches/10-getline.patch
gbdfed-1.5/debian/patches/debian-changes-1.5-1.1
gbdfed-1.5/debian/patches/series
gbdfed-1.5/debian/source/format
gbdfed-1.5/Makefile.in
diffstat for gbdfed-1.5 gbdfed-1.5
Makefile.in | 3 +
debian/changelog | 15 +++++++++
debian/patches/10-getline.patch | 55 ++++++++++++++++++++++++++++++++++
debian/patches/debian-changes-1.5-1.1 | 46 ++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/source/format | 1
6 files changed, 121 insertions(+), 1 deletion(-)
diff -Nru gbdfed-1.5/debian/changelog gbdfed-1.5/debian/changelog
--- gbdfed-1.5/debian/changelog 2010-01-16 22:49:05.000000000 +0200
+++ gbdfed-1.5/debian/changelog 2010-01-16 11:17:36.000000000 +0200
@@ -1,3 +1,18 @@
+gbdfed (1.5-1.1) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * Move to format: 3.0 (quilt) due to patch.
+ * debian/patches
+ - (number 10): Fix getline() conflict with eglibc.
+ Thanks to Jon Bernard <berna...@gmail.com> from 1.5-1ubuntu1.
+ (RC bug FTBFS; Closes: #552898).
+ - (debian-changes-*): added automatically by the packaging format 3.0.
+ * debian/source/format
+ - New file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 16 Jan 2010 11:14:12 +0200
+
gbdfed (1.5-1) unstable; urgency=low
* New Upstream Version (Closes: #500531)
diff -Nru gbdfed-1.5/debian/patches/10-getline.patch gbdfed-1.5/debian/patches/10-getline.patch
--- gbdfed-1.5/debian/patches/10-getline.patch 1970-01-01 02:00:00.000000000 +0200
+++ gbdfed-1.5/debian/patches/10-getline.patch 2010-01-16 11:17:36.000000000 +0200
@@ -0,0 +1,55 @@
+From ff39330fd0993d184c03c6bbba4745cf49eb1bc8 Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Sat, 16 Jan 2010 11:04:32 +0200
+Subject: [PATCH] bdfgname.c: rename conflicting getline()
+
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ bdfgname.c | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bdfgname.c b/bdfgname.c
+index 7b439ff..f038843 100644
+--- a/bdfgname.c
++++ b/bdfgname.c
+@@ -39,7 +39,7 @@ static unsigned int adobe_names_used;
+ #define MAX_GLYPH_NAME_LEN 127
+
+ static int
+-getline(FILE *in, char *buf, int limit)
++bdf_getline(FILE *in, char *buf, int limit)
+ {
+ int c, i;
+
+@@ -78,11 +78,11 @@ _bdf_find_name(int code, char *name, FILE *in)
+
+ while (!feof(in)) {
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) bdf_getline(in, buf, 256);
+ while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+ buf[0] = 0;
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) bdf_getline(in, buf, 256);
+ }
+
+ if (buf[0] == 0)
+@@ -139,11 +139,11 @@ _bdf_load_adobe_names(FILE *in)
+
+ while (!feof(in)) {
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) bdf_getline(in, buf, 256);
+ while (!feof(in) && (buf[0] == 0 || buf[0] == '#')) {
+ buf[0] = 0;
+ pos = ftell(in);
+- (void) getline(in, buf, 256);
++ (void) bdf_getline(in, buf, 256);
+ }
+
+ if (adobe_names_used == adobe_names_size) {
+--
+1.6.5
+
diff -Nru gbdfed-1.5/debian/patches/debian-changes-1.5-1.1 gbdfed-1.5/debian/patches/debian-changes-1.5-1.1
--- gbdfed-1.5/debian/patches/debian-changes-1.5-1.1 1970-01-01 02:00:00.000000000 +0200
+++ gbdfed-1.5/debian/patches/debian-changes-1.5-1.1 2010-01-16 11:19:06.000000000 +0200
@@ -0,0 +1,46 @@
+Description: Upstream changes introduced in version 1.5-1.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ gbdfed (1.5-1.1) unstable; urgency=low
+ .
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * Move to format: 3.0 (quilt) due to patch.
+ * debian/patches
+ - (number 10): Fix getline() conflict with eglibc.
+ Thanks to Jon Bernard <berna...@gmail.com> from 1.5-1ubuntu1.
+ (RC bug FTBFS; Closes: #552898).
+ - (debian-changes-*): added automatically by the packaging format 3.0.
+ * debian/source/format
+ - New file.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Jari Aalto <jari.aa...@cante.net>
+Bug-Debian: http://bugs.debian.org/552898
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- gbdfed-1.5.orig/Makefile.in
++++ gbdfed-1.5/Makefile.in
+@@ -28,8 +28,7 @@ CC = @CC@
+ CFLAGS = @XX_CFLAGS@ @CFLAGS@
+
+ DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED
++ -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
+
+ SRCS = bdf.c \
+ bdfcons.c \
diff -Nru gbdfed-1.5/debian/patches/series gbdfed-1.5/debian/patches/series
--- gbdfed-1.5/debian/patches/series 1970-01-01 02:00:00.000000000 +0200
+++ gbdfed-1.5/debian/patches/series 2010-01-16 11:19:06.000000000 +0200
@@ -0,0 +1,2 @@
+10-getline.patch
+debian-changes-1.5-1.1
diff -Nru gbdfed-1.5/debian/source/format gbdfed-1.5/debian/source/format
--- gbdfed-1.5/debian/source/format 1970-01-01 02:00:00.000000000 +0200
+++ gbdfed-1.5/debian/source/format 2010-01-16 22:49:05.421407371 +0200
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru gbdfed-1.5/Makefile.in gbdfed-1.5/Makefile.in
--- gbdfed-1.5/Makefile.in 2010-01-16 22:49:05.000000000 +0200
+++ gbdfed-1.5/Makefile.in 2009-03-06 20:12:28.000000000 +0200
@@ -28,7 +28,8 @@
CFLAGS = @XX_CFLAGS@ @CFLAGS@
DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
+ -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED
SRCS = bdf.c \
bdfcons.c \
