From: Hartmut Koptein Date: Fri, 9 Jul 1999 08:24:17 +0000 (+0200) Subject: Imported Debian patch 1.01b-8.1 X-Git-Tag: debian/1.01b-8.1 X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=845e391687bd1f5956039b329aae3e8fe82aa694;p=pkg%2Fmmv.git Imported Debian patch 1.01b-8.1 --- diff --git a/debian/changelog b/debian/changelog index 8e8430d..871ff32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +mmv (1.01b-8.1) unstable; urgency=LOW + + * NMU + * fixed the invalid initializer for glibc-2.1 + * closes: #31929 + * changed in debian/rules in the clean target: + + /bin/rm -f into -rm -f + + make into -make + + added *~ + + -- Hartmut Koptein Fri, 9 Jul 1999 10:24:17 +0200 + +mmv (1.01b-8) unstable; urgency=LOW + + * should compile now with different headers (Bug#26955). + + -- Bernd Eckenfels Sun, 1 Nov 1998 05:36:36 +0100 + mmv (1.01b-7) frozen unstable; urgency=LOW * Remove debian/files with make clean (Bug#21526). diff --git a/debian/control b/debian/control index fabe56c..944e4f4 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: mmv -Maintainer: Michael Meskes +Maintainer: Bernd Eckenfels Section: utils Priority: optional Standards-Version: 2.4.0.1 diff --git a/debian/rules b/debian/rules index c6b78b5..6f5373c 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ CC = gcc LDFLAGS = -s +CFLAGS = -O2 -g -Wall # The package p = mmv @@ -15,15 +16,15 @@ dir = `pwd` build: # Builds the binary package. $(checkdir) - make CC="$(CC)" LDFLAGS="$(LDFLAGS)" + make CC="$(CC)" LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" touch build clean: # Undoes the effect of `make -f debian/rules build'. $(checkdir) - make clean - /bin/rm -f debian/files* debian/substvars* - /bin/rm -rf debian/tmp build + -make clean + -rm -f debian/files* debian/substvars* debian/*~ + -rm -rf debian/tmp build binary: binary-arch binary-indep @@ -64,6 +65,7 @@ binary-arch: build chown -R root.root debian/tmp/usr/doc/$(p) dpkg-shlibdeps debian/tmp/usr/bin/mmv dpkg-gencontrol + dh_md5sums dpkg --build debian/tmp && dpkg-name -o -s .. debian/tmp.deb define checkdir diff --git a/mmv.c b/mmv.c index 2e72a73..8dc9ccb 100644 --- a/mmv.c +++ b/mmv.c @@ -436,7 +436,7 @@ static CHUNK *freechunks = NULL; static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; -static FILE *outfile = stdout; +static FILE *outfile; static char IDF[] = "$$mmvdid."; static char TEMP[] = "$$mmvtmp."; @@ -497,6 +497,8 @@ int main(argc, argv) { char *frompat, *topat; + outfile = stdout; + init(); procargs(argc, argv, &frompat, &topat); domatch(frompat, topat);