15 files changed, 154 insertions, 15 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..d63c6aa
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,14 @@
+The package is based on the last release of mtx on sourceforge:
+https://sourceforge.net/projects/mtx/ with patches added from other
+sources, including other distributions. Here are some links to the
+packaging of mtx in other distributions/operating systems:
+
+Fedora: https://src.fedoraproject.org/rpms/mtx/tree/master
+Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-block/mtx
+FreeBSD: https://www.freshports.org/misc/mtx/
+
+There might appear some kind of new upstream here:
+https://github.com/zombielinux/MTX
+
+The TapeChanger::MTX in contrib is outdated, a newer version can be
+found at https://www.ks.uiuc.edu/Development/MDTools/tapechanger-mtx/
diff --git a/debian/changelog b/debian/changelog
index a36b495..85c473f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+mtx (1.3.12-13) unstable; urgency=medium
+
+  * Update standards-version to 4.5.0.
+  * Add upstream PGP signing key.
+  * Switch to debhelper 13.
+  * Do not distribute the contents of the contrib directory as
+    examples. Some of it is quite outdated compared to their upstream
+    locations.
+  * Modernize package description.
+
+ -- Carsten Leonhardt <leo@debian.org>  Sun, 01 Nov 2020 12:19:03 +0100
+
 mtx (1.3.12-12) unstable; urgency=medium
 
   * Apply patches from Fedora.
diff --git a/debian/control b/debian/control
index d538f05..16a7bb0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: Debian Bacula Team <pkg-bacula-devel@lists.alioth.debian.org>
 Uploaders: Carsten Leonhardt <leo@debian.org>
-Build-Depends: debhelper-compat (= 12), libcam-dev [kfreebsd-any]
-Standards-Version: 4.3.0
+Build-Depends: debhelper-compat (= 13), libcam-dev [kfreebsd-any]
+Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Vcs-Browser: https://salsa.debian.org/bacula-team/mtx
 Vcs-Git: https://salsa.debian.org/bacula-team/mtx.git
@@ -14,8 +14,8 @@ Package: mtx
 # does not build on hurd: see http://bugs.debian.org/677616
 Architecture: linux-any kfreebsd-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: controls tape autochangers
