Synchronize with Debian 1.28-5.

diff --git a/debian/changelog b/debian/changelog
index 8ec6a2c..860e918 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,52 @@
+e2fsprogs (1.28-5) unstable; urgency=low
+
+  * The "this time it will work ! (famous last words)" release.
+  * Now that it builds, ensure the dir in which we install this damn mips
+    non-pic lib exists.
+
+ -- Yann Dirson <dirson@debian.org>  Tue, 17 Sep 2002 00:04:49 +0200
+
+e2fsprogs (1.28-4) unstable; urgency=low
+
+  * Moved setting of CFLAGS to the correct place when building the special
+    mips non-pic lib (Closes: #159757 again).
+
+ -- Yann Dirson <dirson@debian.org>  Sun, 15 Sep 2002 21:19:19 +0200
+
+e2fsprogs (1.28-3) unstable; urgency=low
+
+  * Don't use special cflags at configure time when building the special
+    mips non-pic lib, in yet another attempt to fix my adaptation of the
+    patch from the mips team.  Also added --disable-nls which was present
+    in the original patch.  
+  * Remove debian/BUILD-MIPS on clean.
+  * Install mkinitrd script as scripts/e2fsprogs, not as
+    scripts/e2fsprogs.mkinitrd.
+
+ -- Yann Dirson <dirson@debian.org>  Mon,  9 Sep 2002 23:01:31 +0200
+
+e2fsprogs (1.28-2) unstable; urgency=low
+
+  * Fixed my adapation of the mips non-pic build (Closes: #159757).
+
+ -- Yann Dirson <dirson@debian.org>  Fri,  6 Sep 2002 00:03:45 +0200
+
+e2fsprogs (1.28-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Yann Dirson <dirson@debian.org>  Mon,  2 Sep 2002 23:34:55 +0200
+
+e2fsprogs (1.27+1.28-WIP-0817-1) unstable; urgency=low
+
+  * New upstream pre-release.  Closes: #138003, #144621, #145044, #151990,
+    #152029, #152891, #155007, #131350, #147256, #153102.
+  * New binary: findfs.
+  * Added execute permissions to the mkinitrd script (thanks lintian).
+  * Don't ship FSIM for EVMS for now.
+
+ -- Yann Dirson <dirson@debian.org>  Sun, 25 Aug 2002 19:32:12 +0200
+
 e2fsprogs (1.27+1.28-WIP-0626-2) experimental; urgency=low
 
   * Remove bogus shlibs deps on "e2fsprogs (>= <current>)"

diff --git a/debian/rules b/debian/rules
index c10402b..568e263 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -93,9 +93,12 @@ BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
        --disable-swapfs --disable-imager \
        --disable-resizer --disable-debugfs
 
-MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS} -G 0 -fno-pic -mno-abicalls" \
+MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
+       --disable-nls \
        --disable-swapfs --disable-imager \
         --disable-resizer --disable-debugfs
+# we can't use those flags at configure time
+MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls
 
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 ifneq (,$(findstring $(DEB_BUILD_ARCH),mips mipsel))
@@ -157,7 +160,9 @@ ${BUILDSTDSTAMP}: ${CFGSTDSTAMP}
   # specially-built MIPS lib
        if [ ismips = "${ismips}" ]; then \
                make -C ${mipsbuilddir}/util ; \
-               make -C ${mipsbuilddir} libs LIB_SUBDIRS="lib/et lib/ext2fs" ; \
+               make -C ${mipsbuilddir} libs \
+                       CFLAGS="${CCOPTS} ${MIPS_CFLAGS}" \
+                       LIB_SUBDIRS="lib/et lib/ext2fs" ; \
        fi
 
        touch ${BUILDSTDSTAMP}
@@ -173,7 +178,7 @@ clean:
        rm -rf ${STAMPSDIR}
        -make -C ${stdbuilddir} -i distclean
        -make -C ${bfbuilddir} -i distclean
-       rm -rf ${stdbuilddir} ${bfbuilddir}
+       rm -rf ${stdbuilddir} ${bfbuilddir} ${mipsbuilddir}
        rm -f doc/libext2fs_*.html lib/et/com_err_*.html debian/*.substvars
        dh_clean
 
@@ -199,19 +204,22 @@ install-std: build
   # static libs and .h files
        make -C ${stdbuilddir} install-libs DESTDIR=${tmpdir} LDCONFIG=true
 
+  # remove FSIM for now.
+       rm ${tmpdir}/lib/evms/libe2fsim.1.1.1.so
+
   # statically-linked fsck
        ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin
        ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz
 
+       dh_movefiles
+       test -z `find ${tmpdir} -type f`
+
   # specially-built MIPS lib
        if [ ismips = "${ismips}" ]; then \
                cp ${mipsbuilddir}/lib/libext2fs.a \
                        ${debdir}/e2fslibs-dev/usr/lib/libext2fs-nopic.a ; \
        fi
 
-       dh_movefiles
-       test -z `find ${tmpdir} -type f`
-
 install-bf: DH_OPTIONS=
 install-bf: build
        dh_testdir
@@ -225,6 +233,9 @@ install-bf: build
        cd ${bfdir}/sbin && rm -f e2label
        cd ${bfdir}/usr/bin && rm -f uuidgen
 
+  # remove FSIM for now.
+       rm ${bfdir}/lib/evms/libe2fsim.1.1.1.so
+
 
 binary-indep: 
   # no arch-independant debs.
@@ -246,7 +257,8 @@ binary-arch: install
 
   # mkinitrd script
        dh_install -p e2fsprogs debian/e2fsprogs.mkinitrd \
-               /etc/mkinitrd/scripts
+               /etc/mkinitrd/scripts/e2fsprogs
+       chmod +x ${debdir}/e2fsprogs/etc/mkinitrd/scripts/*
 
   # symlinks to prepare dh_installdocs run
        mkdir -p ${debdir}/e2fsck-static/usr/share/doc/