Package: xvkbd
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 8d23ca8efafb1a39ce88690777729c628953b6f3 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sat, 21 Apr 2012 13:05:12 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 13 +++++
debian/compat | 2 +-
debian/control | 7 +--
debian/copyright | 55 +++++++++++---------
debian/patches/00list | 3 --
...d_man_words.dpatch => 01-xvkbd-man-words.patch} | 11 ++--
...d_c_various.dpatch => 02-xvkbd-c-various.patch} | 11 ++--
.../patches/{03_README.dpatch => 03-README.patch} | 7 +--
debian/patches/series | 3 ++
debian/rules | 11 ++--
debian/source/format | 1 +
debian/watch | 5 +-
12 files changed, 71 insertions(+), 58 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_xvkbd_man_words.dpatch => 01-xvkbd-man-words.patch} (98%)
rename debian/patches/{02_xvkbd_c_various.dpatch => 02-xvkbd-c-various.patch} (98%)
rename debian/patches/{03_README.dpatch => 03-README.patch} (76%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 75ca857..41ce35e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xvkbd (3.0-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.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix no-homepage-field (Lintian).
+ * Update to Copyright Format 1.0.
+ * Update watch file to version 3.
+
+ -- Jari Aalto <[email protected]> Sat, 21 Apr 2012 13:05:08 +0300
+
xvkbd (3.0-1) unstable; urgency=low
* New upstream release.
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 fa2463b..b6740f5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: xvkbd
Section: x11
Priority: optional
Maintainer: Francois Gurin <[email protected]>
-Build-Depends: debhelper (>= 7.0.0), dpatch, xaw3dg-dev, libxaw7-dev, libx11-dev, libxmu-dev, libxt-dev, libxtst-dev, xutils-dev (>= 1:1.0.2-2)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 9), xaw3dg-dev, libxaw7-dev, libx11-dev, libxmu-dev, libxt-dev, libxtst-dev, xutils-dev (>= 1:1.0.2-2)
+Standards-Version: 3.9.3
+Homepage: http://freecode.com/projects/xvkbd
Package: xvkbd
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: wenglish | wordlist
Description: software virtual keyboard for X11
xvkbd is a virtual (graphical) keyboard program for X Window System
diff --git a/debian/copyright b/debian/copyright
index aa40d23..7a1e15d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,34 +1,41 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=121
-Upstream Author: Tom Sato <[email protected]>
-Packaged-By: Francois Gurin <[email protected]>
-Packaged-Date: Mon, 10 Dec 2001 13:11:03 -0500.
-Original-Source-Location: http://member.nifty.ne.jp/tsato/xvkbd/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+X-Format: http://dep.debian.net/deps/dep5
+Upstream-Name: xvkbd
+Upstream-Contact: Tom Sato <[email protected]>
+Source: http://member.nifty.ne.jp/tsato/xvkbd/
+X-Debian-Info:
+ Packaged by Francois Gurin <[email protected]>
+ Packaged Mon, 10 Dec 2001 13:11:03 -0500.
-Files: findwidget.c, resources.h
-Copyright: Copyright (C) 2000 by Tom Sato <[email protected]>
+Files: findwidget.c resources.h
+Copyright:
+ 2000 by Tom Sato <[email protected]>
License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or any later version.
Files: xvkbd.c
-Copyright: Copyright (C) 2000-2006 by Tom Sato <[email protected]>
+Copyright:
+ 2000-2006 by Tom Sato <[email protected]>
License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or any later version.
Files: debian/*
Copyright:
- Copyright (C) 2001-2006 Francois Gurin <[email protected]>
- Copyright (C) 2008 Peter Pentchev <[email protected]>
+ 2001-2006 Francois Gurin <[email protected]>
+ 2008 Peter Pentchev <[email protected]>
License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or any later version.
-On Debian systems, the complete text of the GNU General Public License
-can be found in file "/usr/share/common-licenses/GPL".
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 85e8475..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_xvkbd_man_words
-02_xvkbd_c_various
-03_README
diff --git a/debian/patches/01_xvkbd_man_words.dpatch b/debian/patches/01-xvkbd-man-words.patch
similarity index 98%
rename from debian/patches/01_xvkbd_man_words.dpatch
rename to debian/patches/01-xvkbd-man-words.patch
index 6a33aef..6786176 100644
--- a/debian/patches/01_xvkbd_man_words.dpatch
+++ b/debian/patches/01-xvkbd-man-words.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_xvkbd_man_words.dpatch by Peter Pentchev <[email protected]>
-##
-## DP: Escape minus signs in lots of places.
-## DP: Fix the path to the words file in the manual page.
-## DP: Fix a typo ("evey characters" => "every character")
+From: Peter Pentchev <[email protected]>
+Subject: Escape minus signs in lots of places.
+ Fix the path to the words file in the manual page.
+ Fix a typo ("evey characters" => "every character")
-@DPATCH@
diff -urNad xvkbd-3.0~/xvkbd.man xvkbd-3.0/xvkbd.man
--- xvkbd-3.0~/xvkbd.man 2008-05-05 16:12:13.000000000 +0300
+++ xvkbd-3.0/xvkbd.man 2008-06-03 15:47:34.000000000 +0300
diff --git a/debian/patches/02_xvkbd_c_various.dpatch b/debian/patches/02-xvkbd-c-various.patch
similarity index 98%
rename from debian/patches/02_xvkbd_c_various.dpatch
rename to debian/patches/02-xvkbd-c-various.patch
index 658608f..c726be1 100644
--- a/debian/patches/02_xvkbd_c_various.dpatch
+++ b/debian/patches/02-xvkbd-c-various.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_xvkbd_c_various.dpatch by Peter Pentchev <[email protected]>
-##
-## DP: Various changes to the man xvkbd source file:
-## DP: - fix the path to the words file
-## DP: - make some "just in case" security tightening - snprintf()
+From: Peter Pentchev <[email protected]>
+Subject: Various changes to the man xvkbd source file:
+ - Fix the path to the words file
+ - Make some "just in case" security tightening - snprintf()
-@DPATCH@
diff -urNad xvkbd-3.0~/xvkbd.c xvkbd-3.0/xvkbd.c
--- xvkbd-3.0~/xvkbd.c 2008-05-05 16:03:41.000000000 +0300
+++ xvkbd-3.0/xvkbd.c 2008-06-03 15:45:06.000000000 +0300
diff --git a/debian/patches/03_README.dpatch b/debian/patches/03-README.patch
similarity index 76%
rename from debian/patches/03_README.dpatch
rename to debian/patches/03-README.patch
index e97dafd..7750ed2 100644
--- a/debian/patches/03_README.dpatch
+++ b/debian/patches/03-README.patch
@@ -1,9 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_README.dpatch by Peter Pentchev <[email protected]>
-##
-## DP: Use the correct path to /usr/share/dict/words
+From: Peter Pentchev <[email protected]>
+Subject: Use the correct path to /usr/share/dict/words
-@DPATCH@
diff -urNad xvkbd-3.0~/README xvkbd-3.0/README
--- xvkbd-3.0~/README 2008-05-05 16:12:13.000000000 +0300
+++ xvkbd-3.0/README 2008-06-03 15:49:41.000000000 +0300
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..989fa76
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-xvkbd-man-words.patch
+02-xvkbd-c-various.patch
+03-README.patch
diff --git a/debian/rules b/debian/rules
index ecb411c..2ba484e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
#!/usr/bin/make -f
# Debhelper build rules for xvkbd
-include /usr/share/dpatch/dpatch.make
-
CFLAGS_WARN= -pipe -Wall -W -Wno-unused-parameter
CFLAGS_DBG= -g
@@ -23,10 +21,13 @@ endif
CDEBUGFLAGS= ${CFLAGS_WARN} ${CFLAGS_OPT} ${CFLAGS_DBG}
configure: configure-stamp
-configure-stamp: ${DPATCH_STAMPFN}
+configure-stamp:
dh_testdir
touch configure-stamp
+build-arch: build
+build-indep: build
+
build: configure-stamp build-stamp
build-stamp:
dh_testdir
@@ -40,12 +41,12 @@ clean:
rm -f build-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
dh_clean
- ${MAKE} -f debian/rules unpatch
+ ${MAKE} -f debian/rules
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/xvkbd PROJECTMANSUFFIX=""
$(MAKE) install.man DESTDIR=$(CURDIR)/debian/xvkbd PROJECTMANSUFFIX=""
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)
diff --git a/debian/watch b/debian/watch
index baaf5ae..6e61d55 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
-version=2
-# Site Directory Pattern Version Script
-http://homepage3.nifty.com/tsato/xvkbd/xvkbd-(.*)\.tar\.gz debian uupdate
+version=3
+http://homepage3.nifty.com/tsato/xvkbd/xvkbd-(.*)\.tar\.gz
--
1.7.9.5
