tags 484922 + patch retitle 484922 tcludp: [PATCH] FTBFS when converted to new source format 3.0 quilt: unprotected quilt push -a thanks
Sergei Golovan <[email protected]> writes: > On Thu, May 6, 2010 at 1:28 PM, Jari Aalto <[email protected]> wrote: > >> I've been fixing bugs for release goals[*] lately and noticed this one. >> Please let me know if it is okay to NMU to help transition of this >> package to new Quilt 3.0 format, if bug is already been worked on. > > Please, don't NMU now. I'll fix the bug shortly. I managed to start already, so here are fixed by now. Thanks for updating the package, Jari
diffstat for tcludp-1.0.8 tcludp-1.0.8 changelog | 22 ++++++++++++++++++++++ compat | 2 +- control | 5 ++--- rules | 24 ++++-------------------- source/format | 1 + watch | 5 +---- 6 files changed, 31 insertions(+), 28 deletions(-) diff -Nru tcludp-1.0.8/debian/changelog tcludp-1.0.8/debian/changelog --- tcludp-1.0.8/debian/changelog 2010-05-06 14:05:02.000000000 +0300 +++ tcludp-1.0.8/debian/changelog 2010-05-06 12:24:41.000000000 +0300 @@ -1,3 +1,25 @@ +tcludp (1.0.8-5.1) unstable; urgency=low + + [ Jari Aalto ] + * Non-maintainer upload. + - Move to packaging format "3.0 (quilt)" + (FTBFS minor; Closes: #484922). + * debian/compat + - Update to 7. + * debian/control + - (Build-Depends): remove quilt; obsolete. Update to debhelper 7.1. + - (Standards-Version): Update to 3.8.4. + - (libudp-tcl::Section): Remove inherited field. + * debian/rules + - Delete obsolete quilt calls. + - (install): Update dh_clean to dh_prep. + * debian/source/format + - New file + * debian/watch + - Update to sf.net director. + + -- Jari Aalto <[email protected]> Thu, 06 May 2010 12:15:07 +0300 + tcludp (1.0.8-5) unstable; urgency=low * Added quotes around CFLAGS environment variable value when passing it to a diff -Nru tcludp-1.0.8/debian/compat tcludp-1.0.8/debian/compat --- tcludp-1.0.8/debian/compat 2010-05-06 14:05:02.000000000 +0300 +++ tcludp-1.0.8/debian/compat 2010-05-06 12:24:41.000000000 +0300 @@ -1 +1 @@ -5 +7 diff -Nru tcludp-1.0.8/debian/control tcludp-1.0.8/debian/control --- tcludp-1.0.8/debian/control 2010-05-06 14:05:02.000000000 +0300 +++ tcludp-1.0.8/debian/control 2010-05-06 12:24:41.000000000 +0300 @@ -2,12 +2,11 @@ Section: libs Priority: optional Maintainer: Sergei Golovan <[email protected]> -Build-Depends: debhelper (>= 5.0.0), tcl-dev, quilt -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 7.1), tcl-dev +Standards-Version: 3.8.4 Homepage: http://sourceforge.net/projects/tcludp Package: libudp-tcl -Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${tclsh:Depends} Description: UDP sockets for Tcl diff -Nru tcludp-1.0.8/debian/rules tcludp-1.0.8/debian/rules --- tcludp-1.0.8/debian/rules 2010-05-06 14:05:02.000000000 +0300 +++ tcludp-1.0.8/debian/rules 2010-05-06 12:24:41.000000000 +0300 @@ -6,9 +6,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# Directory with quilt patches -export QUILT_PATCHES := debian/patches - # 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) @@ -25,19 +22,7 @@ INSTALL_PROGRAM += -s endif -patch: patch-stamp -patch-stamp: - dh_testdir - quilt push -a - touch patch-stamp - -unpatch: - dh_testdir - rm -f patch-stamp - -quilt pop -a - rm -rf .pc - -config.status: patch-stamp +config.status: dh_testdir # Configure the package. CFLAGS="$(CFLAGS)" \ @@ -60,8 +45,7 @@ touch build-stamp -clean: clean-unpatched unpatch -clean-unpatched: +clean: dh_testdir dh_testroot @@ -75,7 +59,7 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Install the package into debian/libudp-tcl @@ -113,4 +97,4 @@ http://heanet.dl.sourceforge.net/sourceforge/tcludp/tcludp-1.0.8.tar.gz binary: binary-indep binary-arch -.PHONY: patch unpatch clean-unpatched build clean binary-indep binary-arch binary install get-orig-source +.PHONY: build clean binary-indep binary-arch binary install get-orig-source diff -Nru tcludp-1.0.8/debian/source/format tcludp-1.0.8/debian/source/format --- tcludp-1.0.8/debian/source/format 1970-01-01 02:00:00.000000000 +0200 +++ tcludp-1.0.8/debian/source/format 2010-05-06 12:24:41.000000000 +0300 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru tcludp-1.0.8/debian/watch tcludp-1.0.8/debian/watch --- tcludp-1.0.8/debian/watch 2010-05-06 14:05:02.000000000 +0300 +++ tcludp-1.0.8/debian/watch 2010-05-06 12:24:41.000000000 +0300 @@ -1,6 +1,3 @@ -# Watch control file for uscan - -# Compulsory line, this is a version 3 file version=3 +http://sf.net/tcludp/tcludp-([\d.]*).tar.gz -http://heanet.dl.sourceforge.net/sourceforge/tcludp/tcludp-([\d.]*).tar.gz
