diff -Nru udptunnel-1.1/debian/changelog udptunnel-1.1/debian/changelog --- udptunnel-1.1/debian/changelog 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/changelog 2011-10-21 14:02:37.000000000 +0000 @@ -1,3 +1,20 @@ +udptunnel (1.1-4) unstable; urgency=low + + * New maintainer (Closes: #590779) + - Thanks to Chris Lamb + * debian/control + - New Vcs-* address + - Standards-Version updated to 3.9.2 + - No changes need + * config.* is now updating with debhelper + * Switch to dpkg-source 3.0 (quilt) format + * DEP-3 in patches + * DEP-5 in debian/copyright + * debian/compat + - Compatibility level to 8 + + -- Marcos Talau Fri, 21 Oct 2011 10:27:03 -0200 + udptunnel (1.1-3) unstable; urgency=low * Update maintainer email address. diff -Nru udptunnel-1.1/debian/compat udptunnel-1.1/debian/compat --- udptunnel-1.1/debian/compat 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/compat 2011-10-21 14:02:37.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru udptunnel-1.1/debian/control udptunnel-1.1/debian/control --- udptunnel-1.1/debian/control 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/control 2011-10-21 14:02:37.000000000 +0000 @@ -1,17 +1,17 @@ Source: udptunnel Section: net Priority: optional -Maintainer: Chris Lamb -Build-Depends: debhelper (>= 7), autotools-dev, quilt -Standards-Version: 3.8.0 +Maintainer: Marcos Talau +Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1) +Standards-Version: 3.9.2 Homepage: http://www1.cs.columbia.edu/~lennox/udptunnel/ -Vcs-Git: git://git.chris-lamb.co.uk/debian/pkg-udptunnel.git -Vcs-Browser: http://git.chris-lamb.co.uk/?p=debian/pkg-udptunnel.git +Vcs-Git: git://git.debian.org/git/collab-maint/udptunnel.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/udptunnel.git Package: udptunnel Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Description: Tunnel UDP packets over a TCP connection +Description: tunnel UDP packets over a TCP connection UDPTunnel is a small program which can tunnel UDP packets bi-directionally over a TCP connection. Its primary purpose (and original motivation) is to allow multi-media conferences to traverse a firewall which allows only diff -Nru udptunnel-1.1/debian/copyright udptunnel-1.1/debian/copyright --- udptunnel-1.1/debian/copyright 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/copyright 2011-10-21 14:02:37.000000000 +0000 @@ -1,9 +1,11 @@ -Author: Jonathan Lennox -Download: http://www1.cs.columbia.edu/~lennox/udptunnel/ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: UDPTunnel +Upstream-Contact: Jonathan Lennox +Source: http://www1.cs.columbia.edu/~lennox/udptunnel Files: * -Copyright: (C) 1999, 2001 Columbia University. All rights reserved. -License: BSD +Copyright: Copyright © 1999, 2001 Columbia University. All rights reserved. +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . @@ -17,3 +19,24 @@ 3. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +Files: debian/* +Copyright: 2011, Marcos Talau + 2008-2009, Chris Lamb +License: GPL-2+ + 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 + (at your option) any later version. + . + This program 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 program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + See /usr/share/common-licenses/GPL-2, or + for the terms of the latest version of the GNU General Public License. diff -Nru udptunnel-1.1/debian/patches/01-multicast.diff udptunnel-1.1/debian/patches/01-multicast.diff --- udptunnel-1.1/debian/patches/01-multicast.diff 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/patches/01-multicast.diff 2011-10-21 14:02:37.000000000 +0000 @@ -1,9 +1,5 @@ -Fix issue where udptunnel was failing to receive packets sent to a multicast -address. (See #254834). - -Patch by . - - -- Chris Lamb Thu, 28 Aug 2008 07:48:29 +0100 +Description: Fix issue where udptunnel was failing to receive packets sent to a multicast address. (See #254834). +Author: singh_chinmay@extenprise.net --- udptunnel-1.1.orig/udptunnel.c +++ udptunnel-1.1/udptunnel.c diff -Nru udptunnel-1.1/debian/patches/02-strlen-prototype.diff udptunnel-1.1/debian/patches/02-strlen-prototype.diff --- udptunnel-1.1/debian/patches/02-strlen-prototype.diff 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/patches/02-strlen-prototype.diff 2011-10-21 14:02:37.000000000 +0000 @@ -1,4 +1,5 @@ -# Include string.h header for strlen prototype for GCC 4.4. compatibility. +Description: Include string.h header for strlen prototype for GCC 4.4. compatibility. +Author: Chris Lamb diff -urNad /tmp/bp-build/udptunnel-1.1.orig.orig/host2ip.c /tmp/bp-build/udptunnel-1.1.orig/host2ip.c --- udptunnel-1.1.orig.orig/host2ip.c 2008-08-28 07:50:41.000000000 +0100 diff -Nru udptunnel-1.1/debian/rules udptunnel-1.1/debian/rules --- udptunnel-1.1/debian/rules 2011-11-01 10:49:39.000000000 +0000 +++ udptunnel-1.1/debian/rules 2011-10-21 14:02:37.000000000 +0000 @@ -1,59 +1,4 @@ #!/usr/bin/make -f -include /usr/share/quilt/quilt.make - -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - [ ! -f Makefile ] || $(MAKE) distclean - rm -f config.sub config.guess - dh_clean - -config.status: configure - cp /usr/share/misc/config.sub config.sub - cp /usr/share/misc/config.guess config.guess - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - -build: build-stamp -build-stamp: patch config.status - dh_testdir - $(MAKE) - touch $@ - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - $(MAKE) install prefix=$(CURDIR)/debian/udptunnel/usr - -binary-indep: - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installman - dh_installchangelogs - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-arch -.PHONY: build clean binary-indep binary-arch binary install +%: + dh $@ --with autotools_dev diff -Nru udptunnel-1.1/debian/source/format udptunnel-1.1/debian/source/format --- udptunnel-1.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ udptunnel-1.1/debian/source/format 2011-11-01 10:49:39.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)