- MTX can be used to manipulate tape auto-changers, also known as "jukeboxes",
- such that backup software can make use of the multiple tape capabilities of
- the auto-changer.  In particular, this is necessary glue for using a backup
- system like Amanda with a DDS auto-changer like the HP Surestore 12000e.
+Description: controls autoloaders and tape libraries
+ MTX can be used to manipulate autoloaders and tape libraries, such as
+ loading, unloading and switching tapes automatically. This is
+ necessary glue for using backup software like Amanda or Bacula
+ together with these devices.
diff --git a/debian/examples b/debian/examples
deleted file mode 100644
index 86071d7..0000000
--- a/debian/examples
+++ /dev/null
@@ -1 +0,0 @@
-contrib/*
diff --git a/debian/patches/004-fix-destdir b/debian/patches/004-fix-destdir
index 6a26395..782e1b4 100644
--- a/debian/patches/004-fix-destdir
+++ b/debian/patches/004-fix-destdir
@@ -1,4 +1,3 @@
-Description: Fix spelling errors found by lintian
 Author: Dan Horák <dan@danny.cz>
 Date: Sat, 24 Jan 2009 18:06:43 +0100
 Description: add support for DESTDIR
diff --git a/debian/patches/006-fix-quotation-in-manpage b/debian/patches/006-fix-quotation-in-manpage
new file mode 100644
index 0000000..b8e9243
--- /dev/null
+++ b/debian/patches/006-fix-quotation-in-manpage
@@ -0,0 +1,26 @@
+Description: Fix manpage quotation found by lintian
+Author: Carsten Leonhardt <leo@debian.org>
+Last-Update: 2020-10-31
+
+An apostrophe at the beginning of the line is a command for (g)roff,
+so it must be either escaped or moved away from the beginning of the
+line to have a real apostrophe. The sequence \' doesn't stand for an
+apostrophe, however, but an acute accent. There are escaped sequences
+for an apostrophe, but they don't seem to be portable. Therefore, the
+easiest solution is to move the apostrophe away from the beginning of
+the line.
+
+
+--- a/scsitape.1
++++ b/scsitape.1
+@@ -162,8 +162,8 @@
+ attempt to intermingle scsitape commands with native tape driver
+ operations. Note that BRU 16.1 for Solaris (and possibly others, but
+ Solaris I know about) will have a 'scsi' keyword to bypass the 
+-native tape driver and write via direct uscsi commands, so if you use
+-\'scsitape\' to bypass the flaws of the native Solaris driver, you can use
++native tape driver and write via direct uscsi commands, so if you
++use 'scsitape' to bypass the flaws of the native Solaris driver, you can use
+ BRU 16.1 to write your actual tape archives. (Assuming that BRU 16.1
+ has been released at the time that you read this). 
+ 
diff --git a/debian/patches/007-man-Document-mtx-eject-and-previous-operations b/debian/patches/007-man-Document-mtx-eject-and-previous-operations
new file mode 100644
index 0000000..2d992f9
--- /dev/null
+++ b/debian/patches/007-man-Document-mtx-eject-and-previous-operations
@@ -0,0 +1,44 @@
+From 26bf6f6794a8a35f69dc2a8a01e69bf50200800f Mon Sep 17 00:00:00 2001
+From: David Sommerseth <davids@redhat.com>
+Date: Fri, 6 May 2016 21:00:58 +0200
+Subject: [PATCH] man: Document mtx eject and previous operations
+
+---
+ mtx.1 | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/mtx.1 b/mtx.1
+index a5e6cc6..108836e 100644
+--- a/mtx.1
++++ b/mtx.1
+@@ -131,13 +131,16 @@ may need to eject the tape using your OS's tape control commands
+ first).  Note that this command may not be what you want on large
+ tape libraries -- e.g. on Exabyte 220, the first slot is usually a
+ cleaning tape. If <drivenum> is omitted, defaults to first drive.
+-
+ .TP 10
+ .B last [<drivenum>]
+ Loads drive <drivenum> from the last slot in the media changer. Unloads
+ the drive if there is already a tape in it. (Note: you may need to eject
+ the tape using your OS's tape control commands first).  
+ .TP 10
++.B previous [<drivenum>]
++Unloads the drive and loads the previous tape in sequence. If the drive
++was empty, loads the first tape into the drive.
++.TP 10
+ .B next [<drivenum>]
+ Unloads the drive and loads the next tape in sequence. If the drive was
+ empty, loads the first tape into the drive.
+@@ -145,6 +148,9 @@ empty, loads the first tape into the drive.
+ .B position <slotnum>
+ Positions the robot at a specific slot. Needed by some changers to
+ move to and open the import/export, or mailbox, slot.
++.TP 10
++.B eject
++Eject the tape currently in the drive.
+ 
+ .SH AUTHORS
+ The original 'mtx' program was written by Leonard Zubkoff and extensively
+-- 
+1.8.3.1
+
diff --git a/debian/patches/008-fix-scsitape-usage-message b/debian/patches/008-fix-scsitape-usage-message
new file mode 100644
index 0000000..5c347b2
--- /dev/null
+++ b/debian/patches/008-fix-scsitape-usage-message
@@ -0,0 +1,17 @@
+Description: Fix scsitape usage message
+Author: Carsten Leonhardt <leo@debian.org>
+Last-Update: 2020-11-01
+
+Add the "erase" operation to the usage message of scsitape. (Hint found at Rosa Linux)
+
+--- a/scsitape.c
++++ b/scsitape.c
+@@ -63,7 +63,7 @@
+ #endif
+ 
+ void Usage(void) {
+-  FatalError("Usage: scsitape -f <generic-device> <command> where <command> is:\n setblk <n> | fsf <n> | bsf <n> | eod | rewind | eject | mark <n> |\n  seek <n> | read [<blksize> [<numblocks]] | write [<blocksize>] \n");
++  FatalError("Usage: scsitape -f <generic-device> <command> where <command> is:\n setblk <n> | fsf <n> | bsf <n> | eod | rewind | eject | erase |\n  mark <n> | seek <n> | read [<blksize> [<numblocks]] | write [<blocksize>]\n");
+ }
+ 
+ #define arg1 (arg[0])  /* for backward compatibility, sigh */
diff --git a/debian/patches/series b/debian/patches/series
index 2ef608e..b08a4df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@
 003-fix-spelling
 004-fix-destdir
 005-remove-argc-output
+006-fix-quotation-in-manpage
+007-man-Document-mtx-eject-and-previous-operations
+008-fix-scsitape-usage-message
diff --git a/debian/gitlab-ci.yml b/debian/salsa-ci.yml
index 5c575a1..40eb107 100644
--- a/debian/gitlab-ci.yml
+++ b/debian/salsa-ci.yml
@@ -3,4 +3,6 @@ include:
  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 
 variables:
