Hi Jari,

Sure, go ahead! i'm not very active on that package at this moment.

Thanks.

On Sat, Mar 17, 2012 at 12:38:40PM -0400, jari.aa...@cante.net wrote:
> Package: nwrite
> 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.
> 
> 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 34e5a55fe3bdd5b903a01cbd0944e3e741dd3f19 Mon Sep 17 00:00:00 2001
> From: Jari Aalto <jari.aa...@cante.net>
> Date: Wed, 29 Feb 2012 07:02:19 -0500
> 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>
> ---
>  debian/changelog                                   |    8 ++++++++
>  debian/compat                                      |    2 +-
>  debian/control                                     |    4 ++--
>  debian/patches/00list                              |    1 -
>  ...nglomeration.dpatch => 01-conglomeration.patch} |    7 ++-----
>  debian/patches/series                              |    1 +
>  debian/rules                                       |   15 +++++----------
>  debian/source/format                               |    1 +
>  8 files changed, 20 insertions(+), 19 deletions(-)
>  delete mode 100644 debian/patches/00list
>  rename debian/patches/{01-conglomeration.dpatch => 01-conglomeration.patch} 
> (99%)
>  create mode 100644 debian/patches/series
>  create mode 100644 debian/source/format
> 
> diff --git a/debian/changelog b/debian/changelog
> index f40123b..ef9d787 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,11 @@
> +nwrite (1.9.2-20.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 and debhelper to 9.
> +
> + -- Jari Aalto <jari.aa...@cante.net>  Wed, 29 Feb 2012 06:36:47 -0500
> +
>  nwrite (1.9.2-20) unstable; urgency=low
>  
>    * Fix manpage. Makes lintian happy
> 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 bd1bd1c..52efcb7 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,8 +2,8 @@ Source: nwrite
>  Section: utils
>  Priority: optional
>  Maintainer: Luis Uribe <a...@eviled.org>
> -Build-Depends: debhelper (>= 5), dpatch, autotools-dev, autoconf
> -Standards-Version: 3.7.2
> +Build-Depends: debhelper (>= 9), autotools-dev, autoconf
> +Standards-Version: 3.9.3
>  
>  Package: nwrite
>  Architecture: any
> diff --git a/debian/patches/00list b/debian/patches/00list
> deleted file mode 100644
> index 4997088..0000000
> --- a/debian/patches/00list
> +++ /dev/null
> @@ -1 +0,0 @@
> -01-conglomeration
> diff --git a/debian/patches/01-conglomeration.dpatch 
> b/debian/patches/01-conglomeration.patch
> similarity index 99%
> rename from debian/patches/01-conglomeration.dpatch
> rename to debian/patches/01-conglomeration.patch
> index c725a87..883b4f1 100644
> --- a/debian/patches/01-conglomeration.dpatch
> +++ b/debian/patches/01-conglomeration.patch
> @@ -1,9 +1,6 @@
> -#!/bin/sh /usr/share/dpatch/dpatch-run
> -## 01-conglomeration.dpatch
> -##
> -## DP: Needs to be broken out (FIXME)
> +From: Unknown
> +Subject: Needs to be broken out (FIXME)
>  
> -@DPATCH@
>  
>  diff -Naur nwrite-1.9.2.orig/Makefile.in nwrite-1.9.2/Makefile.in
>  --- nwrite-1.9.2.orig/Makefile.in    1998-07-09 20:50:06.000000000 +0000
> diff --git a/debian/patches/series b/debian/patches/series
> new file mode 100644
> index 0000000..a710074
> --- /dev/null
> +++ b/debian/patches/series
> @@ -0,0 +1 @@
> +01-conglomeration.patch
> diff --git a/debian/rules b/debian/rules
> index 8998d87..a358305 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -3,7 +3,6 @@
>  # 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)
> @@ -18,7 +17,7 @@ else
>       CFLAGS += -O2
>  endif
>  
> -config.status: patch-stamp configure
> +config.status: configure
>       dh_testdir
>  
>       # Configuring package
> @@ -29,25 +28,21 @@ build-stamp: config.status
>       dh_testdir
>  
>       # Building package
> +     cp -f /usr/share/misc/config.sub config.sub
> +     cp -f /usr/share/misc/config.guess config.guess
>       autoconf
>       $(MAKE)
>  
>       touch build-stamp
>  
> -clean: unpatch
> +clean:
>       dh_testdir
>       dh_testroot
>       rm -f build-stamp
>  
>       # Cleaning package
>       -$(MAKE) distclean
> -ifneq "$(wildcard /usr/share/misc/config.sub)" ""
> -     cp -f /usr/share/misc/config.sub config.sub
> -endif
> -ifneq "$(wildcard /usr/share/misc/config.guess)" ""
> -     cp -f /usr/share/misc/config.guess config.guess
> -endif
> -
> +     rm -f config.guess config.sub
>       dh_clean
>  
>  install: build
> 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
> 

Attachment: signature.asc
Description: Digital signature

Reply via email to