Bug#552844: mini-httpd: NMU diff for 1.19-9.2

[Jari Aalto]

Dear maintainer,

Here is the NMU diff according to DevRef 5.11.1[1][2] for RC bug(s): #552844.
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

[1] http://www.debian.org/doc/developers-reference/pkgs.html#nmu
[2] http://dep.debian.net/deps/dep1.html

lsdiff(1) of changes:

    mini-httpd-1.19/debian/changelog
    mini-httpd-1.19/debian/patches/00list
    
mini-httpd-1.19/debian/patches/10-bug-552844-ftbfs-htpasswd.c-onflicting-types.dpatch


diffstat for mini-httpd_1.19-9.1 mini-httpd_1.19-9.2

 debian/patches/10-bug-552844-ftbfs-htpasswd.c-onflicting-types.dpatch |   28 ++++++++++
 mini-httpd-1.19/debian/changelog                                      |   11 +++
 mini-httpd-1.19/debian/patches/00list                                 |    1 
 3 files changed, 40 insertions(+)

diff -u mini-httpd-1.19/debian/changelog mini-httpd-1.19/debian/changelog
--- mini-httpd-1.19/debian/changelog
+++ mini-httpd-1.19/debian/changelog
@@ -1,3 +1,14 @@
+mini-httpd (1.19-9.2) unstable; urgency=medium
+
+  [Jari Aalto]
+  * Non-maintainer upload.
+  * debian/patches
+    - (number 10): New patch to fix htpasswd.c:52: error:
+      conflicting types for 'getline'. . Thanks to Ruben Molina
+      <rmol...@udea.edu.co>. (FTBFS RC Bug serious; Closes: #552844)
+
+ -- Jari Aalto <jari.aa...@cante.net>  Thu, 07 Jan 2010 11:13:26 +0200
+
 mini-httpd (1.19-9.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u mini-httpd-1.19/debian/patches/00list mini-httpd-1.19/debian/patches/00list
--- mini-httpd-1.19/debian/patches/00list
+++ mini-httpd-1.19/debian/patches/00list
@@ -5,0 +6 @@
+10-bug-552844-ftbfs-htpasswd.c-onflicting-types.dpatch
only in patch2:
unchanged:
--- mini-httpd-1.19.orig/debian/patches/10-bug-552844-ftbfs-htpasswd.c-onflicting-types.dpatch
+++ mini-httpd-1.19/debian/patches/10-bug-552844-ftbfs-htpasswd.c-onflicting-types.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ../bug-552844-ftbfs-htpasswd.c-onflicting-types.dpatch by  <jari.aa...@cante.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bug#552844 FTBFS: htpasswd.c:52: error: conflicting types for getline
+
+...@dpatch@
+
+--- mini-httpd-1.19.orig/htpasswd.c
++++ mini-httpd-1.19/htpasswd.c
+@@ -49,7 +49,7 @@
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int mygetline(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(mygetline(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;