Package: linpqa Version: 0.51-4 Severity: normal Tags: patch Hi,
Attached is the diff for my linpqa 0.51-4.1 NMU.
diff -Nru /tmp/qra3fJvFdm/linpqa-0.51/debian/changelog /tmp/RM1bBe2Uu9/linpqa-0.51/debian/changelog --- /tmp/qra3fJvFdm/linpqa-0.51/debian/changelog 2006-09-16 12:22:47.000000000 +0200 +++ /tmp/RM1bBe2Uu9/linpqa-0.51/debian/changelog 2006-09-16 12:22:47.000000000 +0200 @@ -1,3 +1,15 @@ +linpqa (0.51-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Make package compile with newer libpisock; fixes FTBFS. + (Closes: #386189) + * Patch the code to use the new API; patch from Ludovic Rousseau (adapted + to apply cleanly). + * Update versioned build-dependency on libpisock-dev to 0.12.1-1, to make + sure we compile against the new API. + + -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sat, 16 Sep 2006 03:20:49 +0200 + linpqa (0.51-4) unstable; urgency=low * Thanks Colin, for NMU diff -Nru /tmp/qra3fJvFdm/linpqa-0.51/debian/control /tmp/RM1bBe2Uu9/linpqa-0.51/debian/control --- /tmp/qra3fJvFdm/linpqa-0.51/debian/control 2006-09-16 12:22:47.000000000 +0200 +++ /tmp/RM1bBe2Uu9/linpqa-0.51/debian/control 2006-09-16 12:22:47.000000000 +0200 @@ -2,7 +2,7 @@ Section: otherosfs Priority: extra Maintainer: Michael D. Ivey <[EMAIL PROTECTED]> -Build-Depends: libpisock-dev (>= 0.11.3-1), debhelper +Build-Depends: libpisock-dev (>= 0.12.1-1), debhelper Standards-Version: 3.6.1 Package: linpqa diff -Nru /tmp/qra3fJvFdm/linpqa-0.51/PQAcompile.c /tmp/RM1bBe2Uu9/linpqa-0.51/PQAcompile.c --- /tmp/qra3fJvFdm/linpqa-0.51/PQAcompile.c 2000-08-26 17:29:07.000000000 +0200 +++ /tmp/RM1bBe2Uu9/linpqa-0.51/PQAcompile.c 2006-09-16 12:22:47.000000000 +0200 @@ -19,10 +19,10 @@ //#include <libhtmlparse.h> -#include <libpisock/pi-source.h> -#include <libpisock/pi-socket.h> -#include <libpisock/pi-dlp.h> -#include <libpisock/pi-file.h> +#include <pi-source.h> +#include <pi-socket.h> +#include <pi-dlp.h> +#include <pi-file.h> #define TYPE_HTML 4 @@ -180,6 +180,7 @@ // return(0); //} +#if 0 static time_t pilot_time_to_unix_time (unsigned long raw_time) { @@ -191,6 +192,7 @@ { return (unsigned long)((unsigned long)t + PILOT_TIME_DELTA); } +#endif int load_bitmap(char *image[], FILE *in) diff -Nru /tmp/qra3fJvFdm/linpqa-0.51/PQAdecompile.c /tmp/RM1bBe2Uu9/linpqa-0.51/PQAdecompile.c --- /tmp/qra3fJvFdm/linpqa-0.51/PQAdecompile.c 2006-09-16 12:22:47.000000000 +0200 +++ /tmp/RM1bBe2Uu9/linpqa-0.51/PQAdecompile.c 2006-09-16 12:22:47.000000000 +0200 @@ -23,10 +23,10 @@ #include <time.h> #include <string.h> -#include <libpisock/pi-source.h> -#include <libpisock/pi-socket.h> -#include <libpisock/pi-dlp.h> -#include <libpisock/pi-file.h> +#include <pi-source.h> +#include <pi-socket.h> +#include <pi-dlp.h> +#include <pi-file.h> #ifdef sun extern char* optarg; @@ -89,10 +89,7 @@ exit (1); } - if (pi_file_get_info (pf, &info) < 0) { - fprintf (stderr, "can't get info\n\n"); - exit (1); - } + pi_file_get_info (pf, &info); if(vflag) dump_header (pf, &info); @@ -1174,10 +1171,7 @@ int i, pos,x, y, tmp; char *buf; - if (pi_file_get_app_info (pf, &app_info, &app_info_size) < 0) { - printf ("can't get app_info\n\n"); - return; - } + pi_file_get_app_info (pf, &app_info, &app_info_size); printf ("app_info_size %d\n", app_info_size);