Package: libinklevel
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 it is ok to upload the upgraded version in a NMU in
case you are working on other issues needing attention.
Thanks,
Jari
>From 32c93ff59497f027b3c8d78f9984dce8f9983154 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 4 Mar 2012 05:55:47 -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 | 10 +++++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd | 21 --------------------
debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd.patch | 21 ++++++++++++++++++++
debian/patches/00list | 1 -
debian/patches/series | 1 +
debian/rules | 17 ++++++---------
debian/source/format | 1 +
9 files changed, 43 insertions(+), 35 deletions(-)
delete mode 100644 debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd
create mode 100644 debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd.patch
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index f74914c..4003f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libinklevel (0.8.0-1.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ Note: patch 000 was updated with "quilt refresh" to make
+ it apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 04 Mar 2012 05:53:41 -0500
+
libinklevel (0.8.0-1.1) unstable; urgency=low
* Non-maintainer upload.
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 02532c7..9d49cf1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
Source: libinklevel
Priority: optional
Maintainer: Adam Cécile (Le_Vert) <gand...@le-vert.net>
-Build-Depends: debhelper (>= 5), dpatch, libieee1284-3-dev, xutils-dev, autotools-dev, pkg-config
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9), libieee1284-3-dev, xutils-dev, autotools-dev, pkg-config
+Standards-Version: 3.9.3
Section: libs
Homepage: http://libinklevel.sourceforge.net/
diff --git a/debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd b/debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd
deleted file mode 100644
index ca8032c..0000000
--- a/debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001-Fix_FTBFS_on_gnu-kfreebsd.dpatch
-## by Cyril Brulebois <cyril.bruleb...@enst-bretagne.fr>
-##
-## DP: Make libinklevel build on GNU/kFreeBSD.
-
-@DPATCH@
-
---- libinklevel-0.7.1~/linux.c 2006-09-10 17:41:52.000000000 +0200
-+++ libinklevel-0.7.1/linux.c 2007-03-27 02:24:42.000000000 +0200
-@@ -18,6 +18,10 @@
- #include <string.h>
- #include <sys/ioctl.h>
-
-+#if defined(__FreeBSD_kernel__)
-+#define _IOC_READ IOC_OUT
-+#endif
-+
- #define IOCNR_GET_DEVICE_ID 1
- #define LPIOC_GET_DEVICE_ID _IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, BUFLEN)
-
diff --git a/debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd.patch b/debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd.patch
new file mode 100644
index 0000000..0870786
--- /dev/null
+++ b/debian/patches/000-Fix_FTBFS_on_gnu-kfreebsd.patch
@@ -0,0 +1,21 @@
+From: Cyril Brulebois <cyril.bruleb...@enst-bretagne.fr>
+Subject: Make libinklevel build on GNU/kFreeBSD.
+
+
+---
+ linux.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/linux.c
++++ b/linux.c
+@@ -25,6 +25,10 @@
+ #include "platform_specific.h"
+ #include "bjnp.h"
+
++#if defined(__FreeBSD_kernel__)
++#define _IOC_READ IOC_OUT
++#endif
++
+ #define IOCNR_GET_DEVICE_ID 1
+ #define LPIOC_GET_DEVICE_ID _IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, BUFLEN)
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 12ab277..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-000-Fix_FTBFS_on_gnu-kfreebsd
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f3e0453
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+000-Fix_FTBFS_on_gnu-kfreebsd.patch
diff --git a/debian/rules b/debian/rules
index 8ad318f..38f2117 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,5 @@
#!/usr/bin/make -f
-# Include dpatch targets
-include /usr/share/dpatch/dpatch.make
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -15,7 +12,7 @@ CFLAGS += -fPIC -DPIC -I.
README.Debian:
$(shell python debian/make-supported-list.py > $(CURDIR)/debian/libinklevel5.README.Debian)
-config.status: configure patch
+config.status: configure
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@ -23,11 +20,11 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=/usr/share/man \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="-Wl,-z,defs"
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ CFLAGS="$(CFLAGS)" \
+ LDFLAGS="-Wl,-z,defs"
build: build-stamp
build-stamp: config.status
@@ -35,7 +32,7 @@ build-stamp: config.status
$(MAKE)
touch $@
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp config.sub config.guess
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
