WebSVN - lsh - Path Comparison - /branches/ Rev 29 and /branches/ Rev 28

Ignore whitespace Rev 29 → Rev 28

/branches/experimental/debian/patches/40_better_errmsg_when_dotlsh_missing.dpatch
File deleted

Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: experimental/debian/patches/20_sftp-server_mansection.dpatch
===================================================================
--- experimental/debian/patches/20_sftp-server_mansection.dpatch (revision 29)
+++ experimental/debian/patches/20_sftp-server_mansection.dpatch (nonexistent)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_sftp-server_mansection.dpatch by <magnus@proffe.kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Invent manual section 8lsh for lsh's sftp-server
-
-@DPATCH@
-diff -urNad trunk~/src/sftp/sftp-server.8 trunk/src/sftp/sftp-server.8
---- trunk~/src/sftp/sftp-server.8 2006-05-08 21:11:17.000000000 +0200
-+++ trunk/src/sftp/sftp-server.8 2007-10-03 20:48:35.000000000 +0200
-@@ -22,7 +22,7 @@
- .\" maintainers of the package you received this manual from and make your
- .\" modified versions available to them.
- .\"
--.TH SFTP-SERVER 8 "NOVEMBER 2004" SFTP-SERVER "Lsh Manuals"
-+.TH SFTP-SERVER 8lsh "NOVEMBER 2004" SFTP-SERVER "Lsh Manuals"
- .SH NAME
- sftp-server - Server for the sftp subsystem
- .SH SYNOPSIS

