diff -Nru autossh-1.4c/debian/autossh.dirs autossh-1.4c/debian/autossh.dirs --- autossh-1.4c/debian/autossh.dirs 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/autossh.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/share/man/man1 -usr/lib/autossh -usr/bin \ No newline at end of file diff -Nru autossh-1.4c/debian/autossh.lintian-overrides autossh-1.4c/debian/autossh.lintian-overrides --- autossh-1.4c/debian/autossh.lintian-overrides 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/autossh.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -autossh binary: package-contains-broken-symlink usr/share/man/man1/autossh-argv0.1.gz ssh-argv0.1.gz diff -Nru autossh-1.4c/debian/changelog autossh-1.4c/debian/changelog --- autossh-1.4c/debian/changelog 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/changelog 2013-05-16 20:26:45.000000000 +0000 @@ -1,3 +1,27 @@ +autossh (1.4c-2) unstable; urgency=low + + * Merge debian/autossh.dirs and debian/dirs + * Rename autossh.lintian-overrides to lintian-overrides + * Bump debhelper compatibility to 9 to make use of the following + features: + - dh_clean will delete toplevel *-stamp files + - dh_installchangelogs will guess at what file is the upstream + changelog if none is specified + - dh_auto_{configure,build} pass dpkg-buildflags automatically + * Revamp debian/rules: + - Use dh_auto_{configure,build,clean} + - Drop manual DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE handling. + - Use debian/links instead of "ln -s" + - Finally switch to a minimal dh7 style debian/rules file + * Switch to source format "3.0 (quilt)" + - Drop build-dependency on quilt + * Add patch to properly pass LDFLAGS + - Fixes lintian warning hardening-no-relro + * Bump Standards-Version to 3.9.4 (no changes) + * Apply wrap-and-sort + + -- Axel Beckert Thu, 16 May 2013 22:26:02 +0200 + autossh (1.4c-1) unstable; urgency=low * New upstream bugfix release diff -Nru autossh-1.4c/debian/compat autossh-1.4c/debian/compat --- autossh-1.4c/debian/compat 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/compat 2013-05-16 19:42:03.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru autossh-1.4c/debian/control autossh-1.4c/debian/control --- autossh-1.4c/debian/control 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/control 2013-05-16 20:00:09.000000000 +0000 @@ -3,17 +3,23 @@ Priority: optional Maintainer: Axel Beckert Uploaders: Franziska Lichtblau -Build-Depends: debhelper (>= 7), autoconf (>= 2.59), autotools-dev, quilt, openssh-client +Build-Depends: autoconf (>= 2.59), + autotools-dev, + debhelper (>= 9~), + openssh-client Build-Conflicts: autoconf2.13 Homepage: http://www.harding.motd.ca/autossh/ Vcs-Git: git://anonscm.debian.org/collab-maint/autossh.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/autossh.git -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Package: autossh Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client | ssh-client -Enhances: openssh-client, ssh-client +Depends: openssh-client | ssh-client, + ${misc:Depends}, + ${shlibs:Depends} +Enhances: openssh-client, + ssh-client Description: Automatically restart SSH sessions and tunnels autossh is a program to start an instance of ssh and monitor it, restarting it as necessary should it die or stop passing traffic. The idea is from rstunnel diff -Nru autossh-1.4c/debian/copyright autossh-1.4c/debian/copyright --- autossh-1.4c/debian/copyright 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/copyright 2013-05-16 20:00:09.000000000 +0000 @@ -9,10 +9,10 @@ Copyright (c) Carson Harding, 2002. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are freely permitted. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL diff -Nru autossh-1.4c/debian/dirs autossh-1.4c/debian/dirs --- autossh-1.4c/debian/dirs 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/dirs 2013-05-16 11:34:05.000000000 +0000 @@ -2,3 +2,4 @@ usr/bin usr/share/doc/autossh/examples usr/lib/autossh +usr/share/man/man1 diff -Nru autossh-1.4c/debian/links autossh-1.4c/debian/links --- autossh-1.4c/debian/links 1970-01-01 00:00:00.000000000 +0000 +++ autossh-1.4c/debian/links 2013-05-16 19:43:24.000000000 +0000 @@ -0,0 +1,3 @@ +/usr/share/man/man1/ssh-argv0.1.gz /usr/share/man/man1/autossh-argv0.1.gz +/usr/bin/rscreen /usr/bin/rtmux +/usr/bin/rscreen /usr/bin/ruscreen diff -Nru autossh-1.4c/debian/lintian-overrides autossh-1.4c/debian/lintian-overrides --- autossh-1.4c/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ autossh-1.4c/debian/lintian-overrides 2013-05-16 11:34:05.000000000 +0000 @@ -0,0 +1 @@ +autossh binary: package-contains-broken-symlink usr/share/man/man1/autossh-argv0.1.gz ssh-argv0.1.gz diff -Nru autossh-1.4c/debian/patches/022_pass_ldflags.diff autossh-1.4c/debian/patches/022_pass_ldflags.diff --- autossh-1.4c/debian/patches/022_pass_ldflags.diff 1970-01-01 00:00:00.000000000 +0000 +++ autossh-1.4c/debian/patches/022_pass_ldflags.diff 2013-05-16 19:43:24.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Properly pass LDFLAGS. Fixes lintian warning hardening-no-relro +Author: Axel Beckert + +Index: autossh/Makefile.in +=================================================================== +--- autossh.orig/Makefile.in 2013-05-16 14:51:47.000000000 +0200 ++++ autossh/Makefile.in 2013-05-16 14:53:19.000000000 +0200 +@@ -31,7 +31,7 @@ + + + $(TARGET): $(OFILES) +- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS) ++ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS) + + clean: + - /bin/rm -f *.o *.a *.core *~ diff -Nru autossh-1.4c/debian/patches/series autossh-1.4c/debian/patches/series --- autossh-1.4c/debian/patches/series 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/patches/series 2013-05-16 19:43:24.000000000 +0000 @@ -1,4 +1,5 @@ 010_override_cmdline_port.diff 020_use_destdir_makefile.diff +022_pass_ldflags.diff 030_manpage_fix.diff 040_manpage_debian.diff diff -Nru autossh-1.4c/debian/rules autossh-1.4c/debian/rules --- autossh-1.4c/debian/rules 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/rules 2013-05-16 19:56:01.000000000 +0000 @@ -3,93 +3,13 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# 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) -ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) -CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -else -CROSS= --build $(DEB_BUILD_GNU_TYPE) -endif +%: + dh $@ --with autotools-dev -include /usr/share/quilt/quilt.make - -configure: patch - -config.status: configure - dh_testdir - dh_autotools-dev_updateconfig - # Add here commands to configure the package. - ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" +override_dh_auto_configure: + dh_auto_configure sed -e 's/-lnsl//g' -i Makefile - -build: build-arch build-indep -build-arch: build-stamp -build-indep: build-stamp -build-stamp: config.status - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/autossh.sgml > autossh.1 - - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean - dh_autotools-dev_restoreconfig - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Add here commands to install the package into debian/autossh. - dh_install - +override_dh_auto_install: install -m0755 $(CURDIR)/debian/autossh_wrapper \ $(CURDIR)/debian/autossh/usr/bin/autossh - - ln -s ssh-argv0.1.gz \ - $(CURDIR)/debian/autossh/usr/share/man/man1/autossh-argv0.1.gz - ln -s rscreen $(CURDIR)/debian/autossh/usr/bin/rtmux - ln -s rscreen $(CURDIR)/debian/autossh/usr/bin/ruscreen - - dh_installlogcheck - -# Build architecture-independent files here. -binary-indep: install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs CHANGES - dh_installdocs - dh_installexamples -# dh_install - dh_installman - dh_lintian - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff -Nru autossh-1.4c/debian/source/format autossh-1.4c/debian/source/format --- autossh-1.4c/debian/source/format 2013-05-17 05:48:19.000000000 +0000 +++ autossh-1.4c/debian/source/format 2013-05-17 05:48:19.606465762 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt)