Feel free to NMU Jari- thanks very much! -Todd
On Thu, Apr 12, 2012 at 10:08:50AM +0300, jari.aa...@cante.net wrote: > Package: yamdi > Severity: wishlist > Tags: patch > > Hi, > > The dpatch patch management system has been deprecated for some time. The > Lintian currently flags use of dpatch packages as an error. The new 3.0 > packaging format is an improved version which, among other things, contains > patch management built-in. For more information, see: > > http://wiki.debian.org/Projects/DebSrc3.0 > > I had some free time; see attached patch to migrate to new package > format. Note that all files in debian/patches/* are canocalized to > *.patch. > > Notes: > > In-line changes to original sources were moved to debian/patches > due to new package format requirements. > > Let me know if there is anything that needs adjusting or if it is ok > to upload this version in a NMU in case you are working on other > issues needing attention. > > Thanks, > Jari > > From e53d552f0fb54f5ea07c15a6dc17a93374f3f4a7 Mon Sep 17 00:00:00 2001 > From: Jari Aalto <jari.aa...@cante.net> > Date: Thu, 12 Apr 2012 10:05:18 +0300 > Subject: [PATCH] format-3.0 > Organization: Private > Content-Type: text/plain; charset="utf-8" > Content-Transfer-Encoding: 8bit > > Signed-off-by: Jari Aalto <jari.aa...@cante.net> > --- > Makefile | 2 +- > debian/changelog | 15 +++++++++++ > debian/compat | 2 +- > debian/control | 8 +++--- > debian/copyright | 7 ++--- > debian/patches/00list | 1 - > ..._height_fix.dpatch => 20-zero-height-fix.patch} | 7 ++--- > debian/patches/series | 2 ++ > debian/rules | 28 > +++++++------------- > debian/source/format | 1 + > 10 files changed, 39 insertions(+), 34 deletions(-) > delete mode 100644 debian/patches/00list > rename debian/patches/{01_zero_height_fix.dpatch => > 20-zero-height-fix.patch} (78%) > create mode 100644 debian/patches/series > create mode 100644 debian/source/format > > diff --git a/Makefile b/Makefile > index ccf7080..cad74ea 100644 > --- a/Makefile > +++ b/Makefile > @@ -1,7 +1,7 @@ > # Makefile for yamdi > > CC=gcc > -CFLAGS=-O2 -Wall -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat > -Wformat-security -Wl,-z,relro > +CFLAGS=-O2 -Wall > > yamdi: yamdi.c > $(CC) $(CFLAGS) yamdi.c -o yamdi > diff --git a/debian/changelog b/debian/changelog > index d9538b9..00a5f0b 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,18 @@ > +yamdi (1.4-2.1) unstable; urgency=low > + > + * Non-maintainer upload. > + * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". > + * Update to Standards-Version to 3.9.3, debhelper to 9, ${misc:Depends}. > + * Delete header XS-Vcs-Hg from control; domain and URL no longer exists. > + * Add build-arch and build-indep targets; use dh_prep in rules file. > + * Convert in-line patches to individual debian/patches (patch 10). > + * Fix copyright-with-old-dh-make-debian-copyright (Lintian). > + * Fix description-synopsis-starts-with-article (Lintian). > + * Fix no-homepage-field (Lintian). > + * Fix description-synopsis-starts-with-article (Lintian). > + > + -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 10:02:09 +0300 > + > yamdi (1.4-2) unstable; urgency=low > > * Add dpatch to Build-Depends > diff --git a/debian/compat b/debian/compat > index 7ed6ff8..ec63514 100644 > --- a/debian/compat > +++ b/debian/compat > @@ -1 +1 @@ > -5 > +9 > diff --git a/debian/control b/debian/control > index c05bf0d..6d65928 100644 > --- a/debian/control > +++ b/debian/control > @@ -2,14 +2,14 @@ Source: yamdi > Section: utils > Priority: extra > Maintainer: Todd Troxell <ttrox...@debian.org> > -Build-Depends: debhelper (>= 5), dpatch > -Standards-Version: 3.7.2 > -XS-Vcs-Hg: http://code.rapidpacket.com/yamdi/ > +Build-Depends: debhelper (>= 9) > +Standards-Version: 3.9.3 > +Homepage: http://freecode.com/projects/yamdi > > Package: yamdi > Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends} > -Description: a utility for adding metadata to flash video files > +Description: utility for adding metadata to flash video files > yamdi is a fast console application for adding various metadata to flv > files. > The program buffers its input file, rather than loading into memory in its > entirety. > diff --git a/debian/copyright b/debian/copyright > index c1b6d5e..d5eede2 100644 > --- a/debian/copyright > +++ b/debian/copyright > @@ -9,7 +9,7 @@ Upstream Author: > > Copyright: > > - Copyright (c) 2007, Ingo Oppermann > + Copyright (C) 2007 Ingo Oppermann > > License: > > @@ -39,5 +39,6 @@ License: > * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > > -The Debian packaging is (C) 2007, Todd Troxell <ttrox...@debian.org> and > -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. > +The Debian packaging is Copyright (C) 2007, Todd Troxell > +<ttrox...@debian.org> and is licensed under the GPL, see > +`/usr/share/common-licenses/GPL-2'. > diff --git a/debian/patches/00list b/debian/patches/00list > deleted file mode 100644 > index 71694c6..0000000 > --- a/debian/patches/00list > +++ /dev/null > @@ -1 +0,0 @@ > -01_zero_height_fix.dpatch > diff --git a/debian/patches/01_zero_height_fix.dpatch > b/debian/patches/20-zero-height-fix.patch > similarity index 78% > rename from debian/patches/01_zero_height_fix.dpatch > rename to debian/patches/20-zero-height-fix.patch > index 88015d3..50e35c0 100644 > --- a/debian/patches/01_zero_height_fix.dpatch > +++ b/debian/patches/20-zero-height-fix.patch > @@ -1,9 +1,6 @@ > -#! /bin/sh /usr/share/dpatch/dpatch-run > -## > -## All lines beginning with `## DP:' are a description of the patch. > -## DP: zero_height_fix > +From: Krystian Kichewko <kiche...@nonstopworkshop.com> > +Subject: Check case of zero height > > -@DPATCH@ > diff -u yamdi-1.4-orig/yamdi.c yamdi-1.4/yamdi.c > --- yamdi-1.4-orig/yamdi.c 2008-05-24 12:09:15.000000000 -0400 > +++ yamdi-1.4/yamdi.c 2009-02-23 10:09:15.000000000 -0500 > diff --git a/debian/patches/series b/debian/patches/series > new file mode 100644 > index 0000000..cf20952 > --- /dev/null > +++ b/debian/patches/series > @@ -0,0 +1,2 @@ > +10-makefile.patch > +20-zero-height-fix.patch > diff --git a/debian/rules b/debian/rules > index 2dc43f4..bb40d3d 100755 > --- a/debian/rules > +++ b/debian/rules > @@ -12,13 +12,17 @@ else > endif > > configure: configure-stamp > -configure-stamp: patch > +configure-stamp: > dh_testdir > # no configure commands > > touch configure-stamp > > > + > +build-arch: build > +build-indep: build > + > build: build-stamp > > build-stamp: configure-stamp > @@ -28,35 +32,21 @@ build-stamp: configure-stamp > > touch $@ > > -clean: clean-patched unpatch > +clean: > dh_testdir > dh_testroot > rm -f build-stamp configure-stamp > > - -$(MAKE) clean > - > - dh_clean > - > -clean-patched: > - dh_testdir > - dh_testroot > + [ ! -f Makefile ] || $(MAKE) clean > rm -rf debian/yamdi > rm -rf debian/files > rm -rf debian/substvars > - > -patch: patch-stamp > -patch-stamp: > - dpatch apply-all > - dpatch cat-all > patch-stamp > - > -unpatch: > - dpatch deapply-all > - rm -rf patch-stamp debian/patched > + dh_clean > > install: build > dh_testdir > dh_testroot > - dh_clean -k > + dh_prep > dh_installdirs > > $(MAKE) DESTDIR=$(CURDIR)/debian/yamdi install > diff --git a/debian/source/format b/debian/source/format > new file mode 100644 > index 0000000..163aaf8 > --- /dev/null > +++ b/debian/source/format > @@ -0,0 +1 @@ > +3.0 (quilt) > -- > 1.7.9.5 > -- Todd Troxell http://rapidpacket.com/~xtat
signature.asc
Description: Digital signature
