--- echoping-6.0.2.orig/debian/compat
+++ echoping-6.0.2/debian/compat
@@ -0,0 +1 @@
+5
--- echoping-6.0.2.orig/debian/echoping.examples
+++ echoping-6.0.2/debian/echoping.examples
@@ -0,0 +1,8 @@
+test-echoping-crypto
+test-echoping-icp
+test-echoping-idn
+test-echoping-ipv6
+test-echoping-local
+test-echoping-proxy
+test-echoping-remote
+test-echoping-tos
--- echoping-6.0.2.orig/debian/README.Debian
+++ echoping-6.0.2/debian/README.Debian
@@ -0,0 +1,25 @@
+echoping for Debian
+-------------------
+
+  echoping 6 is out!
+
+
+   PLUGINS
+  ---------
+  The new version of the monitoring and performance measurement program
+  introduces dynamic plugins and a few are shipped as part of this release.
+
+  You can now use your favorite protocol from echoping, just by writing
+  your own plugin.
+
+  Current shipped plugin: dns, ldap, postgresql, random, whois
+
+
+   FIXED BUGS
+  ------------
+  The new upstram release was packaged closing all three outstanding active
+  bugs issued agains echoping. (Closes: #416358, #340310, #407430)
+
+
+ -- Dario Minnucci <debian@midworld.net>  Fri, 01 Jun 2007 00:00:00 +0200
+
--- echoping-6.0.2.orig/debian/docs
+++ echoping-6.0.2/debian/docs
@@ -0,0 +1,6 @@
+AUTHORS
+DETAILS
+NEWS
+PLUGINS
+README
+TODO
--- echoping-6.0.2.orig/debian/dirs
+++ echoping-6.0.2/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- echoping-6.0.2.orig/debian/watch
+++ echoping-6.0.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/echoping/echoping-(.+)\.tar\.gz
+
--- echoping-6.0.2.orig/debian/README.source
+++ echoping-6.0.2/debian/README.source
@@ -0,0 +1,9 @@
+README.source
+-------------
+
+ The Debian package uses dpatch(1) for the modifications of the upstream source.
+ If you want to change something it is best to use the dpatch approach as documented
+ in /usr/share/doc/dpatch/README.source.gz
+
+ -- Dario Minnucci <debian@midworld.net>  Fri, 21 Aug 2009 00:26:11 +0200
+
--- echoping-6.0.2.orig/debian/control
+++ echoping-6.0.2/debian/control
@@ -0,0 +1,28 @@
+Source: echoping
+Section: net
+Priority: optional
+Maintainer: Dario Minnucci (midget) <debian@midworld.net>
+Build-Depends: debhelper (>= 5), autotools-dev, libgnutls-dev, libidn11-dev, libpopt-dev, dpatch, pkg-config
+Standards-Version: 3.8.3
+Homepage: http://echoping.sourceforge.net/
+
+Package: echoping
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: A small test tool for TCP servers
+ echoping is a small program to test (approximatively) performances of a
+ remote host by sending it requests such as HTTP requests.
+ .
+ In any case, be polite: don't bother the remote host with many repeated
+ requests, especially with large size. Ask for permission if you often
+ test hosts which aren't yours.
+ .
+ Current features:
+    * plugins, so you can extend echoping with any protocol you like and/or use,
+    * Supports IPv6 as well as IPv4,
+    * Supports IDN (Unicode domain names),
+    * uses the protocols echo, discard, chargen or HTTP,
+    * can use cryptographic connections with HTTP,
+    * uses UDP instead of TCP for the protocols which accept it (like echo),
+    * can repeat the test and display various measures about it,  
+
--- echoping-6.0.2.orig/debian/copyright
+++ echoping-6.0.2/debian/copyright
@@ -0,0 +1,24 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Name: echoping
+Upstream-Maintainer: Stephane Bortzmeyer <bortzmeyer@debian.org>
+Upstream-Source: http://sourceforge.net/project/showfiles.php?group_id=4581
+
+Files: *
+Copyright: 2000, Stephane Bortzmeyer
+License: GPL-2
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+    Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL-2' file.
+
+
+This package was debianized by Stephane Bortzmeyer <bortzmeyer@debian.org> on
+Fri, 30 Jun 2000 15:03:33 +0200.
+
--- echoping-6.0.2.orig/debian/rules
+++ echoping-6.0.2/debian/rules
@@ -0,0 +1,104 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# 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
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS)"
+	LDFLAGS="-Wl,-z,defs"
+	./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-icp \
+		--without-ssl \
+		--with-gnutls \
+		--with-libidn \
+
+build: build-stamp
+
+build-stamp:  config.status patch-stamp
+	dh_testdir
+	
+	rm -f config.log
+	mkdir -p $(CURDIR)/debian/echoping/usr/share/doc/echoping/examples
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/echoping.sgml > echoping.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_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/echoping.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/echoping install
+
+
+# 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_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installdebconf	
+#	dh_installinfo
+	dh_installman echoping.1 plugins/*/*.1
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: patch-stamp unpatch build clean binary-indep binary-arch binary install 
--- echoping-6.0.2.orig/debian/changelog
+++ echoping-6.0.2/debian/changelog
@@ -0,0 +1,158 @@
+echoping (6.0.2-3) unstable; urgency=medium
+
+  * debian/control: Added pkg-config to Build-Depends.
+  * debian/control: Description improvements.
+  * debian/patches: 02_FTBFS_against_gnutls26_greater_the_2.7.x_fix.dpatch
+    Fixes to solve FTBFS issue originated on 'gnutls26' update.
+    Thanks Andreas Metzler and Kumar Appaiah for reporting and patching.
+   (Closes: #529820)
+  * debian/control: Bumped Standards-Version to 3.8.3
+      - debian/README.source was created.
+  * debian/copyright: MPCF (Machine-Parsable Copyright Format) implementation.
+    See http://wiki.debian.org/Proposals/CopyrightFormat for details.
+  * debian/rules: Small cleanup.
+  * debian/watch: Rewritten to fit SF redirector.
+
+ -- Dario Minnucci (midget) <debian@midworld.net>  Fri, 21 Aug 2009 01:53:30 +0200
+
+echoping (6.0.2-2) unstable; urgency=low
+
+  * debian/control: Maintainer's name changed due to GPG signature update.
+  * debian/rules: Fix to avoid debian-rules-ignores-make-clean-error warning.
+  * debian/dirs: Fix to avoid package-contains-empty-directory warning.
+  * debian/control: Bumped Standards-Version: from 3.7.2 to 3.7.3
+  * debian/control, debian/rules: Added dpatch support.
+  * debian/patches/01_manpage_fixes.dpatch: Issued to correct lintian Info
+    message: hyphen-used-as-minus-sign usr/share/man/man1/echoping.1.gz:161
+  * debian/copyright, debian/watch: Updated to point to SF hosted file.
+    (Closes: #450315)
+  * debian/control: Added Homepage tag.
+  * debian/NEWS.Debian: Removed.
+
+ -- Dario Minnucci (midget) <debian@midworld.net>  Sun, 17 Feb 2008 08:28:05 +0100
+
+echoping (6.0.2-1) unstable; urgency=low
+
+  * New upstream release. (Closes: #416358)
+  * HTTPS request sent in clear bug fixed. (Closes: #340310)
+  * Glib bug with long URLs fixed. (Closes: #407430)
+  * /usr/share/doc/echoping/AUTHORS: Added.
+  * /usr/share/doc/echoping/PLUGINS: Added.
+  * debian/control: Added libpopt-dev to Build-Depends:
+
+ -- Dario Minnucci <debian@midworld.net>  Fri, 01 Jun 2007 00:00:00 +0200
+
+echoping (5.2.0-4) unstable; urgency=low
+
+  * Rebuild against newer gnutls-dev package (Closes: #415739)
+
+ -- Dario Minnucci <debian@midworld.net>  Thu, 22 Mar 2007 13:48:40 +0100
+
+echoping (5.2.0-3) unstable; urgency=low
+
+  * New Maintainer (Closes: #410900)
+  * Acknowledge NMU (Closes: #335750)
+  * debian/control: Updated debhelper to (>= 4)
+  * Bumped Standards-Version: from 3.6.1 to 3.7.2
+  * debian/rules: The whole file has been rewritten.
+  * debian/copyright: Proper copyright provided. (Closes: #375000)
+  * debian/watch: Added absent watchfile.
+  * debian/dirs: Added usr/share/doc/echoping/examples.
+  * debian/echoping.examples: Was created in order to install examples
+    using 'dh_installexamples'.
+  * debian/docs: INSTALL removed from doclist to get rid of lintian
+    warning: 'package-contains-upstream-install-documentation'.
+
+ -- Dario Minnucci <debian@midworld.net>  Mon, 19 Feb 2007 00:04:55 +0100
+
+echoping (5.2.0-2.1) unstable; urgency=low
+
+  * NMU
+  * Build against gnutls13 instead of gnutls11
+
+ -- Andreas Metzler <ametzler@debian.org>  Sun,  2 Jul 2006 09:30:23 +0000
+
+echoping (5.2.0-2) unstable; urgency=medium
+
+  * Now built with gnutls11. Closes: #264743
+
+ -- Stephane Bortzmeyer <bortzmeyer@debian.org>  Tue, 14 Sep 2004 14:24:56 +0200
+
+echoping (5.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Now depends on libidn
+
+ -- Stephane Bortzmeyer <bortzmeyer@debian.org>  Tue,  2 Mar 2004 16:45:27 +0100
+
+echoping (5.1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Now built with crypto support (crypto-in-main)
+  * Licence change (warning, ftpmaster!): now GPL + exemption for OpenSSL
+
+ -- Stephane Bortzmeyer <bortzmeyer@debian.org>  Thu, 13 Nov 2003 16:22:25 +0100
+
+echoping (4.2.0-2) unstable; urgency=low
+
+  * Just a small cleaning
+
+ -- Stephane Bortzmeyer <bortzmeyer@debian.org>  Thu,  6 Jun 2002 15:04:15 +0200
+
+echoping (4.2.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload with Stephane Bortzmeyer's permission.
+  * debian/control: Replace empty Build-Depends: line with a
+    build-dependency on debhelper (closes: #109206).
+  * common-licences -> common-licenses (lintian).
+
+ -- Colin Watson <cjwatson@debian.org>  Fri,  9 Nov 2001 20:29:26 +0000
+
+echoping (4.2.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stephane Bortzmeyer <bortzmeyer@debian.org>  Mon,  9 Apr 2001 20:54:54 +0200
+
+echoping (3.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Now debhelper instead of debmake
+
+ -- Stephane Bortzmeyer <bortzmeyer@debian.org>  Fri, 30 Jun 2000 15:03:33 +0200
+
+echoping (2.2.0-2) unstable; urgency=low
+
+  * After reading again the Policy manual. A few changes. FIRST official
+    release. (Uploaded.)
+
+ -- Stephane Bortzmeyer <bortzmeyer@pasteur.fr>  Tue, 22 Sep 1998 15:02:00 +0200
+
+echoping (2.2.0-1) unstable; urgency=low
+
+  * New upstream release, now stable. Compiled with ICP support and egcc.
+
+ -- Stephane Bortzmeyer <bortzmeyer@pasteur.fr>  Mon, 31 Aug 1998 17:04:42 +0200
+
+echoping (2.1.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stephane Bortzmeyer <bortzmeyer@pasteur.fr>  Fri, 28 Aug 1998 14:14:05 +0200
+
+echoping (2.1.1-1) unstable; urgency=low
+
+  * New upstream (ICP support, etc) 
+
+ -- Stephane Bortzmeyer <bortzmeyer@pasteur.fr>  Wed, 26 Aug 1998 15:32:23 +0200
+
+echoping (2.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Stephane Bortzmeyer <bortzmeyer@pasteur.fr>  Wed, 22 Jul 1998 10:45:07 +0200
+
+
+
+
+
--- echoping-6.0.2.orig/debian/patches/01_manpage_fixes.dpatch
+++ echoping-6.0.2/debian/patches/01_manpage_fixes.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_manpage_fixes.dpatch by Dario Minnucci (midget) <debian@midworld.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Manpage fixes.
+
+@DPATCH@
+diff -urNad echoping-6.0.2~/echoping.1.in echoping-6.0.2/echoping.1.in
+--- echoping-6.0.2~/echoping.1.in	2008-02-17 09:05:37.882611096 +0100
++++ echoping-6.0.2/echoping.1.in	2008-02-17 09:05:38.934671050 +0100
+@@ -158,7 +158,7 @@
+ Tests the remote Web proxy-cache and asks a Web page. Note that you must
+ indicate the whole URL.
+ .IP echoping\ -n\ 3\ -m\ whois\ foobar.example.com\ -d\ tao.example.org
+-Loads the whois plugin and query the host foobar.example.com. "-d
++Loads the whois plugin and query the host foobar.example.com. "\-d
+ tao.example.org" are options specific to the whois plugin.
+ .IP echoping\ -u\ \-P\ 0xa0\ foobar.example.com
+ Sends several UDP Echo packets with an IP Precedence of 5.
--- echoping-6.0.2.orig/debian/patches/02_FTBFS_against_gnutls26_greater_the_2.7.x_fix.dpatch
+++ echoping-6.0.2/debian/patches/02_FTBFS_against_gnutls26_greater_the_2.7.x_fix.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_FTBFS_against_gnutls26_greater_the_2.7.x_fix.dpatch by Dario Minnucci (midget) <debian@midworld.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS issue originated on 'gnutls26' update. RC #529820
+
+@DPATCH@
+diff -urNad echoping-6.0.2~/configure echoping-6.0.2/configure
+--- echoping-6.0.2~/configure	2007-04-09 21:53:04.000000000 +0200
++++ echoping-6.0.2/configure	2009-08-21 00:23:05.239929031 +0200
+@@ -20144,8 +20144,8 @@
+ _ACEOF
+ 
+    GNUTLS=1
+-   CPPFLAGS="${CPPFLAGS} `libgnutls-config --cflags`"
+-   LDFLAGS="${LDFLAGS} `libgnutls-config --libs`"
++   CPPFLAGS="${CPPFLAGS} `pkg-config gnutls --cflags`"
++   LDFLAGS="${LDFLAGS} `pkg-config gnutls --libs`"
+    if test "$withval" != "yes"; then
+ 	GNUTLSROOT=$withval
+ 	LDFLAGS="${LDFLAGS} -L$GNUTLSROOT/lib"
+@@ -22926,7 +22926,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_global_init" >&5
+ echo "${ECHO_T}$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
+ if test $ac_cv_lib_gnutls_gnutls_global_init = yes; then
+-  LIBS="${LIBS} `libgnutls-config --libs`"
++  LIBS="${LIBS} `pkg-config gnutls --libs`"
+ else
+   { { echo "$as_me:$LINENO: error: Get the GNU TLS library (http://www.gnutls.org/)" >&5
+ echo "$as_me: error: Get the GNU TLS library (http://www.gnutls.org/)" >&2;}
--- echoping-6.0.2.orig/debian/patches/00list
+++ echoping-6.0.2/debian/patches/00list
@@ -0,0 +1,2 @@
+01_manpage_fixes.dpatch
+02_FTBFS_against_gnutls26_greater_the_2.7.x_fix.dpatch
