capture information in changelog about bugs that this upload should close

try using --without-ipv6

working on rules file, still needs work

reinstate debian/copyright file which got deleted somehow

tweak configure options based on feedback from build log, looks like more
path tweaking is probably in order before we can call this ready for upload

switch to using amlibexecdir

fix a few things per release notes

lose the docs/ directory which not longer exists

fix up file discrepancies in my git tree

revert config/* to upstream versions, let rules configure target handle update

clean up rules file handling of autoconf files, etc

mark as not ready to upload

update git config

Merge commit 'upstream/2.6.1'

Imported Upstream version 2.6.1

revert to upstream

config.sub and config.guess freshened

reconfigure git-buildpackage for unstable

update changelog

Merge branch 'upstream'

Conflicts:

AUTHORS
ChangeLog
Makefile.am
Makefile.in
NEWS
ReleaseNotes
acinclude.m4
aclocal.m4
amandad-src/Makefile.am
amandad-src/Makefile.in
amandad-src/amandad.c
amandad-src/amandad.h
amandad-src/amandad_util.c
amplot/Makefile.am
amplot/Makefile.in
amplot/amplot.sh
autogen
changer-src/Makefile.am
changer-src/Makefile.in
changer-src/chg-disk.sh
changer-src/chg-lib.sh.in
changer-src/chg-manual.sh.in
changer-src/chg-mtx.sh
changer-src/chg-multi.sh
changer-src/chg-null.sh
changer-src/chg-scsi-chio.c
changer-src/chg-scsi.c
changer-src/chg-zd-mtx.sh
changer-src/scsi-aix.c
changer-src/scsi-bsd.c
changer-src/scsi-cam.c
changer-src/scsi-changer-driver.c
changer-src/scsi-chio.c
changer-src/scsi-hpux.c
changer-src/scsi-hpux_new.c
changer-src/scsi-irix.c
changer-src/scsi-linux.c
changer-src/scsi-solaris.c
changer-src/sense.c
client-src/Makefile.am
client-src/Makefile.in
client-src/amandates.c
client-src/calcsize.c
client-src/client_util.c
client-src/client_util.h
client-src/getfsent.c
client-src/killpgrp.c
client-src/noop.c
client-src/rundump.c
client-src/runtar.c
client-src/selfcheck.c
client-src/sendbackup-dump.c
client-src/sendbackup-gnutar.c
client-src/sendbackup.c
client-src/sendsize.c
client-src/versionsuffix.c
common-src/Makefile.am
common-src/Makefile.in
common-src/alloc.c
common-src/amanda.h
common-src/amfeatures.c
common-src/amflock-test.c
common-src/amflock.c
common-src/arglist.h
common-src/bsd-security.c
common-src/bsdtcp-security.c
common-src/bsdudp-security.c
common-src/clock.c
common-src/clock.h
common-src/columnar.h
common-src/conffile.c
common-src/conffile.h
common-src/debug.c
common-src/dgram.c
common-src/dgram.h
common-src/error.c
common-src/event.c
common-src/event.h
common-src/file.c
common-src/fileheader.c
common-src/fileheader.h
common-src/genversion.c
common-src/krb4-security.c
common-src/krb5-security.c
common-src/match.c
common-src/memmove.c
common-src/packet.c
common-src/packet.h
common-src/pipespawn.c
common-src/protocol.c
common-src/regerror.c
common-src/rsh-security.c
common-src/security-util.c
common-src/security-util.h
common-src/security.c
common-src/security.h
common-src/ssh-security.c
common-src/statfs.c
common-src/stream.c
common-src/stream.h
common-src/strstr.c
common-src/tapelist.c
common-src/tapelist.h
common-src/tapelist.h~HEAD
common-src/token.c
common-src/token.h
common-src/util.c
common-src/util.h
common-src/version.c
common-src/versuff.c
config/Makefile.in
config/acinclude.m4i
config/config.guess
config/config.h.in
config/config.rpath
config/config.sub
config/depcomp
config/gnulib/absolute-header.m4
config/gnulib/extensions.m4
config/gnulib/getaddrinfo.m4
config/gnulib/gnulib-cache.m4
config/gnulib/gnulib-comp.m4
config/gnulib/lock.m4
config/gnulib/netinet_in_h.m4
config/gnulib/snprintf.m4
config/gnulib/socklen.m4
config/gnulib/string_h.m4
config/gnulib/sys_socket_h.m4
config/gnulib/vasnprintf.m4
config/gnulib/wint_t.m4
config/install-sh
config/libtool.m4
config/ltmain.sh
config/missing
config/mkinstalldirs
configure
configure.in
contrib/set_prod_link.pl
debian/copyright
docs/Makefile.am
docs/Makefile.in
dumper-src/Makefile.am
dumper-src/Makefile.in
example/Makefile.am
example/Makefile.in
example/amanda-client.conf.in
example/amanda.conf.in
example/chg-mcutil.conf
gnulib/Makefile.am
gnulib/Makefile.in
gnulib/alloca_.h
gnulib/getaddrinfo.c
gnulib/printf-args.c
gnulib/printf-args.h
gnulib/printf-parse.c
gnulib/printf-parse.h
gnulib/regenerate/getaddrinfo-cygwin.patch
gnulib/regenerate/no-error.patch
gnulib/regenerate/regenerate
gnulib/snprintf.c
gnulib/stdbool_.h
gnulib/string_.h
gnulib/vasnprintf.c
gnulib/vasnprintf.h
man/Makefile.am
man/Makefile.in
man/amadmin.8
man/amaespipe.8
man/amanda-client.conf.5
man/amanda.8
man/amanda.conf.5
man/amcheck.8
man/amcheckdb.8
man/amcleanup.8
man/amcrypt-ossl-asym.8
man/amcrypt-ossl.8
man/amcrypt.8
man/amdd.8
man/amdump.8
man/amfetchdump.8
man/amflush.8
man/amgetconf.8
man/amlabel.8
man/ammt.8
man/amoverview.8
man/amplot.8
man/amrecover.8
man/amreport.8
man/amrestore.8
man/amrmtape.8
man/amstatus.8
man/amtape.8
man/amtapetype.8
man/amtoc.8
man/amverify.8
man/amverifyrun.8
man/xml-source/amadmin.8.xml
man/xml-source/amaespipe.8.xml
man/xml-source/amanda-client.conf.5.xml
man/xml-source/amanda.8.xml
man/xml-source/amanda.conf.5.xml
man/xml-source/amcheck.8.xml
man/xml-source/amcheckdb.8.xml
man/xml-source/amcleanup.8.xml
man/xml-source/amcrypt-ossl-asym.8.xml
man/xml-source/amcrypt-ossl.8.xml
man/xml-source/amcrypt.8.xml
man/xml-source/amdd.8.xml
man/xml-source/amdump.8.xml
man/xml-source/amfetchdump.8.xml
man/xml-source/amflush.8.xml
man/xml-source/amgetconf.8.xml
man/xml-source/amlabel.8.xml
man/xml-source/ammt.8.xml
man/xml-source/amoverview.8.xml
man/xml-source/amplot.8.xml
man/xml-source/amrecover.8.xml
man/xml-source/amreport.8.xml
man/xml-source/amrestore.8.xml
man/xml-source/amrmtape.8.xml
man/xml-source/amstatus.8.xml
man/xml-source/amtape.8.xml
man/xml-source/amtapetype.8.xml
man/xml-source/amtoc.8.xml
man/xml-source/amverify.8.xml
man/xml-source/amverifyrun.8.xml
oldrecover-src/Makefile.am
oldrecover-src/Makefile.in
oldrecover-src/amrecover.c
oldrecover-src/display_commands.c
oldrecover-src/extract_list.c
oldrecover-src/help.c
oldrecover-src/set_commands.c
oldrecover-src/uparse.c
oldrecover-src/uparse.y
oldrecover-src/uscan.c
oldrecover-src/uscan.l
recover-src/Makefile.am
recover-src/Makefile.in
recover-src/amrecover.c
recover-src/amrecover.h
recover-src/display_commands.c
recover-src/extract_list.c
recover-src/help.c
recover-src/set_commands.c
recover-src/uparse.c
recover-src/uparse.h
recover-src/uparse.y
recover-src/uscan.c
recover-src/uscan.l
restore-src/Makefile.am
restore-src/Makefile.in
restore-src/amfetchdump.c
restore-src/amidxtaped.c
restore-src/amrestore.c
restore-src/restore.c
restore-src/restore.h
server-src/Makefile.am
server-src/Makefile.in
server-src/amadmin.c
server-src/amcheck.c
server-src/amcleanup.sh.in
server-src/amcleanupdisk.c
server-src/amdump.sh
server-src/amflush.c
server-src/amfreetapes.sh.in
server-src/amindex.c
server-src/amindexd.c
server-src/amlabel.c
server-src/amlogroll.c
server-src/amoverview.pl.in
server-src/amstatus.pl.in
server-src/amtape.c
server-src/amtrmidx.c
server-src/amtrmlog.c
server-src/amverify.sh
server-src/amverifyrun.sh.in
server-src/changer.c
server-src/chunker.c
server-src/cmdline.c
server-src/cmdline.h
server-src/disk_history.c
server-src/disk_history.h
server-src/diskfile.c
server-src/diskfile.h
server-src/driver.c
server-src/driverio.c
server-src/driverio.h
server-src/dumper.c
server-src/find.c
server-src/find.h
server-src/getconf.c
server-src/holding.c
server-src/holding.h
server-src/infofile.c
server-src/infofile.h
server-src/logfile.c
server-src/logfile.h
server-src/planner.c
server-src/reporter.c
server-src/server_util.c
server-src/server_util.h
server-src/tapefile.c
server-src/tapefile.h
server-src/taper.c
server-src/taperscan.c
server-src/taperscan.h
tape-src/Makefile.am
tape-src/Makefile.in
tape-src/amdd.c
tape-src/ammt.c
tape-src/output-file.c
tape-src/output-rait.c
tape-src/output-tape.c
tape-src/tapeio.c
tape-src/tapeio.h
tape-src/tapetype.c

commit untracked files ... confusing

clean up noise

Imported Upstream version 2.6.0p2

prepare for upload

fix paths in amcrypt-ossl-asym man page source

prevent double reports from amverify

revert chg-multi.sh.in and apply patch from svn for typos

set git-debian-branch to lenny for this branch

pull last change pending from pre-git CVS tree

update to latest standards version for lenny

undo silly templates.pot automated updating, and restore file from -3 package

capture uncaptured change

create a lenny bug fix branch

Imported Upstream version 2.6.0p1

Imported Upstream version 2.6.0

add a config file for git-buildpackage

Imported Debian patch 2.5.2p1-3

Imported Debian patch 2.5.2p1-2

Imported Debian patch 2.5.2p1-1

Imported Upstream version 2.5.2p1

Imported Debian patch 2.5.1p3-2

Imported Debian patch 2.5.1p3-1

Imported Upstream version 2.5.1p3

Imported Debian patch 2.5.1p1-2.1

Imported Debian patch 2.5.1p1-2

Imported Debian patch 2.5.1p1-1

Imported Upstream version 2.5.1p1

Imported Debian patch 2.5.1-1

Imported Upstream version 2.5.1

Imported Debian patch 2.5.0p2-2.1

Imported Debian patch 2.5.0p2-2

Imported Debian patch 2.5.0p2-1

Imported Upstream version 2.5.0p2

Imported Debian patch 2.5.0-2

Imported Debian patch 2.5.0-1

Imported Upstream version 2.5.0

Imported Debian patch 2.4.5p1-2

Imported Upstream version 2.4.5p1

Imported Debian patch 2.4.5-2

Imported Debian patch 2.4.5-1

Imported Upstream version 2.4.5

Imported Debian patch 2.4.4p3-3

Imported Debian patch 2.4.4p3-2

Imported Upstream version 2.4.4p3