From b0462536b814ddf1e337379dac850e745f4635dc Mon Sep 17 00:00:00 2001
From: ianmdlvl <ianmdlvl>
Date: Mon, 5 May 2003 15:55:26 +0000
Subject: [PATCH 1/1] @@ -1,3 +1,9 @@ +chiark-utils (3.0.4) unstable;
 urgency=low + +  * chiark-backup: full dumps have tapedesc in TAPEID + + -- +
  chiark-utils (3.0.3) unstable; urgency=low

   * chiark-backup: compatibility with md5sum from dpkg 1.10.4.
---
 backup/backuplib.pl | 4 ++--
 backup/full         | 2 +-
 backup/labeltape    | 2 +-
 debian/changelog    | 6 ++++++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/backup/backuplib.pl b/backup/backuplib.pl
index e80f779..f8d7349 100644
--- a/backup/backuplib.pl
+++ b/backup/backuplib.pl
@@ -64,9 +64,9 @@ sub readtapeid_raw () {
 	   "| tar -b$blocksize -vvxf - TAPEID";
 }
 
-sub writetapeid ($) {
+sub writetapeid ($$) {
     open T, ">TAPEID" or die $!;
-    print T "$_[0]\n" or die $!;
+    print T "$_[0]\n$_[1]\n" or die $!;
     close T or die $!;
 
     system "tar -b$blocksize -vvcf TAPEID.tar TAPEID"; $? and die $?;
diff --git a/backup/full b/backup/full
index af6ebc9..388270f 100755
--- a/backup/full
+++ b/backup/full
@@ -134,7 +134,7 @@ system "mt -f $tape reten"; $? and die $?;
 setstatus "FAILED writing tape ID";
 # First write the tape ID to this tape.
 
-writetapeid($tapeid);
+writetapeid($tapeid,$tapedesc);
 
 unlink 'this-md5sums';
 
diff --git a/backup/labeltape b/backup/labeltape
index c06d897..b708104 100755
--- a/backup/labeltape
+++ b/backup/labeltape
@@ -37,7 +37,7 @@ open T,'>TAPEID' or die $!;
 print T "$newid\n" or die $!;
 close T or die $!;
 
-writetapeid($newid);
+writetapeid($newid,'tapeid set manually');
 rewind_raw();
 
 print "Labelled tape \`$newid'\n" or die $!;
diff --git a/debian/changelog b/debian/changelog
index 16ff7a0..bd0438b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+chiark-utils (3.0.4) unstable; urgency=low
+
+  * chiark-backup: full dumps have tapedesc in TAPEID
+
+ --
+
 chiark-utils (3.0.3) unstable; urgency=low
 
   * chiark-backup: compatibility with md5sum from dpkg 1.10.4.
-- 
2.30.2