diff -u e2fsprogs-1.38/debian/changelog e2fsprogs-1.38/debian/changelog
--- e2fsprogs-1.38/debian/changelog
+++ e2fsprogs-1.38/debian/changelog
@@ -1,3 +1,14 @@
+e2fsprogs (1.38-2ubuntu2) breezy; urgency=low
+
+  * Fixed ext2_types.h.in to prefer long long for the 64 bit data type
+    on amd64 so that it does not conflict with asm/types.h
+  * Set makefile to ignore errors installing html docs because they
+    fail to build, which caused the package to fail to build.  Someone
+    who is more experienced than me should fix the texi so it builds
+    to html correctly and remove the ignore on install failure.  
+
+ -- Phillip Susi <psusi@cfl.rr.com>  Sat,  7 Jan 2006 21:09:56 -0500
+
 e2fsprogs (1.38-2ubuntu1) breezy; urgency=low
 
   * Merge with Debian.  (Ubuntu #13757)
diff -u e2fsprogs-1.38/debian/rules e2fsprogs-1.38/debian/rules
--- e2fsprogs-1.38/debian/rules
+++ e2fsprogs-1.38/debian/rules
@@ -306,10 +306,10 @@
 
   # HTML docs
 	install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
-	install -p ${stdbuilddir}/doc/libext2fs_*.html \
+	-install -p ${stdbuilddir}/doc/libext2fs_*.html \
 	   ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs/html-info/
-	install -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
-	install -p ${stdbuilddir}/lib/et/com_err_*.html \
+	-install -d ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
+	-install -p ${stdbuilddir}/lib/et/com_err_*.html \
 	   ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_SOVERSION}/html-info/
 
   # texinfo docs
only in patch2:
unchanged:
--- e2fsprogs-1.38.orig/lib/ext2fs/ext2_types.h.in
+++ e2fsprogs-1.38/lib/ext2fs/ext2_types.h.in
@@ -14,16 +14,19 @@
 typedef int		__s64;
 typedef unsigned int	__u64;
 #else
-#if (@SIZEOF_LONG@ == 8)
-typedef long		__s64;
-typedef unsigned long	__u64;
-#else
 #if (@SIZEOF_LONG_LONG@ == 8)
 #if defined(__GNUC__)
 typedef __signed__ long long 	__s64;
+typedef unsigned long long  __u64;
 #else
 typedef signed long long 	__s64;
+typedef unsigned long long      __u64;
 #endif /* __GNUC__ */
+#else
+#if (@SIZEOF_LONG@ == 8)
+typedef long		__s64;
+typedef unsigned long	__u64;
+#else
 typedef unsigned long long	__u64;
 #endif /* SIZEOF_LONG_LONG == 8 */
 #endif /* SIZEOF_LONG == 8 */