releasing version 0.60.6

3 files changed, 29 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 9eeedd9..f9b2baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+moreutils (0.6) unstable; urgency=low
+
+  * Revert to perl sponge since the C one corrupts larger files.
+    Hopefully temporary..
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 10 Mar 2006 15:33:43 -0500
+
 moreutils (0.5) unstable; urgency=low
 
   * Added ifdata, by Benjamin BAYART (originally called ifcfg).
diff --git a/debian/control b/debian/control
index d0c752e..a49a3e1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,6 @@ Description: additional unix utilities
   - sponge: soak up standard input and write to a file
   - ts: timestamp standard input
   - vidir: edit a directory in your text editor
-  - vipe: edit a pipe using your text editor
+  - vipe: insert a text editor into a pipe
   - combine: combine the lines in two files using boolean operations
   - ifdata: get network interface info without parsing ifconfig output	
diff --git a/debian/copyright b/debian/copyright
index 1f3a9a4..455e406 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,27 @@ This package was put together and debianized by Joey Hess
 isutf8 is Copyright (C) 2005 by Lars Wirzenius, under the terms of
 the GPL.
 
-spong is Copyright (C) 2006 by Tollef Fog Heen, under the terms of
-the GPL version 2. Name and concept by Colin Watson.
+sponge has this copyright:
+# Copyright (C) 2003 Colin Watson <cjwatson@debian.org>.
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+# FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ifdata is Copyright (C) 2002 by Benjamin BAYART, under the terms of
 the GPL. It was originally called ifcfg and has a web page here: