Imported Debian patch 1.2.17rel-1

diff --git a/CHANGES b/CHANGES
index 8c055fd8ded26ba758eba5bff36577ece7f8d417..145ca0c4a9fa4a4d531f8ad19f5429e85cad7a93 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+CHANGES, mtx 1.2.17:
+- copy_barcode was off by one.
+- Replace garbled chars with \0 in case barcodes full of BS. Barcode
+  changes courtesy of dirkx at covalent dot net. Set __WEIRD_CHAR_SUPPRESS
+  to activate this code (it is not activated by default in -current.)
+
 CHANGES, mtx 1.2.16:
 - Fix a very special case that ADIC loaders presented to element status
   parser

diff --git a/Makefile.in b/Makefile.in
index 5eae01e7f535246b80e8194a1ec0a2f6b719646d..8012cbdc8287a12bd3da999ebd701c9933d34825 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 # GNU Autoconf. 
 
 # Version # for 'make dist'...
-VERSION=1.2.16rel
+VERSION=1.2.17rel
 BINS = mtx tapeinfo loaderinfo scsitape
 
 TARGET = @TARGET@

diff --git a/debian/changelog b/debian/changelog
index e135e0e90bca28c311db2735d99a48c118d9bd52..92cd20ddd4d4cc91c6241870414956fce42cd445 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mtx (1.2.17rel-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 28 Jun 2006 23:57:44 -0400
+
 mtx (1.2.16rel-5) unstable; urgency=low
 
   * add build-deps needed for GNU/kFreeBSD, closes: #367467

diff --git a/debian/control b/debian/control
index 94138da89c1aaad5bf23e5b59d05f1750468184b..e4d16f60a93b6ed59e48585655b1862db0016648 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Depends: debhelper (>= 5), libcam-dev [kfreebsd-i386 kfreebsd-amd64]
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.2.1
 
 Package: mtx
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index 68d5153541a2168fb04f6fb8a38fdd8bf4ac287b..787ef08d0bf8e0e311d8347cefa5b2eeeea402bc 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ mtx was downloaded from http://mtx.sourceforge.net/
 Copyright:
 
   Copyright 1997, 1998 Leonard Zubkoff <lnz@dandelion.com>
-  Changes copyright 2000 Eric Green <eric@estinc.com>
+  Changes copyright 2000, 2001 Eric Green <eric@estinc.com>
 
   GPL, version 2
 

diff --git a/debian/rules b/debian/rules
index 6ea375a245ef17b6a75f44888f49e9facb5b8492..e72990570a053886908240673b2146b5ef434326 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,7 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 configure: configure-stamp
 configure-stamp:
@@ -47,7 +46,7 @@ binary-arch: build install
        dh_installexamples contrib/*
        dh_installmenu
        dh_installcron
-       dh_installman
+#      dh_installman
        dh_installinfo
        dh_installchangelogs CHANGES
        dh_link

diff --git a/mtx.spec b/mtx.spec
index e2dbb85174072248217b29097344d8394863388c..7327935df776a64118636c4750656ca5dc2209e8 100644 (file)
--- a/mtx.spec
+++ b/mtx.spec
@@ -1,10 +1,10 @@
 Name: mtx
-Version: 1.2.16rel
+Version: 1.2.17rel
 Release: 1
 Summary: SCSI media changer control program
 Copyright: Redistributable
 Group: Utilities/System
-Source0: http://prdownloads.sourceforge.net/mtx/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.badtux.org/pub/storage/mtx/%{name}-%{version}.tar.gz
 Url: http://%{name}.sourceforge.net
 BuildRoot: /var/tmp/%{name}-%{version}
 

diff --git a/mtx.spec.in b/mtx.spec.in
index 2f38e76e44645b506c4d62ff2381bc464d459f7a..4e2c191a58fadd067b245477def061b0283af357 100644 (file)
--- a/mtx.spec.in
+++ b/mtx.spec.in
@@ -4,7 +4,7 @@ Release: 1
 Summary: SCSI media changer control program
 Copyright: Redistributable
 Group: Utilities/System
-Source0: http://prdownloads.sourceforge.net/mtx/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.badtux.org/pub/storage/mtx/%{name}-%{version}.tar.gz
 Url: http://%{name}.sourceforge.net
 BuildRoot: /var/tmp/%{name}-%{version}
 

diff --git a/mtxl.c b/mtxl.c
index f2350a49da04196c45da2872d8f2dd2f8e930fb5..c92c3480403e32d60441a7235a7772bd49ecd524 100644 (file)
--- a/mtxl.c
+++ b/mtxl.c
@@ -2,8 +2,8 @@
 
   Copyright 1997-1998 by Leonard N. Zubkoff <lnz@dandelion.com>
 
-$Date: 2002/02/05 16:51:11 $
-$Revision: 1.8.2.3 $
+$Date: 2002/09/27 17:23:28 $
+$Revision: 1.8.2.7 $
 
   This file created Feb 2000 by Eric Lee Green <eric@badtux.org> from pieces
   extracted from mtx.c, plus some additional routines. 
@@ -439,9 +439,14 @@ void copy_barcode(unsigned char *src, unsigned char *dest) {
   int i;
   
   for (i=0; i < 36; i++) {
-    *dest++ = *src++;
+    *dest=*src++;
+#ifdef __WEIRD_CHAR_SUPPRESS
+    if ((*dest < 32) || (*dest > 127))
+       *dest = '\0';
+#endif
+     dest++;
   }
-  *dest=0; /* null-terminate, sigh. */ 
+  dest=0; /* null-terminate, sigh. */ 
 }
 
 
@@ -1216,8 +1221,20 @@ void PrintRequestSense(RequestSense_T *RequestSense)
 
 #endif
 
-/* $Date: 2002/02/05 16:51:11 $
+/* $Date: 2002/09/27 17:23:28 $
  * $Log: mtxl.c,v $
+ * Revision 1.8.2.7  2002/09/27 17:23:28  elgreen
+ * Don't dereference pointer in barcode stuff
+ *
+ * Revision 1.8.2.6  2002/09/27 17:20:18  elgreen
+ * doh, get rid of the + from the patch process!
+ *
+ * Revision 1.8.2.5  2002/09/27 17:17:13  elgreen
+ * fix copy_barcode
+ *
+ * Revision 1.8.2.4  2002/09/27 16:49:43  elgreen
+ * copy_barcode was off by one (sigh!)
+ *
  * Revision 1.8.2.3  2002/02/05 16:51:11  elgreen
  * mtx 1.2.16pre3
  *