Package: ibsim
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
As we spoke before, here is the proposed NMU patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload with these changes.
Thanks,
Jari
>From 0f3fdf5e68a7a2351e2101f5b38d54e3552056e5 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 11:22:40 -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/README.source | 2 --
debian/changelog | 8 ++++++++
debian/compat | 2 +-
debian/control | 4 ++--
debian/patches/00list | 1 -
...-scandir.dpatch => 01_glibc-2.10-scandir.patch} | 8 ++------
debian/patches/series | 1 +
debian/rules | 16 +++-------------
debian/source/format | 1 +
9 files changed, 18 insertions(+), 25 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_glibc-2.10-scandir.dpatch => 01_glibc-2.10-scandir.patch} (63%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 48b599a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/dpatch/README.source.gz
-
diff --git a/debian/changelog b/debian/changelog
index aa0a1ea..1fd9877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ibsim (0.5-1.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 11:19:17 -0500
+
ibsim (0.5-1) unstable; urgency=low
* Initial release (Closes: #539799)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 6953d96..0a5709a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: net
Priority: extra
Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-de...@lists.alioth.debian.org>
Uploaders: Benoit Mortier <benoit.mort...@opensides.be>, Guy Coates <g...@sanger.ac.uk>, Mario Lang <ml...@debian.org>
-Build-Depends: debhelper (>= 7), libibumad-dev, libibmad-dev, libibcommon-dev, dpatch
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 9), libibumad-dev, libibmad-dev, libibcommon-dev
+Standards-Version: 3.9.3
Homepage: http://www.openfabrics.org
Package: ibsim-utils
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index ed3cf57..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01_glibc-2.10-scandir
diff --git a/debian/patches/01_glibc-2.10-scandir.dpatch b/debian/patches/01_glibc-2.10-scandir.patch
similarity index 63%
rename from debian/patches/01_glibc-2.10-scandir.dpatch
rename to debian/patches/01_glibc-2.10-scandir.patch
index 3c35d39..905a4a6 100644
--- a/debian/patches/01_glibc-2.10-scandir.dpatch
+++ b/debian/patches/01_glibc-2.10-scandir.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_glibc-2.10-scandir.dpatch by <benoit.mort...@opensides.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch for glibc 2.10 scandir function
+From: <benoit.mort...@opensides.be>
+Subject: patch for glibc 2.10 scandir function
-@DPATCH@
--- trunk/umad2sim/umad2sim.c 2009-07-29 14:58:36.000000000 +0200
+++ trunk/umad2sim/new-umad2sim.c 2009-12-24 12:30:15.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e1883da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_glibc-2.10-scandir.patch
diff --git a/debian/rules b/debian/rules
index 2a5b11b..1e3c000 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ configure-stamp:
touch configure-stamp
-build: patch build-stamp
+build: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -29,8 +29,7 @@ build-stamp: configure-stamp
touch $@
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -40,19 +39,10 @@ clean-patched:
dh_clean
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- dpatch cat-all >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
install: build
dh_testdir
dh_testroot
- dh_prep
+ dh_prep
dh_installdirs
-find $(CURDIR) -type d -name ".svn" -exec rm -rf {} \; >/dev/null 2>&1
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
