diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/buffers.c /tmp/nsDxJOHLtE/defrag-0.73pjm1/buffers.c --- /tmp/BoUaREuEnl/defrag-0.73pjm1/buffers.c 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/buffers.c 2006-01-07 14:30:50.457190250 -0500 @@ -12,7 +12,7 @@ #include #include #include -/* #include conflicts with kernel headers. TODO: Fix kernel headers. */ +#include #include #include "defrag.h" @@ -252,8 +252,8 @@ static int compare_buffer_zones(const void *a, const void *b) { Block azone, bzone; - azone = (*((Buffer const **) a))->dest_zone; - bzone = (*((Buffer const **) b))->dest_zone; + azone = (*((Buffer const * const *) a))->dest_zone; + bzone = (*((Buffer const * const *) b))->dest_zone; if (azone < bzone) return -1; @@ -266,8 +266,8 @@ static int compare_buffer_zones_for_read (const void *a, const void *b) { Block azone, bzone; - azone = n2d((*((Buffer const **) a))->dest_zone); - bzone = n2d((*((Buffer const **) b))->dest_zone); + azone = n2d((*((Buffer const * const *) a))->dest_zone); + bzone = n2d((*((Buffer const * const *) b))->dest_zone); if (azone < bzone) return -1; diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/configure /tmp/nsDxJOHLtE/defrag-0.73pjm1/configure --- /tmp/BoUaREuEnl/defrag-0.73pjm1/configure 2006-01-07 14:30:50.269178500 -0500 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/configure 2006-01-07 14:30:50.461190500 -0500 @@ -1937,7 +1937,7 @@ if test x"$GCC" = x"yes"; then # Include -Werror because what warnings are issued can vary with platform. - CFLAGS="-pipe -Werror -Wall -W -Wunused -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wno-sign-compare -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wnested-externs $CFLAGS" + CFLAGS="-pipe -Wall -W -Wunused -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wno-sign-compare -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wnested-externs $CFLAGS" fi # Remember to change GNUmakefile.in's distclean target if you change this list. diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/configure.in /tmp/nsDxJOHLtE/defrag-0.73pjm1/configure.in --- /tmp/BoUaREuEnl/defrag-0.73pjm1/configure.in 2001-07-04 07:08:14.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/configure.in 2006-01-07 14:30:50.461190500 -0500 @@ -98,7 +98,7 @@ if test x"$GCC" = x"yes"; then # Include -Werror because what warnings are issued can vary with platform. - CFLAGS="-pipe -Werror -Wall -W -Wunused -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wno-sign-compare -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wnested-externs $CFLAGS" + CFLAGS="-pipe -Wall -W -Wunused -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wno-sign-compare -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wnested-externs $CFLAGS" fi # Remember to change GNUmakefile.in's distclean target if you change this list. diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/debian/changelog /tmp/nsDxJOHLtE/defrag-0.73pjm1/debian/changelog --- /tmp/BoUaREuEnl/defrag-0.73pjm1/debian/changelog 2006-01-07 14:30:50.269178500 -0500 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/debian/changelog 2006-01-07 14:30:50.461190500 -0500 @@ -1,3 +1,12 @@ +defrag (0.73pjm1-7ubuntu1) unstable; urgency=low + + * Minor fixes that caused FTBFS on amd64 + * Enabled all platforms instead of just i386 + * Disabled ext3-notwork.dpatch. I see no reason not to allow + defrag to work on a cleanly unmounted ext3 filesystem + + -- Phillip Susi Sat, 7 Jan 2006 01:06:32 -0500 + defrag (0.73pjm1-7) unstable; urgency=low * Adopting package with maintainers consent (Closes: #249830) diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/debian/control /tmp/nsDxJOHLtE/defrag-0.73pjm1/debian/control --- /tmp/BoUaREuEnl/defrag-0.73pjm1/debian/control 2006-01-07 14:30:50.269178500 -0500 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/debian/control 2006-01-07 14:30:50.461190500 -0500 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 3.0.0), libncurses-dev, bzip2, e2fslibs-dev, dpatch, autoconf2.13, automake1.4 Package: defrag -Architecture: i386 +Architecture: all Depends: ${shlibs:Depends}, file Description: ext2, minix and xiafs filesystem defragmenter As a file system is used, data tends to become more and more diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/debian/patches/00list /tmp/nsDxJOHLtE/defrag-0.73pjm1/debian/patches/00list --- /tmp/BoUaREuEnl/defrag-0.73pjm1/debian/patches/00list 2006-01-07 14:30:50.273178750 -0500 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/debian/patches/00list 2006-01-07 14:30:50.473191250 -0500 @@ -1,7 +1,6 @@ const-syntax doc-fsck-syntax e2fslibs-not-lkh -ext3-notwork frag-manpage local-minix-h need-string-h diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/defrag.c /tmp/nsDxJOHLtE/defrag-0.73pjm1/defrag.c --- /tmp/BoUaREuEnl/defrag-0.73pjm1/defrag.c 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/defrag.c 2006-01-07 14:30:50.477191500 -0500 @@ -23,7 +23,7 @@ #include #include #include -/*#include conflicts with linux/string.h. Ought to fix ext2.h instead.*/ +#include #include #include #include diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/defrag.h /tmp/nsDxJOHLtE/defrag-0.73pjm1/defrag.h --- /tmp/BoUaREuEnl/defrag-0.73pjm1/defrag.h 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/defrag.h 2006-01-07 14:30:50.477191500 -0500 @@ -140,7 +140,7 @@ unsigned int full : 1; /* contains data */ Buffer *next; Block dest_zone; - unsigned char data[0]; + char data[0]; }; diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/display.c /tmp/nsDxJOHLtE/defrag-0.73pjm1/display.c --- /tmp/BoUaREuEnl/defrag-0.73pjm1/display.c 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/display.c 2006-01-07 14:30:50.457190250 -0500 @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/e2dump.c /tmp/nsDxJOHLtE/defrag-0.73pjm1/e2dump.c --- /tmp/BoUaREuEnl/defrag-0.73pjm1/e2dump.c 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/e2dump.c 2006-01-07 14:30:50.477191500 -0500 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -80,7 +81,7 @@ # if powerpc return 1UL & (((const int *) addr)[nr >> 5] >> (nr & 31))); # else - return 1UL & (((const unsigned char *) addr)[nr >> 3] >> (nr & 7))); + return 1UL & (((const unsigned char *) addr)[nr >> 3] >> (nr & 7)); # endif } #endif @@ -92,7 +93,7 @@ #define UPPER(size,n) ((size + ((n) - 1)) / (n)) -#define my_printf(a...) do { if (!quiet) printf(##a); } while(0) +#define my_printf(a...) do { if (!quiet) printf( a ); } while(0) static int IN; /* Input device handle */ diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/ext2.c /tmp/nsDxJOHLtE/defrag-0.73pjm1/ext2.c --- /tmp/BoUaREuEnl/defrag-0.73pjm1/ext2.c 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/ext2.c 2006-01-07 14:30:50.477191500 -0500 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "defrag.h" diff -Nru /tmp/BoUaREuEnl/defrag-0.73pjm1/ext2.h /tmp/nsDxJOHLtE/defrag-0.73pjm1/ext2.h --- /tmp/BoUaREuEnl/defrag-0.73pjm1/ext2.h 2001-07-04 07:08:13.000000000 -0400 +++ /tmp/nsDxJOHLtE/defrag-0.73pjm1/ext2.h 2006-01-07 14:30:50.477191500 -0500 @@ -14,8 +14,6 @@ #include #include -#include -#include #define HAS_TIND