tags 598600 + pending
tags 625025 + patch
tags 625025 + pending
thanks
Dear maintainer,
I've prepared an NMU for ascii2binary (versioned as 2.13-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
--
Jakub Wilk
diffstat for ascii2binary_2.13-1 ascii2binary_2.13-1.1
MachineInfo.c | 2 +-
Makefile.am | 2 +-
Makefile.in | 2 +-
ascii2binary-2.13/debian/changelog | 8 ++++++++
ascii2binary-2.13/debian/rules | 1 +
endian.c | 2 +-
endian_.h | 6 ++++++
7 files changed, 19 insertions(+), 4 deletions(-)
diff -u ascii2binary-2.13/debian/changelog ascii2binary-2.13/debian/changelog
--- ascii2binary-2.13/debian/changelog
+++ ascii2binary-2.13/debian/changelog
@@ -1,3 +1,11 @@
+ascii2binary (2.13-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rename endian.h to endian_.h to fix FTBFS (closes: #598600, #625025).
+ Thanks to Lucas Nussbaum and to Michael Bienia for the bug reports.
+
+ -- Jakub Wilk <jw...@debian.org> Sun, 23 Oct 2011 20:42:46 +0200
+
ascii2binary (2.13-1) unstable; urgency=low
* New upstream release.
diff -u ascii2binary-2.13/debian/rules ascii2binary-2.13/debian/rules
--- ascii2binary-2.13/debian/rules
+++ ascii2binary-2.13/debian/rules
@@ -21,6 +21,7 @@
config.status: configure
dh_testdir
+ rm -f endian.h
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
only in patch2:
unchanged:
--- ascii2binary-2.13.orig/Makefile.am
+++ ascii2binary-2.13/Makefile.am
@@ -2,7 +2,7 @@
dist_man_MANS = binary2ascii.1 ascii2binary.1
binary2ascii_SOURCES = binary2ascii.c binfmt.c MachineInfo.c endian.c exitcodes.c
ascii2binary_SOURCES = ascii2binary.c GetWord.c MachineInfo.c endian.c exitcodes.c
-noinst_HEADERS = exitcodes.h endian.h
+noinst_HEADERS = exitcodes.h endian_.h
LOCALEDIR = /usr/local/share/ascii2binary/locale
AM_CFLAGS=-std=gnu99
ACLOCAL_AMFLAGS = -I m4
only in patch2:
unchanged:
--- ascii2binary-2.13.orig/endian.c
+++ ascii2binary-2.13/endian.c
@@ -19,7 +19,7 @@
*
*/
-#include "endian.h"
+#include "endian_.h"
/* Returns a value indicating the endianness of the machine */
only in patch2:
unchanged:
--- ascii2binary-2.13.orig/endian_.h
+++ ascii2binary-2.13/endian_.h
@@ -0,0 +1,6 @@
+/* Constants defining endian-ness values */
+
+#define E_LITTLE_ENDIAN 0
+#define E_BIG_ENDIAN 1
+#define E_PDP_ENDIAN 2
+#define E_UNKNOWN_ENDIAN 3
only in patch2:
unchanged:
--- ascii2binary-2.13.orig/MachineInfo.c
+++ ascii2binary-2.13/MachineInfo.c
@@ -8,7 +8,7 @@
#else
#define gettext(x) (x)
#endif
-#include "endian.h"
+#include "endian_.h"
void
Print_Byte_Order(void)
only in patch2:
unchanged:
--- ascii2binary-2.13.orig/Makefile.in
+++ ascii2binary-2.13/Makefile.in
@@ -163,7 +163,7 @@
dist_man_MANS = binary2ascii.1 ascii2binary.1
binary2ascii_SOURCES = binary2ascii.c binfmt.c MachineInfo.c endian.c exitcodes.c
ascii2binary_SOURCES = ascii2binary.c GetWord.c MachineInfo.c endian.c exitcodes.c
-noinst_HEADERS = exitcodes.h endian.h
+noinst_HEADERS = exitcodes.h endian_.h
LOCALEDIR = /usr/local/share/ascii2binary/locale
AM_CFLAGS = -std=gnu99
ACLOCAL_AMFLAGS = -I m4