- RELEASE: 'unstable'
+  RELEASE: 'unstable'
+  SALSA_CI_DISABLE_AUTOPKGTEST: 1
+  SALSA_CI_REPROTEST_ENABLE_DIFFOSCOPE: 1
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..8efa99c
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBEXa1AcRBAD1sNwI4vmbqc3bCbk17iaaaJIITsFprBqnd5jTQpe0siH3cZHj
+v1hfOlpNnEugA0+r08mtqI+9gWgZpI7s578de0QKFGLZLF349mpknWcsn5/IbwSN
+HkuAsce0ZK8v8/c3jIPKYjBApu0CD2FcyoFNgwSb9dlLdOlSde97OxqSYwCg2xvS
+T87IN7AoSAuiwdQosW7H7l0D/iUewxEWRRZbgulYoHVx+wSo3Ik2sAoNQtut6vsF
+/ggTUq+XNAa+Fbco1fsO1FqlXCmzIu9m8YX7wIZFr4VdUnkICCIb9ACyjTWz8vUL
+Fmn5q4Jzak0KXExu6bbcOYah6UJzs6jbRRh3Bj8ba14nZJUc9vnGN/nubNGjZLJn
+YYrJA/9r6XdVrWSkOuaDIf7iKYCHwv+A4k9YWukIwPNTh1RJc/2LNfjs9jgk92eA
+que8tjUjiiMIUXxxYTzxQDn7TrWgLhW9bpAy8LiOctQtn3gbM8/bwrqs3nWuN61R
+fepQU6kdShGC0l0Kkf9S7Ec4CFWOhXuFMuJjUg866d++j9aMHLRYb3BlbnNvdXJj
+ZS1zdy5uZXQgKEtleSBmb3Igc2lnbmluZyBkb3dubG9hZGFibGUgZmlsZXMpIDxh
+ZG1pbmlzdHJhdG9yQG9wZW5zb3VyY2Utc3cubmV0PohmBBMRAgAmBQJF2tQHAhsD
+BQkDwmcABgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQHcwuDMBt7dNl4wCfQIlG
+N2VttqChh12LHEzF7bpBiOUAn1W7l6fsTrUSBiFzwNb5jyofGJFM
+=xdD5
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index ab1ee98..78be36e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/~debian$// \
+opts="pgpmode=auto, dversionmangle=s/~debian$//" \
 http://sf.net/mtx/mtx-([0-9\.]+)\.tar\.gz
diff --git a/mtx.1 b/mtx.1
index a5e6cc6..108836e 100644
--- a/mtx.1
+++ b/mtx.1
@@ -131,13 +131,16 @@ may need to eject the tape using your OS's tape control commands
 first).  Note that this command may not be what you want on large
 tape libraries -- e.g. on Exabyte 220, the first slot is usually a
 cleaning tape. If <drivenum> is omitted, defaults to first drive.
-
 .TP 10
 .B last [<drivenum>]
 Loads drive <drivenum> from the last slot in the media changer. Unloads
 the drive if there is already a tape in it. (Note: you may need to eject
 the tape using your OS's tape control commands first).  
 .TP 10
+.B previous [<drivenum>]
+Unloads the drive and loads the previous tape in sequence. If the drive
+was empty, loads the first tape into the drive.
+.TP 10
 .B next [<drivenum>]
 Unloads the drive and loads the next tape in sequence. If the drive was
 empty, loads the first tape into the drive.
@@ -145,6 +148,9 @@ empty, loads the first tape into the drive.
 .B position <slotnum>
 Positions the robot at a specific slot. Needed by some changers to
 move to and open the import/export, or mailbox, slot.
+.TP 10
+.B eject
+Eject the tape currently in the drive.
 
 .SH AUTHORS
 The original 'mtx' program was written by Leonard Zubkoff and extensively
diff --git a/scsitape.1 b/scsitape.1
index 0e5a6d4..db4c220 100644
--- a/scsitape.1
+++ b/scsitape.1
@@ -162,8 +162,8 @@ native tape driver.  You will likely see weird things happen if you
 attempt to intermingle scsitape commands with native tape driver
 operations. Note that BRU 16.1 for Solaris (and possibly others, but
 Solaris I know about) will have a 'scsi' keyword to bypass the 
-native tape driver and write via direct uscsi commands, so if you use
-\'scsitape\' to bypass the flaws of the native Solaris driver, you can use
+native tape driver and write via direct uscsi commands, so if you
+use 'scsitape' to bypass the flaws of the native Solaris driver, you can use
 BRU 16.1 to write your actual tape archives. (Assuming that BRU 16.1
 has been released at the time that you read this). 
 
diff --git a/scsitape.c b/scsitape.c
index dd52dd5..b55ca7c 100644
--- a/scsitape.c
+++ b/scsitape.c
@@ -63,7 +63,7 @@
 #endif
 
 void Usage(void) {
-  FatalError("Usage: scsitape -f <generic-device> <command> where <command> is:\n setblk <n> | fsf <n> | bsf <n> | eod | rewind | eject | mark <n> |\n  seek <n> | read [<blksize> [<numblocks]] | write [<blocksize>] \n");
+  FatalError("Usage: scsitape -f <generic-device> <command> where <command> is:\n setblk <n> | fsf <n> | bsf <n> | eod | rewind | eject | erase |\n  mark <n> | seek <n> | read [<blksize> [<numblocks]] | write [<blocksize>]\n");
 }
 
 #define arg1 (arg[0])  /* for backward compatibility, sigh */