Recover QA work and merge my changes

debian/changelog

@@ -11,6 +11,61 @@ mssh (1.3-1) unstable; urgency=low
 
  -- Hector Garcia <[email protected]>  Wed, 15 Jan 2014 18:12:21 +0100
 
+mssh (1.2-4) unstable; urgency=low
+
+  * QA upload
+  * Fix FTBFS with current toolchain by removing -pedantic-error from
+    CFLAGS. (Closes: #714438) The patch additionally removes -Werror from
+    CFLAGS, too, to avoid similar FTBFS, at least while the package is
+    orphaned.
+  * Apply wrap-and-sort
+  * Update config.{sub,guess} using dh_autotools-dev_updateconfig to avoid
+    FTBFS due to outdated config.{sub,guess}.
+    + Build-depend on autotools-dev
+  * Add some files which are potentially leftovers of unsuccessful builds
+    to debian/clean.
+  * Upstream's (and hence the former maintainer's) website is empty and
+    the DNS record for his FTP server no more exists.
+    + Comment out ftp.brad-smith.co.uk in watch file
+    + Comment out Homepage header
+
+ -- Axel Beckert <[email protected]>  Sun, 30 Jun 2013 19:16:46 +0200
+
+mssh (1.2-3) unstable; urgency=low
+
+  * QA upload
+  * Switch to dh7 style debian/rules
+    - Bump debhelper compatibility to 9, update debhelper build dependency
+    - Fixes lintian warning debian-rules-missing-recommended-target
+  * Switch to source format "3.0 (quilt)"
+  * Bump Standards-Version to 3.9.4 (no changes)
+  * Fix lintian warning hyphen-used-as-minus-sign.
+
+ -- Axel Beckert <[email protected]>  Tue, 07 May 2013 02:08:55 +0200
+
+mssh (1.2-2) unstable; urgency=low
+
+  * QA upload
+  * Set Maintainer to QA Group (O: #674885)
+  * Set Vcs-Header to collab-maint repository (Closes: #626594)
+  * Leave original Vcs-Headers with updated URLs as comments
+
+ -- Axel Beckert <[email protected]>  Sat, 29 Dec 2012 23:05:22 +0100
+
+mssh (1.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: mssh-terminal.c:49:5: error: 'vte_terminal_fork_command'
+    is deprecated (declared at /usr/include/vte-
+    0.0/vte/vtedeprecated.h:82) [-Werror=deprecated-declarations]":
+    apply patch from Ubuntu / Michael Vogt:
+    - fix ftbfs (LP: #756105)
+    (use vte_terminal_fork_command_full instead of the deprecated
+    vte_terminal_fork_command in src/mssh-terminal.c)
+    (Closes: #634426)
+
+ -- gregor herrmann <[email protected]>  Wed, 02 Nov 2011 19:32:56 +0100
+
 mssh (1.2-1) unstable; urgency=low
 
   * New upstream release.

debian/clean

@@ -0,0 +1,4 @@
+config.h
+config.log
+config.status
+stamp-h1

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -2,7 +2,12 @@ Source: mssh
 Section: admin
 Priority: optional
 Maintainer: Hector Garcia <[email protected]>
-Build-Depends: debhelper (>= 7), libgtk2.0-dev, libvte-dev, libgconf2-dev, bash-completion
+Build-Depends: autotools-dev,
+               bash-completion,
+               debhelper (>= 9~),
+               libgconf2-dev,
+               libgtk2.0-dev,
+               libvte-dev
 Standards-Version: 3.9.5
 Homepage: http://baloo.dyndns.biz
 Vcs-Git: git://baloo.dyndns.biz/mssh.git -b gtk2
@@ -10,7 +15,9 @@ Vcs-Browser: http://baloo.dyndns.biz/gitweb/?p=mssh.git;a=shortlog;h=refs/heads/
 
 Package: mssh
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client
+Depends: openssh-client,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: tool to administrate multiple servers at once
  MultiSSH is a GTK+ based SSH client designed to connect to multiple
  servers and issue to same commands to each server, making administering

debian/copyright

@@ -30,6 +30,7 @@ License: BSD
 
 Files: debian/*
 Copyright: (C) 2009 Bradley Smith <[email protected]>
+Copyright: (C) 2012, 2013 Axel Beckert <[email protected]>
 License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are

debian/mssh.examples

@@ -0,0 +1 @@
+mssh_clusters.conf

debian/mssh.install

@@ -1,2 +0,0 @@
-usr/bin/mssh
-usr/share/gconf/schemas/mssh.schemas

debian/rules

@@ -1,70 +1,11 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@ --with autotools-dev
 
-CFLAGS = -O2 -Wall
-LDFLAGS = -Wl,--as-needed
+override_dh_auto_configure:
+	dh_auto_configure -- --with-gconf-schema-file-dir=/usr/share/gconf/schemas
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" ./configure \
-		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--with-gconf-schema-file-dir=/usr/share/gconf/schemas
-	touch $@
-
-build-arch: build-stamp
-build-indep: build-stamp
-build: build-stamp
-build-stamp: configure
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	$(MAKE) GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
-		DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install --fail-missing
-
-binary-indep: install
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installexamples mssh_clusters.conf
-	dh_installdocs
-	dh_installman
+override_dh_auto_install:
+	dh_auto_install -- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 	dh_bash-completion
-	dh_gconf
-	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

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -1,2 +1,2 @@
 version=3
-http://ftp.brad-smith.co.uk/mssh/mssh-([\d\.]+).tar.gz
+#http://ftp.brad-smith.co.uk/mssh/mssh-([\d\.]+).tar.gz