Package: xkbset
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 ffb1331e278b923ac8867b92757ad1eb0a2af48b Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 21 Apr 2012 12:51:28 +0300
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 | 11 ++++++
debian/compat | 2 +-
debian/control | 6 +--
debian/patches/00list | 2 -
debian/patches/01-fix-makefile.patch | 17 +++++++++
debian/patches/01_fix_makefile.dpatch | 39 --------------------
...arify_errors.dpatch => 02-clarify-errors.patch} | 26 +------------
debian/patches/series | 2 +
debian/rules | 14 ++++---
debian/source/format | 1 +
10 files changed, 45 insertions(+), 75 deletions(-)
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/01-fix-makefile.patch
delete mode 100644 debian/patches/01_fix_makefile.dpatch
rename debian/patches/{02_clarify_errors.dpatch => 02-clarify-errors.patch} (54%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index e66826e..8fb8be8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xkbset (0.5-5.2) 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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix debian-rules-ignores-make-clean-error (Lintian).
+ * Fix debian-watch-file-is-missing (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 21 Apr 2012 12:50:06 +0300
+
xkbset (0.5-5.1) unstable; urgency=high
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index 581c7fb..619e1d8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: xkbset
Section: x11
Priority: extra
Maintainer: Francois Gurin <mat...@debian.org>
-Build-Depends: libx11-dev, debhelper (>> 4.0.0), dpatch
-Standards-Version: 3.6.1.0
+Build-Depends: libx11-dev, debhelper (>= 9)
+Standards-Version: 3.9.3
Package: xkbset
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: perl-tk
Description: Small utility to change the AccessX settings of XKEYBOARD
AccessX is a set of features within the XKEYBOARD extension of the
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 30932c4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_fix_makefile
-02_clarify_errors
diff --git a/debian/patches/01-fix-makefile.patch b/debian/patches/01-fix-makefile.patch
new file mode 100644
index 0000000..4dd2452
--- /dev/null
+++ b/debian/patches/01-fix-makefile.patch
@@ -0,0 +1,17 @@
+From: Rene Engelhard <r...@debian.org>
+Subject: Fix install locations in Makefile
+
+diff -urNad /home/rene/xkbset-0.5/Makefile xkbset-0.5/Makefile
+--- /home/rene/xkbset-0.5/Makefile 2003-10-17 04:18:33.000000000 +0200
++++ xkbset-0.5/Makefile 2003-10-17 04:20:25.000000000 +0200
+@@ -1,8 +1,8 @@
+ X11PREFIX=/usr/X11R6
+ X11BASE=/usr/X11R6
+
+-INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin
+-INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1
++INSTALL_BIN=${DESTDIR}/usr/bin
++INSTALL_MAN1=${DESTDIR}/usr/share/man/man1
+
+ INC_PATH=-I${X11BASE}/include
+ LIB_PATH=-L${X11BASE}/lib
diff --git a/debian/patches/01_fix_makefile.dpatch b/debian/patches/01_fix_makefile.dpatch
deleted file mode 100644
index 813607d..0000000
--- a/debian/patches/01_fix_makefile.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -e
-## 01_fix_makefile.dpatch by Rene Engelhard <r...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/rene/xkbset-0.5/Makefile xkbset-0.5/Makefile
---- /home/rene/xkbset-0.5/Makefile 2003-10-17 04:18:33.000000000 +0200
-+++ xkbset-0.5/Makefile 2003-10-17 04:20:25.000000000 +0200
-@@ -1,8 +1,8 @@
- X11PREFIX=/usr/X11R6
- X11BASE=/usr/X11R6
-
--INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin
--INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1
-+INSTALL_BIN=${DESTDIR}/usr/bin
-+INSTALL_MAN1=${DESTDIR}/usr/share/man/man1
-
- INC_PATH=-I${X11BASE}/include
- LIB_PATH=-L${X11BASE}/lib
diff --git a/debian/patches/02_clarify_errors.dpatch b/debian/patches/02-clarify-errors.patch
similarity index 54%
rename from debian/patches/02_clarify_errors.dpatch
rename to debian/patches/02-clarify-errors.patch
index 9793283..1e2d4a5 100644
--- a/debian/patches/02_clarify_errors.dpatch
+++ b/debian/patches/02-clarify-errors.patch
@@ -1,28 +1,6 @@
-#!/bin/sh -e
-## 02_clarify_errors.dpatch by Rene Engelhard <r...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Rene Engelhard <r...@debian.org>
+Subject: Check version of server
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
diff -urNad /home/rene/xkbset-0.3/main.c xkbset-0.3/main.c
--- /home/rene/xkbset-0.3/main.c 2000-08-17 06:36:15.000000000 +0200
+++ xkbset-0.3/main.c 2003-10-17 04:14:31.000000000 +0200
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1642ea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-fix-makefile.patch
+02-clarify-errors.patch
diff --git a/debian/rules b/debian/rules
index f1795bf..2f03e56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
@@ -12,23 +10,27 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch-stamp
+build-stamp:
dh_testdir
$(MAKE)
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
- -$(MAKE) clean
+ [ ! Makefile ] || $(MAKE) clean
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/xkbset
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.5
