Package: amideco
Severity: normal
Hi,
Attached is the debdiff used for the NMU 0.31e-3.1 for amideco. I have already
uploaded it to delayed/7 so if you do not want this NMU, please kill it (or have
me kill it).
Thank you,
Barry deFreese
Debian QA
diff -u amideco-0.31e/debian/changelog amideco-0.31e/debian/changelog
--- amideco-0.31e/debian/changelog
+++ amideco-0.31e/debian/changelog
@@ -1,3 +1,13 @@
+amideco (0.31e-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * 30_hurd.diff. Fix FTBFS on GNU/Hurd. (Closes: #532695).
+ * 40_bad_table.diff. Fix compression flag. (Closes: #486265).
+ * 50_bad_output.diff. Fix bogus output. (Closes: #486085).
+ + Thanks to Bjørn Mork for the patches (40 and 50).
+
+ -- Barry deFreese <bdefre...@debian.org> Wed, 23 Dec 2009 15:19:51 -0500
+
amideco (0.31e-3) unstable; urgency=low
* Install the binary in /usr/bin, not /bin.
only in patch2:
unchanged:
--- amideco-0.31e.orig/debian/patches/40_bad_table.diff
+++ amideco-0.31e/debian/patches/40_bad_table.diff
@@ -0,0 +1,39 @@
+diff -Nur -x '*.orig' -x '*~' amideco-0.31e/src/amifunc.c
amideco-0.31e.new/src/amifunc.c
+--- amideco-0.31e/src/amifunc.c 2009-12-23 15:23:04.000000000 -0500
++++ amideco-0.31e.new/src/amifunc.c 2009-12-23 15:23:41.000000000 -0500
+@@ -338,11 +338,11 @@
+ part.PartID,
+ PartTotal,
+ GetModuleName(part.PartID),
+- (part.IsComprs!=0x80)?(part.ROMSize):(part.CSize),
+- (part.IsComprs!=0x80)?(part.ROMSize):(part.CSize),
+- (part.IsComprs!=0x80)?(part.ExpSize):(part.CSize),
+- (part.IsComprs!=0x80)?(part.ExpSize):(part.CSize),
+- (part.IsComprs!=0x80)?(IDSign):(" "),
++ ((part.IsComprs&0x80)==0)?(part.ROMSize):(part.CSize),
++ ((part.IsComprs&0x80)==0)?(part.ROMSize):(part.CSize),
++ ((part.IsComprs&0x80)==0)?(part.ExpSize):(part.CSize),
++ ((part.IsComprs&0x80)==0)?(part.ExpSize):(part.CSize),
++ ((part.IsComprs&0x80)==0)?(IDSign):(" "),
+
+ Offset-ConstOff
+ );
+@@ -375,7 +375,7 @@
+ interface.dicbit = 13;
+ interface.method = 5;
+
+- if(part.IsComprs!=0x80)
++ if((part.IsComprs&0x80)==0)
+ decode(interface);
+ else
+ {
+@@ -384,6 +384,9 @@
+ fread(&Buf[0],1,1,ptx);
+ fwrite(&Buf[0],1,1,pto);
+ };
++ if(part.IsComprs!=0x80)
++ printf("WARNING: Ignoring unknown
compression flag (0x%02x) for part id %02X\n",
++ part.IsComprs, part.PartID);
+ }
+ fclose(pto);
+ break;
only in patch2:
unchanged:
--- amideco-0.31e.orig/debian/patches/30_hurd.diff
+++ amideco-0.31e/debian/patches/30_hurd.diff
@@ -0,0 +1,24 @@
+diff -Nur -x '*.orig' -x '*~' amideco-0.31e/src/amideco.h
amideco-0.31e.new/src/amideco.h
+--- amideco-0.31e/src/amideco.h 2009-06-10 14:14:06.000000000 -0400
++++ amideco-0.31e.new/src/amideco.h 2009-06-10 14:14:38.000000000 -0400
+@@ -12,7 +12,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
+-#if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__FreeBSD_kernel__)
++#if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #include <memory.h>
+ #define __LINUX_NOW__
+ #else
+diff -Nur -x '*.orig' -x '*~' amideco-0.31e/src/amifunc.c
amideco-0.31e.new/src/amifunc.c
+--- amideco-0.31e/src/amifunc.c 2009-06-10 14:14:06.000000000 -0400
++++ amideco-0.31e.new/src/amifunc.c 2009-06-10 14:14:24.000000000 -0400
+@@ -10,7 +10,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+
+-#if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__FreeBSD_kernel__)
++#if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #include <memory.h>
+ #define __LINUX_NOW__
+ #else
only in patch2:
unchanged:
--- amideco-0.31e.orig/debian/patches/50_bad_output.diff
+++ amideco-0.31e/debian/patches/50_bad_output.diff
@@ -0,0 +1,66 @@
+diff -Nur -x '*.orig' -x '*~' amideco-0.31e/src/amideco.h
amideco-0.31e.new/src/amideco.h
+--- amideco-0.31e/src/amideco.h 2009-12-23 15:27:01.000000000 -0500
++++ amideco-0.31e.new/src/amideco.h 2009-12-23 15:28:01.000000000 -0500
+@@ -11,6 +11,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+
+ #if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #include <memory.h>
+@@ -20,9 +21,9 @@
+ #include <conio.h>
+ #endif
+
+-typedef unsigned char byte;
+-typedef unsigned short word;
+-typedef unsigned long dword;
++typedef uint8_t byte;
++typedef uint16_t word;
++typedef uint32_t dword;
+
+ #define Xtract 0x10
+ #define List 0x01
+diff -Nur -x '*.orig' -x '*~' amideco-0.31e/src/amifunc.c
amideco-0.31e.new/src/amifunc.c
+--- amideco-0.31e/src/amifunc.c 2009-12-23 15:27:01.000000000 -0500
++++ amideco-0.31e.new/src/amifunc.c 2009-12-23 15:28:01.000000000 -0500
+@@ -9,6 +9,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+
+ #if defined(LINUX) || defined(__LINUX__) || defined(__linux__) ||
defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #include <memory.h>
+@@ -18,9 +19,9 @@
+ #include <conio.h>
+ #endif
+
+-typedef unsigned char byte;
+-typedef unsigned short word;
+-typedef unsigned long dword;
++typedef uint8_t byte;
++typedef uint16_t word;
++typedef uint32_t dword;
+
+ #define Xtract 0x10
+ #define List 0x01
+@@ -244,7 +245,7 @@
+ "October",
+ "November",
+ "December"};
+- byte Buf[20];
++ static byte Buf[20];
+ sprintf(Buf,"%2.2s",year);
+
+ if((atoi(Buf)>=0) && (atoi(Buf)<70)) sprintf(Buf,"%.2s %s
%s%.2s",day,Months[atoi(mon)],"20",year);
+@@ -334,7 +335,7 @@
+
+ case List:
+
+-printf("\n %.2X %.2i (%17.17s) %5.5lX (%6.5lu) => %5.5lX (%6.5lu) %.2s
%5.5lXh",
++printf("\n %.2X %.2i (%17.17s) %5.5X (%6.5u) => %5.5X (%6.5u) %.2s
%5.5Xh",
+ part.PartID,
+ PartTotal,
+ GetModuleName(part.PartID),