/experimental/debian/patches/20_sftp-server_mansection.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: experimental/debian/lsh-doc.manpages
===================================================================
--- experimental/debian/lsh-doc.manpages (revision 29)
+++ experimental/debian/lsh-doc.manpages (nonexistent)
@@ -1 +0,0 @@
-doc/*.5
Index: experimental/debian/lsh-doc.info
===================================================================
--- experimental/debian/lsh-doc.info (revision 29)
+++ experimental/debian/lsh-doc.info (nonexistent)
@@ -1 +0,0 @@
-doc/lsh.info
Index: experimental/debian/lsh-client.manpages
===================================================================
--- experimental/debian/lsh-client.manpages (revision 29)
+++ experimental/debian/lsh-client.manpages (nonexistent)
@@ -1,4 +0,0 @@
-debian/mans/lcp.1
-doc/lsh.1
-doc/lshg.1
-src/sftp/lsftp.1
Index: experimental/debian/lsh-client.install
===================================================================
--- experimental/debian/lsh-client.install (revision 29)
+++ experimental/debian/lsh-client.install (nonexistent)
@@ -1,4 +0,0 @@
-usr/bin/lsh
-usr/bin/lshg
-usr/bin/lcp
-usr/bin/lsftp
Index: experimental/debian/lsh-utils.install
===================================================================
--- experimental/debian/lsh-utils.install (revision 29)
+++ experimental/debian/lsh-utils.install (nonexistent)
@@ -1,11 +0,0 @@
-usr/bin/lsh-authorize
-usr/bin/lsh-decode-key
-usr/bin/lsh-decrypt-key
-usr/bin/lsh-export-key
-usr/bin/lsh-keygen
-usr/bin/lsh-make-seed
-usr/bin/lsh-upgrade
-usr/bin/lsh-upgrade-key
-usr/bin/lsh-writekey
-usr/bin/srp-gen
-usr/bin/ssh-conv
Index: experimental/debian/changelog
===================================================================
--- experimental/debian/changelog (revision 29)
+++ experimental/debian/changelog (revision 28)
@@ -6,56 +6,29 @@
-- Magnus Holmgren <holmgren@debian.org> Wed, 05 Aug 2009 23:35:15 +0200

-lsh-utils (2.0.4-dfsg-2) unstable; urgency=low
+lsh (2.0.3-1) unstable; urgency=low

- * 40_better_errmsg_when_dotlsh_missing.dpatch (new): In unix_random.c,
- check whether the seed file exists before trying to lock it, and give
- the hint about running lsh-make-seed if it doesn't (Closes: #485856).
- * Update doc-base section of lsh-doc to match current structure.
- * Remove inactive maintainer as requested by the MIA team and put myself
- in charge (Closes: #487137).
- * Upgrade lsh-client's Recommends of lsh-utils to a Depends. It's not
- huge and lsh-client is almost useless without it in most cases
- (Closes: #481073).
- * Use --as-needed to avoid unnecessary dependencies.
-
- -- Magnus Holmgren <holmgren@debian.org> Wed, 25 Jun 2008 16:40:16 +0200
-
-lsh-utils (2.0.4-dfsg-1) unstable; urgency=low
-
* New upstream release (Closes: #422199)
- - Repackaged without non-free RFC (src/nettle/testsuite/rfc1750.txt)
- (Closes: #408490).
- Drop 01_fix_manpages.dpatch; incorporated upstream.
- - Fixes X11 forwarding bug.
* New co-maintainer added.
- * Rename lsh-utils-doc as lsh-doc. We'll rename the source package after
- Sarge is gone.
+ * Rename source package "lsh", as the previously clashing package is
+ gone (Closes: #340354).
* Drop the tarball-in-tarball format and ship a "normal" .orig.tar.gz.
- Drop 02_fix_perms.dpatch.
- Add some extra cleanup in debian/rules.
- * Increase Standards-Version to 3.7.3. No changes needed.
+ * Increase Standards-Version to 3.7.2. No changes needed.
+ * Fix spelling error lshc and its manpage (Closes: #417426).
* Put some more docs in the packages: README and ChangeLog is now in all
packages, AUTHORS in lsh-utils. Update debian/copyright to refer to
/usr/share/doc/lsh-utils/AUTHORS (Closes: #421108).
* debian/control: Use ${binary:Version} substitution variable instead of
${source-version}.
- * Review Build-depends: Drop patchutils, comerr-dev (redundant),
- po-debconf (redundant), xutils (makes no difference); add
- autotools-dev, scsh-0.6 (as alternative to guile-1.6).
- * Drop lshc, the deprecated alias for lsh (Closes: #417426).
- * 30_nonettle.dpatch: Link dynamically with libnettle-dev instead of
- statically with the bundled nettle (Closes: #412138).
- * Don't provide sexp-conv; let lsh-client depend on nettle-bin instead.
- * Move lsftp and lcp to lsh-client.
- * Put sftp-server in /usr/lib/lsh-server and put the manpage in section
- 8lsh instead of renaming it (new 20_sftp-server_mansection.dpatch).
- * Ship lsh.html in lsh-doc.
- * Add doc-base entry.
- * debian/control: Add Homepage field.
- * debian/watch: Update dversionmangle to strip -dfsg suffix.
+ * Review Build-depends: Drop patchutils, dpatch (temporarily),
+ comerr-dev (redundant), po-debconf (redundant), xutils (makes no
+ difference); add autotools-dev, scsh-0.6 (as alternative to
+ guile-1.6).

- -- Magnus Holmgren <holmgren@debian.org> Thu, 01 May 2008 19:22:18 +0200
+ -- Magnus Holmgren <magnus@kibibyte.se> Sun, 6 May 2007 20:33:25 +0200

lsh-utils (2.0.2-1.1) unstable; urgency=low

 /branches/experimental/debian/rules
 ,7 → 2,9
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# Currently no patches
+#include /usr/share/cdbs/1/rules/dpatch.mk
 # the used configure parameters for ./configure
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-pam --enable-kerberos --enable-srp \
 ,12 → 13,105
         --with-zlib --with-tcpwrappers --with-sshd1=/usr/sbin/sshd \
         --with-x --with-system-nettle XAUTH_PROGRAM=/usr/bin/xauth
-DEB_INSTALL_CHANGELOGS_ALL := ChangeLog
-DEB_INSTALL_DOCS_ALL := README
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_INSTALL_CHANGELOGS_ALL := $(DEB_SRCDIR)/ChangeLog
+DEB_INSTALL_DOCS_ALL := $(DEB_SRCDIR)/README
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+# cdbs options for lsh-client
+DEB_INSTALL_MANPAGES_lsh-client := $(DEB_SRCDIR)/doc/lsh.1 \
+        $(DEB_SRCDIR)/doc/lshg.1 debian/mans/lshc.1
+DEB_INSTALL_DIRS_lsh-client := usr/bin
-common-install-arch::
+# cdbs options for lsh-server
+DEB_INSTALL_MANPAGES_lsh-server := debian/mans/lsh-execuv.8 \
+        debian/mans/lsh-pam-checkpw.8 \
+        debian/mans/lsh-krb-checkpw.8 \
+        debian/mans/lsh-server-config.8 \
+        $(DEB_SRCDIR)/src/sftp/sftp-server.lsh.8 \
+        $(DEB_SRCDIR)/doc/lshd.8
+DEB_INSTALL_DIRS_lsh-server := usr/sbin etc/default
+# cdbs options for lsh-utils
+DEB_INSTALL_MANPAGES_lsh-utils := $(DEB_SRCDIR)/src/sftp/lsftp.1 \
+        $(DEB_SRCDIR)/doc/lsh-authorize.1 \
+        $(DEB_SRCDIR)/doc/lsh-decode-key.1 \
+        $(DEB_SRCDIR)/doc/lsh-decrypt-key.1 \
+        $(DEB_SRCDIR)/doc/lsh-export-key.1 \
+        $(DEB_SRCDIR)/doc/lsh-make-seed.1 \
+        $(DEB_SRCDIR)/doc/lsh-upgrade.1 \
+        $(DEB_SRCDIR)/doc/lsh-upgrade-key.1 \
+        $(DEB_SRCDIR)/doc/ssh-conv.1 \
+        $(DEB_SRCDIR)/doc/lsh-keygen.1 \
+        $(DEB_SRCDIR)/doc/lsh-writekey.1 \
+        debian/mans/sexp-conv.lsh-utils.1 \
+        debian/mans/srp-gen.1 \
+        debian/mans/lcp.1
+DEB_INSTALL_DOCS_lsh-utils := $(DEB_SRCDIR)/AUTHORS
+DEB_INSTALL_DIRS_lsh-utils := usr/bin
+# cdbs options for lsh-utils-doc
+DEB_INSTALL_DOCS_lsh-utils-doc := $(DEB_SRCDIR)/FAQ $(DEB_SRCDIR)/NEWS \
+        $(DEB_SRCDIR)/ChangeLog.1 \
+        $(DEB_SRCDIR)/doc/HACKING $(DEB_SRCDIR)/doc/NOTES \
+        $(DEB_SRCDIR)/doc/PORTS $(DEB_SRCDIR)/doc/TASKLIST \
+        $(DEB_SRCDIR)/doc/TODO $(DEB_SRCDIR)/doc/configuration.txt \
+        $(DEB_SRCDIR)/ChangeLog.1
+DEB_INSTALL_MANPAGES_lsh-utils-doc := $(DEB_SRCDIR)/doc/DSA.5 \
+        $(DEB_SRCDIR)/doc/SHA.5 \
+        $(DEB_SRCDIR)/doc/SPKI.5 \
+        $(DEB_SRCDIR)/doc/secsh.5
+DEB_INSTALL_INFO_lsh-utils-doc := $(DEB_SRCDIR)/doc/lsh.info
+reverse-config::
+#       make distclean misses this
+        rm -f src/nettle/machine.m4
+cleanbuilddir::
+        rm -f src/sftp/sftp-server.lsh.8
+# override the default
+install/lsh-utils::
+        for i in \
+                lsftp \
+                lsftp \
+                lsh-authorize \
+                lsh-decode-key \
+                lsh-export-key \
+                lsh-keygen \
+                lsh-make-seed \
+                lsh-writekey \
+                srp-gen \
+                ssh-conv \
+                lsh-decrypt-key \
+                lsh-upgrade \
+                lsh-upgrade-key \
+                lcp \
+        ; do \
+        mv debian/tmp/usr/bin/$$i debian/lsh-utils/usr/bin/$$i; done
+#       Rename sexp-conv so that we can register it with the alternatives system
+        mv debian/tmp/usr/bin/sexp-conv \
+                debian/lsh-utils/usr/bin/sexp-conv.lsh-utils
+install/lsh-server::
+        for i in \
+                lsh-execuv \
+                lsh-pam-checkpw \
+                lshd \
+                lsh-krb-checkpw \
+        ; do \
+        mv debian/tmp/usr/sbin/$$i debian/lsh-server/usr/sbin/$$i; done
+#       sftp-server has a name conflict with the program of the same name in
+#       the "ssh" package. Maybe I should talk to the openssh maintainer about
+#       using alternatives?
+        mv debian/tmp/usr/sbin/sftp-server \
+                debian/lsh-server/usr/sbin/sftp-server.lsh
+        cp -a $(DEB_SRCDIR)/src/sftp/sftp-server.8 \
+                $(DEB_SRCDIR)/src/sftp/sftp-server.lsh.8
         install -m755 debian/scripts/lsh-server-config \
-                debian/tmp/usr/sbin
+                debian/lsh-server/usr/sbin
+install/lsh-client::
+        mv debian/tmp/usr/bin/lsh   debian/lsh-client/usr/bin
+        mv debian/tmp/usr/bin/lshg  debian/lsh-client/usr/bin
+        install -m755 debian/scripts/lshc debian/lsh-client/usr/bin

 /branches/experimental/debian/control
 ,33 → 1,33
-Source: lsh-utils
+Source: lsh
 Section: net
 Priority: extra
-Maintainer: Magnus Holmgren <holmgren@debian.org>
-Uploaders: Stefan Pfetzing <dreamind@dreamind.de>
-Standards-Version: 3.7.3
-Build-Depends: cdbs, debhelper (>= 4.1.16), dpatch, autotools-dev,
- libgmp3-dev, zlib1g-dev | libz-dev, liboop-dev, libxau-dev, nettle-dev,
- texinfo (>= 4.2), guile-1.6 | scsh-0.6, heimdal-dev, libwrap0-dev | libwrap-dev,
- libpam0g-dev | libpam-dev, libreadline5-dev | libreadline-dev, m4
-Homepage: http://www.lysator.liu.se/~nisse/lsh/
+Maintainer: Simon Law <sfllaw@debian.org>
+Uploaders: Stefan Pfetzing <dreamind@dreamind.de>,
+ Magnus Holmgren <magnus@kibibyte.se>
+Standards-Version: 3.7.2
+Build-Depends: cdbs, debhelper (>= 4.1.16), libgmp3-dev, zlib1g-dev | libz-dev, liboop-dev, libxau-dev, texinfo (>= 4.2), guile-1.6 | scsh-0.6, heimdal-dev, libwrap0-dev | libwrap-dev, libpam0g-dev | libpam-dev, libreadline5-dev | libreadline-dev, m4, autotools-dev
 Package: lsh-utils
 Architecture: any
-Depends: nettle-bin, ${shlibs:Depends}
-Suggests: lsh-server, lsh-client, lsh-doc
+Depends: lsh-client, ${shlibs:Depends}
+Recommends: lsh-server
+Suggests: lsh-utils-doc
+Conflicts: nettle-bin (<< 1.12-1),
 Description: Secure Shell v2 (SSH2) protocol utilities
- lsh is GNU GPL'd implementation of the Secure Shell protocol version
-(SSH2). The SSH (Secure SHell) protocol is a secure replacement for
- rlogin, rsh and rcp.
+ lsh is GNU GPL'd implementation of the Secure Shell
+ protocol version 2 (SSH2). The SSH (Secure SHell) protocol
+ is a secure replacement for rlogin, rsh and rcp.
  .
- This package contains the lsh utilities. This includes programs such
- as lsh-keygen, lsh-writekey (both programs for public/private key
- generation), lsh-authorize (for automatic remote key authentication),
- ssh-conv (utilities for converting between various public & private
- key formats), and a number of other utilities for use with both the
- lsh server and client.
+ This package contains the lsh utilities. This includes
+ programs such as lsh-keygen, lsh-writekey (both programs
+ for public/private key generation), lsh-authorize (for
+ automatic remote key authentication), sexp-conv and ssh-conv
+ (utilities for converting between various public & private
+ key formats), and a number of other utilities for use with
+ both the lsh server and client.
  .
- In some countries it may be illegal to use any encryption at all
- without a special permit.
+ In some countries it may be illegal to use any encryption
+ at all without a special permit.
 Package: lsh-server
 Architecture: any
 ,7 → 34,7
 Provides: ssh-server
 Depends: lsh-utils (= ${binary:Version}), ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0
 Conflicts: lsh-utils (<< 1.0.2-3)
-Suggests: lsh-client | openssh-client, lsh-doc
+Suggests: lsh-client | openssh-client
 Description: Secure Shell v2 (SSH2) protocol server
  lsh is GNU GPL'd implementation of the Secure Shell
  protocol version 2 (SSH2). The SSH (Secure SHell) protocol
 ,17 → 48,20
 Package: lsh-client
 Architecture: any
-Depends: nettle-bin, ${shlibs:Depends}, lsh-utils (= ${binary:Version})
-Conflicts: lsh-utils (<< 2.0.4-dfsg-1)
-Replaces: lsh-utils (<< 2.0.4-dfsg-1)
-Suggests: lsh-doc
+Depends: lsh-utils (= ${binary:Version}), ${shlibs:Depends}
+Conflicts: lsh-utils (<< 1.0.2-3)
 Description: Secure Shell v2 (SSH2) protocol client
  lsh is GNU GPL'd implementation of the Secure Shell
  protocol version 2 (SSH2). The SSH (Secure SHell) protocol
  is a secure replacement for rlogin, rsh and rcp.
  .
- This package contains the lsh client used to log in to a remote lsh
- or ssh2 server.
+ This package contains the lsh client. This package is
+ required to log into a remote lsh or ssh2 server. Please
+ note that the client binary is normally called 'lsh' rather
+ than 'lshc', but as there is already a 'lsh' binary in
+ Debian (the Limited SHell - see the 'lsh' package), the
+ client binary has been renamed to 'lshc'. All the other
+ program names remain as normal.
  .
  In some countries it may be illegal to use any encryption
  at all without a special permit.
 ,8 → 70,7
 Architecture: all
 Section: doc
 Suggests: lsh-utils, lsh-server, lsh-client
-Conflicts: lsh-utils (<< 1.0.2-3), lsh-utils-doc (<< 2.0.4-dfsg-1)
-Replaces: lsh-utils-doc (<< 2.0.4-dfsg-1)
+Conflicts: lsh-utils (<< 1.0.2-3)
 Description: Secure Shell v2 (SSH2) client / server / utilities documentation
  lsh is GNU GPL'd implementation of the Secure Shell
  protocol version 2 (SSH2). The SSH (Secure SHell) protocol
 ,3 → 83,4
  .
  In some countries it may be illegal to use any encryption
  at all without a special permit.

 /branches/experimental/debian/scripts/lshc
 ,0 → 1,16
+#!/bin/sh
+cat << EOF >&2
+/---------------------------------------------------------------------------\\
+| WARNING: lshc is deprecated                                               |
+|                                                                           |
+| The lsh-client binary has been renamed to 'lsh' as its the default with   |
+| the upstream source.  Please switch to using lsh instead of lshc.         |
+|                                                                           |
+| See /usr/share/doc/lsh-client/NEWS.Debian.gz                              |
+|                                                                           |
+| Executing lsh now.                                                        |
+\\---------------------------------------------------------------------------/
+EOF
+exec lsh $@

/branches/experimental/debian/lsh-server.dirs
0,0 → 1,3
etc/default
usr/sbin
usr/share/lintian/overrides

 /branches/experimental/debian/mans/lsh-writekey.1
 ,7 → 109,7
 .SH SEE ALSO
 .BR lsh-keygen (1),
 .BR lsh-make-seed (1),
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8),
 .BR SPKI (5).
 .BR

 /branches/experimental/debian/mans/lsftp.1
 ,7 → 165,7
 .TP
 .B LSFTP_AFTER_ARGS
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR mail (1),
 .BR lshd (8),
 .BR lshg (8).

 /branches/experimental/debian/mans/lshc.1
 ,0 → 1,29
+.\"                                      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 LSHC 1 "Nov 15, 2005" lshc "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
+lshc \- depricated command for lsh
+.SH DESCRIPTION
+lshc is the
+.B deprecated
+name of the lsh-client binary. It has been renamed to lsh - as it was its upstream
+name.
+.SH SEE ALSO
+.BR lsh (1),
+.SH AUTHOR
+This manual page was written by Stefan Pfetzing <dreamind@dreamind.de>,
+for the Debian GNU/Linux system (but may be used by others).

 /branches/experimental/debian/mans/lsh-execuv.8
 ,7 → 59,7
 .B \-?
 Show summary of options.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The programs are documented fully by

 /branches/experimental/debian/mans/lsh-pam-checkpw.8
 ,7 → 42,7
 password must be supplied exactly, ie. there must be no newline after the
 password, so if invoking from a shell, just type "<your-password><CTRL-D>".
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The programs are documented fully by

 /branches/experimental/debian/mans/lsh-export-key.1
 ,7 → 66,7
 .B \-V, \-\-version
 Prints the program version
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8),
 .BR sexp-conv (1),
 .BR ssh-conv (1),

 /branches/experimental/debian/mans/lsh-krb-checkpw.8
 ,7 → 42,7
 password must be supplied exactly, ie. there must be no newline after the
 password, so if invoking from a shell, just type "<your-password><CTRL-D>".
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The programs are documented fully by

 /branches/experimental/debian/mans/lsh-decode-key.1
 ,7 → 67,7
 .B \-V, \-\-version
 Show version of program.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (1),
 .BR sexp-conv (1),
 .BR ssh-conv (1)

 /branches/experimental/debian/mans/lshg.1
 ,7 → 8,7
 .RI [ options ] " hostname" " [command...]"
 .SH DESCRIPTION
 Connects to \fIhostname\fP using the Secure SHell v2 (SSH2) protocol, via
-a gateway that has been created with \fBlsh(1)\fP
+a gateway that has been created with \fBlshc(1)\fP
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 ,7 → 95,7
 .B \-V, \-\-version
 Show program version.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .SH AUTHOR
 This manual page was written by Timshel Knoll <timshel@debian.org>,

 /branches/experimental/debian/mans/lsh-authorize.1
 ,7 → 35,7
 .BR lsh-writekey (1),
 .BR sexp-conv (1),
 .BR ssh-conv (1),
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The lsh programs (including this one) are documented fully by

 /branches/experimental/debian/mans/lsh_proxy.8
 ,7 → 118,7
 .B \-V, \-\-version
 Show version of program.
 .SH SEE ALSO
-.BR lsh (1).
+.BR lshc (1).
 .BR lshd (8)
 .BR
 The programs are documented fully by

 /branches/experimental/debian/mans/ssh-conv.1
 ,7 → 33,7
 \fBssh-conv\fP is a program that converts a SSH2 public key to lsh's
 sexp format.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (1),
 .BR lsh-decode-key (1),
 .BR sexp-conv (1).

 /branches/experimental/debian/mans/lshd.8
 ,7 → 122,7
 .B \-V, \-\-version
 Show version of program.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The programs are documented fully by

 /branches/experimental/debian/mans/sexp-conv.lsh-utils.1
 ,7 → 81,7
 Show version of program.
 .SH SEE ALSO
 .BR ssh-conv (1),
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .br
 The programs are documented fully by the

 /branches/experimental/debian/mans/lsh-keygen.1
 ,7 → 93,7
 .SH SEE ALSO
 .BR lsh-writekey (1),
 .BR lsh-make-seed (1),
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8),
 .BR DSA (5),
 .BR SPKI (5).

 /branches/experimental/debian/mans/srp-gen.1
 ,7 → 78,7
 .B \-V, \-\-version
 Show version of program.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (1),
 .BR sexp-conv (1).
 .br

 /branches/experimental/debian/mans/sftp-server.lsh.8
 ,7 → 35,7
 sftp (secure ftp) clients. To enable sftp in your lshd server, run lshd with
 the \fI\-\-subsystems=sftp=/usr/sbin/sftp\-server\fP flag.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The programs are documented fully by

 /branches/experimental/debian/mans/lcp.1
 ,10 → 50,10
 .\"
 .\"
 .Sh ENVIRONMENT
-.TP
+.Tp
 .B LSFTP_RSH
 The program to use for the SSH tunnel. If the variable is not set, lcp
-defaults to using lsh.
+defaults to using lshc.
 .\"
 .Sh "REPORTING BUGS"
 Report bugs to <bug-lsh@gnu.org>.
 ,5 → 68,5
 .Br rcp (1),
 .Br scp (1),
 .Br lsftp (1),
-.Br lsh (1),
+.Br lshc (1),
 .Br lshd (8),

 /branches/experimental/debian/mans/lsh-make-seed.1
 ,7 → 75,7
 .B \-V, \-\-version
 Show version of program.
 .SH SEE ALSO
-.BR lsh (1),
+.BR lshc (1),
 .BR lshd (8).
 .BR
 The programs are documented fully by

/branches/experimental/debian/watch
1,5 → 1,5
# use the newest watch file format.
version=3
# Site+Directory Pattern Version Script
opts=dversionmangle=s/-dfsg$// \
# Site+Directory Pattern Version Script
opts=dversionmangle=s/cdbs$// \
ftp://ftp.lysator.liu.se/pub/security/lsh/lsh-([^-]*)\.tar\.gz debian uupdate

 /branches/experimental/debian/lsh-utils.postinst
 ,0 → 1,49
+#! /bin/sh
+# postinst script for lsh-utils
+#
+# see: dh_installdeb(1)
+#
+#
+set -e
+# 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.lsh-utils 9 \
+    --slave /usr/share/man/man1/sexp-conv.1.gz sexp-conv.1.gz /usr/share/man/man1/sexp-conv.lsh-utils.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

 /branches/experimental/debian/copyright
 ,12 → 4,8
 It was downloaded from ftp://ftp.lysator.liu.se/pub/security/lsh/
-The original upstream tarball has been repacked because it bundles
-Nettle 1.14 (actually a snapshot between 1.14 and 1.15), which
-contains a non-free RFC.
-Upstream Authors: Niels Möller <nisse@lysator.liu.se>
-                  Balázs Scheidler
+Upstream Authors: Niels Möller <nisse@lysator.liu.se>
+                  Balázs Scheidler
         Many others, too numerous to list here. See the file
         `/usr/share/doc/lsh-utils/AUTHORS' for a more complete list of
         the authors and licenses the of various lsh components.
 ,7 → 12,7
 Copyright:
-    Copyright (C) 1999 Niels Möller
+    Copyright (C) 1999 Niels Möller
     This program 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; either version 2 of the License, or

 /branches/experimental/debian/lsh-utils.prerm
 ,0 → 1,40
+#! /bin/sh
+# prerm script for lsh-utils
+#
+# see: dh_installdeb(1)
+#
+#
+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.lsh-utils
+        ;;
+    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

 /branches/experimental/debian/lsh-server.init.d
 ,7 → 37,7
 case "$ENABLE_SFTP" in
   true|y*|Y*)
-    SFTP_FLAG="--subsystems sftp=/usr/lib/lsh-server/sftp-server"
+    SFTP_FLAG="--subsystems sftp=/usr/sbin/sftp-server.lsh"
     ;;
   *)
     SFTP_FLAG=""

 /branches/experimental/debian/README.Debian
 ,9 → 29,8
 Some notes about the sftp-server
 --------------------------------
-The used sftp-server has been placed in /usr/lib/lsh-server, analoguously
-with openssh-server. Our manpage is in the special section 8lsh, to avoid
-conflict with the corresponding manpage in said package.
+The used sftp-server has been renamed to sftp-server.lsh, due to a manpage
+called sftp-server.8.gz already existing in the ssh package.
 Credits
 -------
 ,4 → 38,4
 This package is based on work by Robert Bihlmeyer <robbe@orcus.priv.at> and
 Timshel Knoll <timshel@debian.org>.
- -- Magnus Holmgren <magnus@kibibyte.se>, Wed,  3 Oct 2007 20:56:36 +0200
+ -- Stefan Pfetzing <dreamind@dreamind.de>  Thu, 19 Jan 2006 01:55:21 +0100

Subversion Repositories lsh

Compare Revisions

Ignore whitespace Rev 29 → Rev 28