Merge commit 'upstream/1.3.12'

Conflicts:

	CHANGES
	Makefile.in
	README.win32
	config.guess
	config.sub
	configure
	debian/changelog
	debian/compat
	debian/control
	debian/copyright
	loaderinfo.c
	mam2debug.c
	mam2debug2.c
	mtx.1
	mtx.c
	mtx.h
	mtx.spec
	mtx.spec.in
	mtxl.c
	mtxl.h
	nsmhack.c
	scsi_aix.c
	scsi_freebsd.c
	scsi_hpux.c
	scsi_linux.c
	scsi_sgi.c
	scsi_sun.c
	scsi_win32.c
	scsieject.1
	scsieject.c
	scsitape.c
	sg_err.c
	tapeinfo.1
	tapeinfo.c

diff --cc .gbp.conf
index dd2ff231797d409752aa4a867130a80e59ac050a,0000000000000000000000000000000000000000..bbfc061f1c1e5d50982bbab67a6e9952c8b136fe
mode 100644,000000..100644
--- 1/.gbp.conf
--- /dev/null
+++ b/.gbp.conf
@@@ -1,46 -1,0 +1,46 @@@
- export-dir = ../build-area/$PKG/
 +# Configuration file for git-buildpackage and friends
 +
 +[DEFAULT]
 +# the default build command:
 +#builder = debuild -i\.git/ -I.git
 +# the default clean command:
 +#cleaner = debuild clean
 +# the default branch for upstream sources:
 +upstream-branch = upstream
 +# the default branch for the debian patch:
 +debian-branch = master
 +# the default tag formats used:
 +#upstream-tag = upstream/%(version)s
 +#debian-tag = debian/%(version)s
 +# use pristine-tar:
 +pristine-tar = True
 +
 +# Options only affecting git-buildpackage
 +[git-buildpackage]
 +#upstream-branch = dfsgclean
 +# uncomment this to automatically GPG sign tags
 +#sign-tags = True
 +# keyid to GPG sign tags with
 +#keyid = 0xdeadbeef
 +# push to a remote repository after a successful tag: 
 +#posttag = git-push git.example.com
 +# use this for more svn-buildpackage like behaviour:
++export-dir = ../build-area/mtx/
 +#tarball-dir = ../tarballs/
 +
 +# Options only affecting git-import-orig
 +[git-import-orig]
 +#upstream-branch = newupstream
 +#debian-branch = dfsgclean
 +#filter = .svn
 +
 +# Options only affecting git-import-dsc
 +[git-import-dsc]
 +#upstream-branch = svn-upstream
 +#filter = [ 'CVS', '.cvsignore' ]
 +
 +# Options only affecting git-dch
 +[git-dch]
 +#git-log = --no-merges
 +#snapshot-number = snapshot + 1
 +

diff --cc debian/changelog
index 4c34a08f6ca751e67a57095037ed834f08332bec,860dd53c7b7a2b7022310ff44ee8c355abb766e8..917244957266129a74e4bf48faa0411d28b5c81a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,15 +1,9 @@@
 -  * Incorporate debian packaging into upsteam version
 -  * Remove strip of binaries
 -  * Remove unsupported nsmhack from list of binaries built by default
 -  * Add support for building outside of source tree
 -  * Update copyrights
 -  * Fix typo in mtx.1 man page
 -  * Clear outstanding UNIT ATTENTION state at start
 -
 - -- Robert Nelson <robertn@the-nelsons.org>  Tue, 19 Aug 2008 09:04:00 +0000
+ mtx (1.3.12-1) unstable; urgency=low
+ 
++  * new upstream version, closes: #500590
++
++ -- Bdale Garbee <bdale@gag.com>  Sun, 15 Feb 2009 09:39:12 -0700
+ 
  mtx (1.3.11-1) unstable; urgency=low
  
    * new upstream version, closes: #425687, #425688

diff --cc mtx.spec.in
index c19ae1eb9fdc2ee5ff633f29d9f2cd5b93231131,f6fd5ed34a3f442eb6cf360c69f7b6c1d9584019..a9f4a9d7045d0e0246066a7125da16e458031a56
--- 1/mtx.spec.in
--- 2/mtx.spec.in
+++ b/mtx.spec.in
@@@ -4,7 -4,7 +4,11 @@@ Release: 1%{?dist
  Summary: SCSI media changer control program
  License: GPL
  Group: Utilities/System
++<<<<<<< HEAD:mtx.spec.in
 +Source0: ftp://ftp.opensource-sw.net/pub/mtx/development/%{name}-%{version}.tar.gz
++=======
+ Source0: ftp://ftp.opensource-sw.net/pub/mtx/stable/%{name}-%{version}.tar.gz
++>>>>>>> upstream/1.3.12:mtx.spec.in
  Url: http://%{name}.sourceforge.net
  BuildRoot: /var/tmp/%{name}-%{version}