Subversion Repositories nettle

Compare Revisions

Ignore whitespace Rev 11 → Rev 12

/tags/1.15-2/debian/patches/10_cleanup.dpatch
0,0 → 1,21
#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_cleanup.dpatch by <magnus@kibibyte.se>
##
## DP: Clean up properly
 
@DPATCH@
 
--- nettle-1.15.orig/Makefile.in
+++ nettle-1.15/Makefile.in
@@ -359,9 +359,10 @@
clean-here:
-rm -f $(TARGETS) *.$(OBJEXT) *.p$(OBJEXT) *.s
+ -rm -rf .lib
distclean-here: clean-here
- -rm -f config.h stamp-h config.log config.status \
+ -rm -f config.h stamp-h config.log config.status machine.m4 \
config.make config.m4 Makefile nettle-stdint.h *.asm *.d
maintainer-clean-here:
/tags/1.15-2/debian/patches/99_autotools_files.dpatch
0,0 → 1,28
#!/bin/sh
## 01_autotools_files.dpatch by Magnus Holmgren <magnus@kibibyte.se>
##
## DP: Copy in updated config.sub and config.guess from autotools-dev
 
set -e
 
dpatch_patch() {
for f in config.sub config.guess; do
if ! test -e $f.dp-orig; then
mv $f $f.dp-orig
cp --remove-destination /usr/share/misc/$f .
fi
done
}
 
dpatch_unpatch() {
for f in config.sub config.guess; do
if test -e $f.dp-orig; then
mv -f $f.dp-orig $f
fi
done
}
 
 
DPATCH_LIB_NO_DEFAULT=1
 
. /usr/share/dpatch/dpatch.lib.sh
/tags/1.15-2/debian/patches/00list
0,0 → 1,3
10_cleanup
20_link_with_gmp
99_autotools_files
/tags/1.15-2/debian/patches/20_link_with_gmp.dpatch
0,0 → 1,18
#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_link_with_gmp.dpatch by <magnus@kibibyte.se>
##
## DP: Link libnettle.so.2 with -lgmp
 
@DPATCH@
diff -urNad nettle-1.15~/config.make.in nettle-1.15/config.make.in
--- nettle-1.15~/config.make.in 2006-11-28 16:30:24.000000000 +0100
+++ nettle-1.15/config.make.in 2007-05-15 12:53:54.000000000 +0200
@@ -28,7 +28,7 @@
SHLIBFILE = @SHLIBFILE@
SHLIBFORLINK = @SHLIBFORLINK@
SHLIBINSTALL = @SHLIBINSTALL@
-SHLIBLIBS = @SHLIBLIBS@
+SHLIBLIBS = @SHLIBLIBS@ -lgmp
SHLIBLINK = @SHLIBLINK@
SHLIBMAJOR = @SHLIBMAJOR@
SHLIBMINOR = @SHLIBMINOR@
/tags/1.15-2/debian/rules
0,0 → 1,95
#!/usr/bin/make -f
# -*- makefile -*-
# 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
include /usr/share/dpatch/dpatch.make
 
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
CFLAGS = -Wall -g
 
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
 
config.status: ${DPATCH_STAMPFN} configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-shared \
--disable-dependency-tracking
 
 
build: build-stamp
build-stamp: config.status
dh_testdir
 
# Add here commands to compile the package.
$(MAKE)
 
touch build-stamp
 
clean: clean-patched unpatch
dh_clean
 
clean-patched:
dh_testdir
dh_testroot
rm -f build-stamp
 
# Add here commands to clean up after the build process.
-$(MAKE) distclean
 
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
 
# Add here commands to install the package into debian/tmp
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
mv $(CURDIR)/debian/tmp/usr/bin/sexp-conv $(CURDIR)/debian/tmp/usr/bin/sexp-conv.nettle
 
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
 
# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_movefiles
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
dh_makeshlibs -V 'libnettle2 (>= 1.15)'
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
 
