Dear maintainer,
Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug: #552903.
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:
a/debian/changelog
b/debian/patches/10-getline-function.patch
b/debian/patches/series
b/debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 1872d6d..3948584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+epwutil (1.1-8.1) unstable; urgency=low
+
+ [Jari Aalto]
+ * Non-maintainer upload.
+ * Update to packaging format "3.0 (quilt)" due to patch.
+ * debian/patches
+ - (number 10): Add patch to fix error: conflicting types for getline.
+ (RC bug FTBFS serious; Closes: #552903).
+ * debian/source/format
+ - New file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 09 Jan 2010 20:44:04 +0200
+
epwutil (1.1-8) unstable; urgency=low
* Bumped to Standards-Version: 3.8.0.
diff --git a/debian/patches/10-getline-function.patch b/debian/patches/10-getline-function.patch
new file mode 100644
index 0000000..3f9578c
--- /dev/null
+++ b/debian/patches/10-getline-function.patch
@@ -0,0 +1,71 @@
+From 6981c596ece878ff581556a719608513f88208ae Mon Sep 17 00:00:00 2001
+From: Jari Aalto <jari.aa...@cante.net>
+Date: Sat, 9 Jan 2010 20:40:44 +0200
+Subject: [PATCH] Rename getline() to getline2() to avoid clash
+
+Signed-off-by: Jari Aalto <jari.aa...@cante.net>
+---
+ catdump.c | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/catdump.c b/catdump.c
+index b40bb27..8874db8 100644
+--- a/catdump.c
++++ b/catdump.c
+@@ -201,7 +201,7 @@ void outhex();
+ void outstr();
+ void outjstr();
+ int undump();
+-uchr *getline();
++uchr *getline2(); /* getline() is declared in /usr/include/stdio.h */
+ uchr *getvalue();
+ int gethex();
+ int hexdigit();
+@@ -561,7 +561,7 @@ char *txtfile, *catalog;
+ err = 0;
+ line = 0;
+
+- if (getline(buf, fp) == NULL ||
++ if (getline2(buf, fp) == NULL ||
+ strncmp(buf, CAT_ENTRY, strlen(CAT_ENTRY))) {
+ fprintf(stderr, "ERR: ¹àÌÜ %s ¤¬¤¢¤ê¤Þ¤»¤ó\n", CAT_ENTRY);
+ fclose(fp);
+@@ -571,7 +571,7 @@ char *txtfile, *catalog;
+ st = 0;
+ hdr = (HDR_T *)catbuf;
+ mask = 0L;
+- while (getline(buf, fp) != NULL && *buf != '[') {
++ while (getline2(buf, fp) != NULL && *buf != '[') {
+ if ((p = getvalue(buf)) == NULL) {
+ fprintf(stderr, "ERR: line %d: ¹½Ê¸¤Ë¸í¤ê¤¬¤¢¤ê¤Þ¤¹\n", line);
+ err++;
+@@ -666,7 +666,7 @@ char *txtfile, *catalog;
+ if (strncmp(buf, BOOK_ENTRY, strlen(BOOK_ENTRY))) {
+ fprintf(stderr, "ERR: line %d: ÉÔÌÀ¤Ê¹àÌܤǤ¹(%s)\n", line, buf);
+ err++;
+- while (getline(buf, fp) != NULL && *buf != '[')
++ while (getline2(buf, fp) != NULL && *buf != '[')
+ ;
+ if (*buf == '\0')
+ break;
+@@ -680,7 +680,7 @@ char *txtfile, *catalog;
+ break;
+ }
+ mask = 0;
+- while (getline(buf, fp) != NULL && *buf != '[') {
++ while (getline2(buf, fp) != NULL && *buf != '[') {
+ if ((p = getvalue(buf)) == NULL) {
+ fprintf(stderr, "ERR: line %d: ¹½Ê¸¤Ë¸í¤ê¤¬¤¢¤ê¤Þ¤¹\n", line);
+ err++;
+@@ -917,7 +917,7 @@ char *txtfile, *catalog;
+ }
+
+ uchr *
+-getline(buf, fp)
++getline2(buf, fp)
+ uchr *buf;
+ FILE *fp;
+ {
+--
+1.6.5
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5f6cc29
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-getline-function.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
