Imported Debian patch 1.01b-8.1

diff --git a/debian/changelog b/debian/changelog
index 8e8430dc7587d48666952e50f3436326d16fa9db..871ff325130ccd08399d8d1f3745a25c880a7c35 100644 (file)
--- 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 <koptein@debian.org>  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 <ecki@debian.org>  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 fabe56c2793a08c63e96bba5a8b1dc86256b4b8c..944e4f4ccc44880d91daa0d716bc847adbdde66d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: mmv
-Maintainer: Michael Meskes <meskes@debian.org>
+Maintainer: Bernd Eckenfels <ecki@debian.org>
 Section: utils
 Priority: optional
 Standards-Version: 2.4.0.1

diff --git a/debian/rules b/debian/rules
index c6b78b5bd947541366c616759328efe09290ce57..6f5373c53d55f99ba0d9ba4a1420adaf241c867e 100755 (executable)
--- 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 2e72a731e426c3378d5887c355abda40d337e3e7..8dc9ccbec172d2990119adcd7695f20e2d7d5796 100644 (file)
--- 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);