binary: binary-indep binary-arch
.PHONY: build clean clean-patched binary-indep binary-arch binary install
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 1.15-2/debian/changelog
===================================================================
--- 1.15-2/debian/changelog (nonexistent)
+++ 1.15-2/debian/changelog (revision 12)
@@ -0,0 +1,103 @@
+nettle (1.15-2) unstable; urgency=high
+
+ * Fix serious regression: The -lgmp added in 1.8-1 fell off in 1.15-1
+ (Closes: #415034).
+ * Use dpatch to handle patches.
+ * Make package binNMUable.
+ * Add XS-Vcs-* fields to debian/control.
+ * Make dependencies on libnettle2 versioned.
+
+ -- Magnus Holmgren <magnus@kibibyte.se> Tue, 15 May 2007 16:15:19 +0200
+
+nettle (1.15-1) unstable; urgency=low
+
+ * New maintainer (Closes: #411677).
+ * New upstream version. The non-free IETF RFC has been removed by
+ upstream.
+ * Updated Standards-Version to 3.7.2 without any changes.
+ * Converted doc-base and copyright files to UTF-8.
+ * Added extra cleanup to clean target of debian/rules so that
+ dpkg-buildpackage can be run more than once.
+ * debian/watch: updated.
+ * debian/control: added autotools-dev as a build-dependency.
+ * debian/rules: don't include config.guess and config.sub in
+ .diff.gz.
+
+ -- Magnus Holmgren <magnus@kibibyte.se> Thu, 1 Mar 2007 19:29:49 +0100
+
+nettle (1.14.1-1) unstable; urgency=low
+
+ * Removed non-DFSG file from the archive and disabled the
+ corresponding test case
+ * Source package contains non-free IETF RFC/I-D's (Closes: #393400)
+ * Since there is no upstream release available, a "fake" version number
+ is added to the version.
+
+ -- Marek Habersack <grendel@debian.org> Wed, 18 Oct 2006 09:47:03 +0200
+
+nettle (1.14-1) unstable; urgency=low
+
+ * The latest upstream version
+
+ -- Marek Habersack <grendel@debian.org> Tue, 9 May 2006 21:41:17 +0200
+
+nettle (1.12-3) unstable; urgency=high
+
+ * Force a recompile to match the new libgmp3 package name
+
+ -- Marek Habersack <grendel@debian.org> Tue, 19 Jul 2005 12:01:28 +0200
+
+nettle (1.12-2) unstable; urgency=high
+
+ * Make libnettle-dev depend on libgmp3-dev
+
+ -- Marek Habersack <grendel@debian.org> Tue, 8 Mar 2005 02:19:01 +0100
+
+nettle (1.12-1) unstable; urgency=high
+
+ * The latest upstream release
+ * sexp-conv is installed as sexp-conv.nettle and registered with the
+ alternatives system now.
+ * added the sexp-conv mainpage borrowed from the lsh-utils package.
+
+ -- Marek Habersack <grendel@debian.org> Tue, 30 Nov 2004 01:45:49 +0100
+
+nettle (1.10-1) unstable; urgency=low
+
+ * The latest upstream version
+
+ -- Marek Habersack <grendel@debian.org> Tue, 4 May 2004 15:56:02 +0200
+
+nettle (1.9-1) unstable; urgency=low
+
+ * The latest upstream release
+
+ -- Marek Habersack <grendel@debian.org> Mon, 16 Feb 2004 02:53:34 +0100
+
+nettle (1.8-1) unstable; urgency=low
+
+ * The latest upstream release
+ * libnettle1 links directly against gmp now to avoid problems with
+ programs linking to libnettle without referencing -lgmp explicitly.
+ * libnettle1 is gone - upstream changed the SOVERSION to 2
+
+ -- Marek Habersack <grendel@debian.org> Wed, 14 Jan 2004 22:27:19 +0100
+
+nettle (1.7-3) unstable; urgency=low
+
+ * Don't drink and drive, or another doc-base fix
+
+ -- Marek Habersack <grendel@debian.org> Mon, 10 Nov 2003 19:07:20 -0500
+
+nettle (1.7-2) unstable; urgency=low
+
+ * Fixed the doc-base problem with the missing Section field
+
+ -- Marek Habersack <grendel@debian.org> Sun, 9 Nov 2003 22:06:09 -0500
+
+nettle (1.7-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Marek Habersack <grendel@debian.org> Tue, 4 Nov 2003 18:23:07 +0100
+
Index: 1.15-2/debian/control
===================================================================
--- 1.15-2/debian/control (nonexistent)
+++ 1.15-2/debian/control (revision 12)
@@ -0,0 +1,75 @@
+Source: nettle
+Section: libs
+Priority: optional
+Maintainer: Magnus Holmgren <magnus@kibibyte.se>
+Build-Depends: debhelper (>= 4.0.0), libgmp3-dev, m4, autotools-dev, dpatch
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.kibibyte.se/nettle/trunk
+XS-Vcs-Browser: http://svn.kibibyte.se/nettle
+
+Package: libnettle2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: low level cryptographic library
+ Nettle is a cryptographic library that is designed to fit easily in more or
+ less any context: In crypto toolkits for object-oriented languages (C++,
+ Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
+ space.
+ .
+ It tries to solve a problem of providing a common set of cryptographic
+ algorithms for higher-level applications by implementing a
+ context-independent set of cryptographic algorithms. In that light, Nettle
+ doesn't do any memory allocation or I/O, it simply provides the
+ cryptographic algorithms for the application to use in any environment and
+ in any way it needs.
+ .
+ Homepage: http://www.lysator.liu.se/~nisse/nettle/
+
+Package: libnettle-dev
+Section: libdevel
+Architecture: any
+Depends: libnettle2 (= ${binary:Version}), libgmp3-dev
+Description: low level cryptographic library (development files)
+ Nettle is a cryptographic library that is designed to fit easily in more or
+ less any context: In crypto toolkits for object-oriented languages (C++,
+ Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
+ space.
+ .
+ It tries to solve a problem of providing a common set of cryptographic
+ algorithms for higher-level applications by implementing a
+ context-independent set of cryptographic algorithms. In that light, Nettle
+ doesn't do any memory allocation or I/O, it simply provides the
+ cryptographic algorithms for the application to use in any environment and
+ in any way it needs.
+ .
+ This package contains the development files (C headers and static libraries)
+ .
+ Homepage: http://www.lysator.liu.se/~nisse/nettle/
+
+Package: nettle-bin
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libnettle1
+Description: low level cryptographic library (binary tools)
+ Nettle is a cryptographic library that is designed to fit easily in more or
+ less any context: In crypto toolkits for object-oriented languages (C++,
+ Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
+ space.
+ .
+ It tries to solve a problem of providing a common set of cryptographic
+ algorithms for higher-level applications by implementing a
+ context-independent set of cryptographic algorithms. In that light, Nettle
+ doesn't do any memory allocation or I/O, it simply provides the
+ cryptographic algorithms for the application to use in any environment and
+ in any way it needs.
+ .
+ This package contains binary utilities that accompany the library:
+ .
+ - nettle-lfib-stream - generates a pseudorandom stream, using the Knuth
+ lfib (non-cryptographic) pseudorandom generator.
+ - sexp-conv - conversion tool for handling the different flavours of sexp
+ syntax.
+ .
+ Homepage: http://www.lysator.liu.se/~nisse/nettle/
Index: 1.15-2/debian/nettle-bin.postinst
===================================================================
--- 1.15-2/debian/nettle-bin.postinst (nonexistent)
+++ 1.15-2/debian/nettle-bin.postinst (revision 12)
@@ -0,0 +1,53 @@
+#! /bin/sh
+# postinst script for pike7.6
+#
+# see: dh_installdeb(1)
+#
+# $Id: postinst,v 1.9 2004/04/30 17:12:43 grendel Exp $
+#
+
+set -e
+
+PIKE=7.6
+PIKEBIN=pike${PIKE}
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+case "$1" in
+ configure)
+ /usr/sbin/update-alternatives --install /usr/bin/sexp-conv sexp-conv /usr/bin/sexp-conv.nettle 10 \
+ --slave /usr/share/man/man1/sexp-conv.1.gz sexp-conv.1.gz /usr/share/man/man1/sexp-conv.nettle.1.gz
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Index: 1.15-2/debian/compat
===================================================================
--- 1.15-2/debian/compat (nonexistent)
+++ 1.15-2/debian/compat (revision 12)
@@ -0,0 +1 @@
+4
Index: 1.15-2/debian/libnettle-dev.docs
===================================================================
--- 1.15-2/debian/libnettle-dev.docs (nonexistent)
+++ 1.15-2/debian/libnettle-dev.docs (revision 12)
@@ -0,0 +1 @@
+nettle.html
Index: 1.15-2/debian/nettle-bin.prerm
===================================================================
--- 1.15-2/debian/nettle-bin.prerm (nonexistent)
+++ 1.15-2/debian/nettle-bin.prerm (revision 12)
@@ -0,0 +1,41 @@
+#! /bin/sh
+# prerm script for pike7.6
+#
+# see: dh_installdeb(1)
+#
+# $Id: prerm,v 1.7 2004/04/30 17:12:43 grendel Exp $
+#
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ update-alternatives --remove sexp-conv /usr/bin/sexp-conv.nettle
+ ;;
+ failed-upgrade)
+ ;;
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Index: 1.15-2/debian/libnettle-dev.info
===================================================================
--- 1.15-2/debian/libnettle-dev.info (nonexistent)
+++ 1.15-2/debian/libnettle-dev.info (revision 12)
@@ -0,0 +1 @@
+nettle.info
Index: 1.15-2/debian/nettle-bin.manpages
===================================================================
--- 1.15-2/debian/nettle-bin.manpages (nonexistent)
+++ 1.15-2/debian/nettle-bin.manpages (revision 12)
@@ -0,0 +1 @@
+debian/sexp-conv.nettle.1
Index: 1.15-2/debian/libnettle2.docs
===================================================================
--- 1.15-2/debian/libnettle2.docs (nonexistent)
+++ 1.15-2/debian/libnettle2.docs (revision 12)
@@ -0,0 +1,4 @@
+descore.README
+NEWS
+README
+TODO
Index: 1.15-2/debian/libnettle-dev.dirs
===================================================================
--- 1.15-2/debian/libnettle-dev.dirs (nonexistent)
+++ 1.15-2/debian/libnettle-dev.dirs (revision 12)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
Index: 1.15-2/debian/libnettle-dev.files
===================================================================
--- 1.15-2/debian/libnettle-dev.files (nonexistent)
+++ 1.15-2/debian/libnettle-dev.files (revision 12)
@@ -0,0 +1,5 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/lib/*.la
Index: 1.15-2/debian/nettle-bin.files
===================================================================
--- 1.15-2/debian/nettle-bin.files (nonexistent)
+++ 1.15-2/debian/nettle-bin.files (revision 12)
@@ -0,0 +1 @@
+/usr/bin/*
Index: 1.15-2/debian/libnettle2.dirs
===================================================================
--- 1.15-2/debian/libnettle2.dirs (nonexistent)
+++ 1.15-2/debian/libnettle2.dirs (revision 12)
@@ -0,0 +1 @@
+usr/lib
Index: 1.15-2/debian/libnettle2.files
===================================================================
--- 1.15-2/debian/libnettle2.files (nonexistent)
+++ 1.15-2/debian/libnettle2.files (revision 12)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
Index: 1.15-2/debian/watch
===================================================================
--- 1.15-2/debian/watch (nonexistent)
+++ 1.15-2/debian/watch (revision 12)
@@ -0,0 +1,3 @@
+version=3
+ftp://ftp.lysator.liu.se/pub/security/lsh/nettle-(.*)\.tar\.gz
+http://www.lysator.liu.se/~nisse/archive/nettle-(.*)\.tar\.gz
Index: 1.15-2/debian/copyright
===================================================================
--- 1.15-2/debian/copyright (nonexistent)
+++ 1.15-2/debian/copyright (revision 12)
@@ -0,0 +1,25 @@
+This package was debianized by Marek Habersack <grendel@debian.org> on
+Tue, 4 Nov 2003 18:23:07 +0100.
+
+It was downloaded from http://www.lysator.liu.se/~nisse/nettle/
+
+Upstream Author: Niels Möller
+
+Copyright:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Index: 1.15-2/debian/libnettle-dev.doc-base
===================================================================
--- 1.15-2/debian/libnettle-dev.doc-base (nonexistent)
+++ 1.15-2/debian/libnettle-dev.doc-base (revision 12)
@@ -0,0 +1,13 @@
+Document: libnettle-dev
+Title: Debian Nettle Manual
+Author: Niels Möller
+Abstract: This document describes the nettle low-level
+ cryptographic library. You can use the library directly
+ from your C programs, or (recommended) write or use an
+ object-oriented wrapper for your favorite language or
+ application.
+Section: Apps/Programming
+
+Format: HTML
+Files: /usr/share/doc/libnettle-dev/nettle.html
+Index: /usr/share/doc/libnettle-dev/nettle.html
Index: 1.15-2/debian/libnettle-dev.examples
===================================================================
--- 1.15-2/debian/libnettle-dev.examples (nonexistent)
+++ 1.15-2/debian/libnettle-dev.examples (revision 12)
@@ -0,0 +1 @@
+examples/*
Index: 1.15-2/debian/sexp-conv.nettle.1
===================================================================
--- 1.15-2/debian/sexp-conv.nettle.1 (nonexistent)
+++ 1.15-2/debian/sexp-conv.nettle.1 (revision 12)
@@ -0,0 +1,94 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH SEXP-CONV 1 "Apr 19, 2002" sexp-conv "Lsh Manuals"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp <n> insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+sexp_conv \- convert s-expression to a different encoding
+.SH SYNOPSIS
+.B sexp_conv
+.RI [ options ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B sexp_conv
+command.
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBsexp_conv\fP is a program that converts S-expressions (keys and
+most other objects which `lsh' needs to store on disk)
+.SH OPTIONS
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-\-hash=\fIalgorithm\fP
+Hash algorithm (default: sha1).
+.TP
+.B \-\-once
+Process at most one s-expression.
+.TP
+.B \-\-raw\-hash
+Output the hash for the canonical representation of the object, in hexadecimal.
+.TP
+.B \-\-spki\-hash
+Output an SPKI hash for the object.
+.TP
+.B \-\-debug
+Print huge amounts of debug information.
+.TP
+.B \-q, \-\-quiet
+Supress all warnings and diagnostic messages.
+.TP
+.B \-\-trace
+Detailed trace.
+.TP
+.B \-v, \-\-verbose
+Verbose diagnostic messages.
+.TP
+.B \-i, \-\-input\-format=\fIformat\fP
+Variant of S-expression to accept. Valid S-expression formats are: transport,
+canonical, advanced and international.
+.TP
+.B \-o, \-\-output\-format=\fIformat\fP
+Variant of S-expression to output. Valid S-expression formats are: transport,
+canonical, advanced and international.
+.TP
+.B \-?, \-\-help
+Show summary of options.
+.TP
+.B \-\-usage
+Give a short usage message.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR ssh-conv (1),
+.BR lshc (1),
+.BR lshd (8).
+.br
+The programs are documented fully by the
+.IR "sexp"
+section under the
+.IR "Getting Started"
+header of the lsh info page, available via the Info system.
+.SH AUTHOR
+This manual page was written by Timshel Knoll <timshel@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
Index: 1.15-2/debian
===================================================================
--- 1.15-2/debian (nonexistent)
+++ 1.15-2/debian (revision 12)
/1.15-2/debian
Property changes:
Added: mergeWithUpstream
## -0,0 +1 ##
+1
\ No newline at end of property