Imported Debian patch 1.01b-6

diff --git a/Makefile b/Makefile
index 84d6a731760612a1e897a70d5e1245a4b0584a57..458e6489f4915436372958808eb810a0e1ed7a1a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 CC             =gcc -traditional
 LD             =$(CC)
 CONF           =-DIS_SYSV -DHAS_DIRENT -DHAS_RENAME
-CFLAGS         =-O2 -m486 $(CONF)
+CFLAGS         =-O2 $(CONF)
 LDFLAGS                =-s -N
 
 #IBIN          =$(LOCAL)$(ARCH)/bin

diff --git a/debian/changelog b/debian/changelog
index bf595564e9424fc3c873fd22d216ba26db9df61e..eabe5a4ef35da36dd2d523a0ef2bbcf88a7760be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,42 @@
+mmv (1.01b-6) frozen unstable; urgency=LOW
+
+  * Make lintian happy.
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 17 Apr 1998 14:36:19 +0200
+
+mmv (1.01b-5) unstable; urgency=LOW
+
+  * Added new copyright notice and moved package back into main.
+    My thanks go to Joost for getting into touch with the upstream author.
+
+ -- Michael Meskes <meskes@debian.org>  Thu,  5 Mar 1998 10:42:42 +0100
+
+mmv (1.01b-4) unstable; urgency=LOW
+
+  * Updated standard
+  * Added man page links.
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 27 Feb 1998 15:33:54 +0100
+
+mmv (1.01b-3) unstable; urgency=LOW
+
+  * Moved package to non-free. Sorry, I cannot reach the upstream author to
+    clarify the problems with his copyright. (#14908).
+  * Do not comress copyright file. (#14460)
+
+ -- Michael Meskes <meskes@debian.org>  Fri, 19 Dec 1997 10:47:37 +0100
+
+mmv (1.01b-2) unstable; urgency=LOW
+
+  * Put copyright file into /usr/doc/mmv/copyright (#10623)
+  * Removed -m486 option in Makefile (#10780).
+  * Corrected man page permission (#4913).
+  * Compiled against libc6.
+
+ -- Michael Meskes <meskes@debian.org>  Tue,  5 Aug 1997 13:11:36 +0200
+
 mmv (1.01b-1) unstable; urgency=LOW
 
   * Initial release
 
  -- Michael Meskes <meskes@debian.org>  Tue, 15 Oct 1996 13:02:46 +0200
-

diff --git a/debian/control b/debian/control
index 9a52ded8dc578e957822998c6937c38dc43227d3..fabe56c2793a08c63e96bba5a8b1dc86256b4b8c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: mmv
 Maintainer: Michael Meskes <meskes@debian.org>
-Section: misc
+Section: utils
 Priority: optional
-Standards-Version: 2.1.0.0
+Standards-Version: 2.4.0.1
 
 Package: mmv
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index ebba1c1fc782b90eeb616ba4cc535518e8333feb..148273f723241381caf396b1f6aeb848841c0a82 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,3 +16,23 @@ New York, NY 10040
 
 lanin@csd2.nyu.edu
 ...!cmcl2!csd2!lanin
+
+However, Vladimir told me:
+
+Michael,
+
+This message is to serve as an announcement that I am changing the
+copyright of mmv to GPL.
+
+If this message is in any way insufficient to do so, please tell me what
+I have to do. Please keep in mind that I do not have in hand either the
+full GPL text or the source code of the last mmv release (oops).
+
+If there is any other way that I can help out, please tell me.
+
+Thanks,
+
+Vladimir Lanin
+vlad@brm.com
+
+Thanks to Joost for getting into touch with him.

diff --git a/debian/files b/debian/files
index 9eecb5edf31fe575f32e863ac02b83a4f4449114..06df78f9f40d1b660b6b926f466a29f050b940ab 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-mmv_1.01b-1_i386.deb misc optional
+mmv_1.01b-6_i386.deb utils optional

diff --git a/debian/rules b/debian/rules
index 0147596c84c3ae4af813522cc7e991a7b29c241e..860e8cbba515795850c7dc4e760ae3c1548584af 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,21 +41,24 @@ binary-arch: build
        install -d -g root -m 755 -o root debian/tmp/usr/bin
        install -d -g root -m 755 -o root debian/tmp/usr/man/man1
        install -g root -o root -m 755 -s mmv debian/tmp/usr/bin
-       install -g root -o root -m 755 mmv.1 debian/tmp/usr/man/man1
+       install -g root -o root -m 644 mmv.1 debian/tmp/usr/man/man1
        gzip -9f debian/tmp/usr/man/man1/mmv.1
        (cd debian/tmp/usr/bin;\
         ln -s mmv mcp; \
         ln -s mmv mad; \
         ln -s mmv mln;)
-       install -d -g root -m 755 -o root debian/tmp/usr/doc/copyright
-       install -g root -m 644 -o root debian/copyright \
-         debian/tmp/usr/doc/copyright/$(p)
+       (cd debian/tmp/usr/man/man1;\
+        ln -s mmv.1.gz mcp.1.gz; \
+        ln -s mmv.1.gz mad.1.gz; \
+        ln -s mmv.1.gz mln.1.gz;)
        install -d -g root -m 755 -o root debian/tmp/usr/doc/$(p)
        install -g root -m 644 -o root READ.ME \
                debian/tmp/usr/doc/$(p)
        install -g root -m 644 -o root debian/changelog \
-               debian/tmp/usr/doc/$(p)
+               debian/tmp/usr/doc/$(p)/changelog.Debian
        gzip -f9 debian/tmp/usr/doc/$(p)/*
+       install -g root -m 644 -o root debian/copyright \
+         debian/tmp/usr/doc/$(p)
        chmod -R g-sw debian/tmp/usr/doc/$(p)
        chown -R root.root debian/tmp/usr/doc/$(p)
        dpkg-shlibdeps debian/tmp/usr/bin/mmv

diff --git a/debian/substvars b/debian/substvars
index cb92a436c64391f56050c00cf56aa14a399fc2ff..81c50e26a10c39a8bea5ff715cd1a2c352b802fc 100644 (file)
--- a/debian/substvars
+++ b/debian/substvars
@@ -1 +1 @@
-shlibs:Depends=libc5 (>= 5.2.18)
+shlibs:Depends=libc6