Bug#664352: [PATCH] inadyn: Helping to update to packaging format 3.0

2012-04-04 Thread Timur Birsh

Hi,

On Sat, 17 Mar 2012 11:32:27 -0400, jari.aa...@cante.net wrote:

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 for your work. I converted the package source to the new format.
You can find it here https://github.com/taem/inadyn/tree/debian/debian.
I have to fix several issues and then will send RFS.

Thanks.



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#664352: [PATCH] inadyn: Helping to update to packaging format 3.0

2012-03-17 Thread jari . aalto
Package: inadyn
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 11b0b665560dacf48ff292a00aaf54979e9aa435 Mon Sep 17 00:00:00 2001
From: Jari Aalto jari.aa...@cante.net
Date: Tue, 28 Feb 2012 13:44:16 -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   |   15 ++--
 debian/compat  |2 +-
 debian/control |4 +-
 debian/patches/00list  |2 -
 ...uid_tAndGid_t.dpatch = 01_uid_tAndGid_t.patch} |   26 +
 debian/patches/02_inadyn8ManPage.dpatch|   39 
 debian/patches/02_inadyn8ManPage.patch |   17 +
 debian/patches/series  |2 +
 debian/rules   |   17 ++---
 debian/source/format   |1 +
 10 files changed, 39 insertions(+), 86 deletions(-)
 delete mode 100644 debian/patches/00list
 rename debian/patches/{01_uid_tAndGid_t.dpatch = 01_uid_tAndGid_t.patch} (75%)
 delete mode 100644 debian/patches/02_inadyn8ManPage.dpatch
 create mode 100644 debian/patches/02_inadyn8ManPage.patch
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index a53d888..e1c8f43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+inadyn (1.96.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+- Upgrade to packaging format 3.0 quilt.
+  * debian/rules:
+- Remove dpatch.
+  * debian/control:
+- Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto jari.aa...@cante.net  Tue, 28 Feb 2012 13:40:17 -0500
+
 inadyn (1.96.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -158,7 +169,3 @@ inadyn (v1.60-5.june.2004-1) unstable; urgency=low
   * Initial packaging as a deb.
 
  -- Shaul Karl sh...@debian.org  Sun, 20 Jun 2004 16:00:03 +0300
-
-Local variables:
-mode: debian-changelog
-End:
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 4ad5837..85c88cc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: inadyn
 Section: net
 Priority: optional
 Maintainer: Timur Birsh t...@linukz.org
-Build-Depends: debhelper (= 7), dpatch
-Standards-Version: 3.8.1
+Build-Depends: debhelper (= 9)
+Standards-Version: 3.9.3
 Homepage: http://www.inatech.eu/inadyn/
 
 Package: inadyn
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ebde183..000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_uid_tAndGid_t.dpatch
-02_inadyn8ManPage.dpatch
diff --git a/debian/patches/01_uid_tAndGid_t.dpatch b/debian/patches/01_uid_tAndGid_t.patch
similarity index 75%
rename from debian/patches/01_uid_tAndGid_t.dpatch
rename to debian/patches/01_uid_tAndGid_t.patch
index 22508aa..24d8979 100644
--- a/debian/patches/01_uid_tAndGid_t.dpatch
+++ b/debian/patches/01_uid_tAndGid_t.patch
@@ -1,28 +1,6 @@
-#! /bin/sh -e
-## 02_uid_tAndGid_t.dpatch by  sh...@debian.org
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Unix uid_t and gid_t.
+From: sh...@debian.org
+Subject: Use Unix uid_t and gid_t.
 
-if [ $# -lt 1 ]; then
-echo `basename $0`: script expects -patch|-unpatch as argument 2
-exit 1
-fi
-
-[ -f debian/patches/00patch-opts ]  . debian/patches/00patch-opts
-patch_opts=${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}
-
-case $1 in
--patch)   patch -p1 ${patch_opts}  $0;;
--unpatch) patch -R -p1 ${patch_opts}  $0;;
-*)
-echo `basename $0`: script expects -patch|-unpatch as argument 2
-exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
 
 --- inadyn.orig/src/dyndns.h	2005-02-24 02:05:06.0 +0200
 +++ src/dyndns.h	2005-03-04 22:51:30.0 +0200
diff --git a/debian/patches/02_inadyn8ManPage.dpatch b/debian/patches/02_inadyn8ManPage.dpatch
deleted file mode 100644
index 8a5f5de..000
--- a/debian/patches/02_inadyn8ManPage.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-##