diff -Nru e2fsprogs-1.41.12/debian/changelog e2fsprogs-1.41.12-1ubuntu2/debian/changelog --- e2fsprogs-1.41.12/debian/changelog 2010-11-15 10:42:14.000000000 +0000 +++ e2fsprogs-1.41.12-1ubuntu2/debian/changelog 2010-10-21 07:56:53.000000000 +0000 @@ -1,3 +1,9 @@ +e2fsprogs (1.41.12-1ubuntu2-1cross1) maverick; urgency=low + + * Lazy cross patch - TODO Should be a debian patch + + -- Peter Pearse Thu, 21 Oct 2010 07:56:53 +0000 + e2fsprogs (1.41.12-1ubuntu2) maverick; urgency=low * The -p switch for resize2fs is meant for an offline resize operation which diff -Nru e2fsprogs-1.41.12/debian/source/usr/share/lintian/overrides/source e2fsprogs-1.41.12-1ubuntu2/debian/source/usr/share/lintian/overrides/source --- e2fsprogs-1.41.12/debian/source/usr/share/lintian/overrides/source 1970-01-01 00:00:00.000000000 +0000 +++ e2fsprogs-1.41.12-1ubuntu2/debian/source/usr/share/lintian/overrides/source 2010-02-10 23:16:03.000000000 +0000 @@ -0,0 +1,3 @@ +e2fsprogs source: weak-library-dev-dependency ss-dev on libss2 (= ${mainBinary}) +e2fsprogs source: weak-library-dev-dependency comerr-dev on libcomerr2 (= ${mainBinary}) +e2fsprogs source: weak-library-dev-dependency uuid-dev on libuuid1 (= ${mainBinary}) diff -Nru e2fsprogs-1.41.12/debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime e2fsprogs-1.41.12-1ubuntu2/debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime --- e2fsprogs-1.41.12/debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime 1970-01-01 00:00:00.000000000 +0000 +++ e2fsprogs-1.41.12-1ubuntu2/debian/uuid-runtime/usr/share/lintian/overrides/uuid-runtime 2009-08-13 01:39:57.000000000 +0000 @@ -0,0 +1 @@ +uuid-runtime: command-with-path-in-maintainer-script prerm:5 /usr/sbin/uuidd diff -Nru e2fsprogs-1.41.12/e2fsck/Makefile.in e2fsprogs-1.41.12-1ubuntu2/e2fsck/Makefile.in --- e2fsprogs-1.41.12/e2fsck/Makefile.in 2010-05-17 22:32:28.000000000 +0000 +++ e2fsprogs-1.41.12-1ubuntu2/e2fsck/Makefile.in 2010-10-20 15:29:20.000000000 +0000 @@ -117,7 +117,10 @@ $(E) " LD $@" $(Q) $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS) -e2fsck.static: $(OBJS) $(STATIC_DEPLIBS) +PMP: + @echo "ext2fs $(STATIC_LIBEXT2FS) libcomerr $(DEPSTATIC_LIBCOM_ERR) libblkid $(DEPSTATIC_LIBBLKID) libuuid $(DEPSTATIC_LIBUUID) libe2p $(DEPSTATIC_LIBE2P) |STATIC_LIBUUID $(STATIC_LIBUUID)|" + +e2fsck.static: PMP $(OBJS) $(STATIC_DEPLIBS) $(E) " LD $@" $(Q) $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS) diff -Nru e2fsprogs-1.41.12/MCONFIG.in e2fsprogs-1.41.12-1ubuntu2/MCONFIG.in --- e2fsprogs-1.41.12/MCONFIG.in 2010-05-17 23:00:22.000000000 +0000 +++ e2fsprogs-1.41.12-1ubuntu2/MCONFIG.in 2010-10-21 07:49:31.000000000 +0000 @@ -107,7 +107,8 @@ DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ DEPSTATIC_LIBUUID = @DEPSTATIC_LIBUUID@ -DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(STATIC_LIBUUID) +# PMP Why add the non static string here DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(STATIC_LIBUUID) +DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@ PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@