Package: micro-proxy
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 d10be17c725c4208a55ca53e3e64ed348a0a3fe8 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 04:43:51 -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 -
.../{01-manpage.dpatch => 01-manpage.patch} | 5 ++---
debian/patches/series | 1 +
debian/rules | 5 ++---
debian/source/format | 1 +
8 files changed, 17 insertions(+), 10 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-manpage.dpatch => 01-manpage.patch} (95%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index fb88d6e..f82379f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+micro-proxy (20021030+debian-5.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 04:41:44 -0500
+
micro-proxy (20021030+debian-5) unstable; urgency=low
* Migrate package from experimental to unstable.
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 e606ab7..7585d17 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: micro-proxy
Section: web
Priority: optional
Maintainer: Paul Cager <paul-deb...@home.paulcager.org>
-Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
Package: micro-proxy
Section: web
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 04f9c78..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-manpage
diff --git a/debian/patches/01-manpage.dpatch b/debian/patches/01-manpage.patch
similarity index 95%
rename from debian/patches/01-manpage.dpatch
rename to debian/patches/01-manpage.patch
index d4d8da3..c4a5bf5 100644
--- a/debian/patches/01-manpage.dpatch
+++ b/debian/patches/01-manpage.patch
@@ -1,7 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-manpage.dpatch by Daniel Baumann <dan...@debian.org>
+From: Daniel Baumann <dan...@debian.org>
+Subject: Fix hyphens in manpage
-@DPATCH@
diff -Naur micro_proxy.orig/micro_proxy.8 micro_proxy/micro_proxy.8
--- micro_proxy.orig/micro_proxy.8 2005-06-29 17:29:11.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9d05b2b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-manpage.patch
diff --git a/debian/rules b/debian/rules
index 49f763c..6371d56 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
CFLAGS = -Wall -g
@@ -14,7 +13,7 @@ else
endif
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
# Building package
@@ -22,7 +21,7 @@ build-stamp: patch-stamp
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
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
