Package: sysbench
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 db225bb4e4d85dcbee683e960d9b76b8452bee55 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Wed, 29 Feb 2012 05:16: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 -
 ...eation.dpatch => disable-manual-creation.patch} |    8 ++------
 debian/patches/series                              |    1 +
 debian/rules                                       |    1 -
 debian/source/format                               |    1 +
 8 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 100644 debian/patches/00list
 rename debian/patches/{disable-manual-creation.dpatch => disable-manual-creation.patch} (63%)
 create mode 100644 debian/patches/series
 create mode 100644 debian/source/format

diff --git a/debian/changelog b/debian/changelog
index bc5ed26..eb29883 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sysbench (0.4.12-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 05:09:17 -0500
+
 sysbench (0.4.12-1) unstable; urgency=low
 
   * New upstream version 
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 99489f5..b3222d9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sysbench
 Section: misc
 Priority: extra
 Maintainer: Hendrik Frenzel <hfren...@scunc.net>
-Build-Depends: cdbs, debhelper (>= 7), dpatch, docbook-xsl, docbook-xml, xsltproc, autoconf, automake, libtool, libmysqlclient15-dev | libmysqlclient-dev
-Standards-Version: 3.8.4
+Build-Depends: cdbs, debhelper (>= 9), docbook-xsl, docbook-xml, xsltproc, autoconf, automake, libtool, libmysqlclient15-dev | libmysqlclient-dev
+Standards-Version: 3.9.3
 Homepage: http://sourceforge.net/projects/sysbench
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/sysbench/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/sysbench/trunk/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1560a0c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-disable-manual-creation
diff --git a/debian/patches/disable-manual-creation.dpatch b/debian/patches/disable-manual-creation.patch
similarity index 63%
rename from debian/patches/disable-manual-creation.dpatch
rename to debian/patches/disable-manual-creation.patch
index 9e9b383..1fb563f 100644
--- a/debian/patches/disable-manual-creation.dpatch
+++ b/debian/patches/disable-manual-creation.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disable-manual-creation.dpatch by Hendrik Frenzel <hfren...@scunc.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disables buggy creation of manula.html from manual.xml
+From: Hendrik Frenzel <hfren...@scunc.net>
+Subject: Disables buggy creation of manula.html from manual.xml
 
-@DPATCH@
 diff -urNad sysbench-0.4.10~/Makefile.in sysbench-0.4.10/Makefile.in
 --- sysbench-0.4.10~/Makefile.in	2008-12-18 12:06:03.000000000 +0100
 +++ sysbench-0.4.10/Makefile.in	2009-02-24 00:59:46.000000000 +0100
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b3793ba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable-manual-creation.patch
diff --git a/debian/rules b/debian/rules
index 7510e47..fa228e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 # Add here any variable or target overrides you need.
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=" -Wl,-as-needed"
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

Reply via email to