Package: kodos
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 6bea4747f0fb60ba3b20d73ea2bbf52f16e38b1f Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 22 Apr 2012 23:03:55 +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 | 14 +++++++++++++
debian/compat | 2 +-
debian/control | 14 ++++++-------
debian/copyright | 10 ++++-----
.../patches/{001_kodos.dpatch => 001-kodos.patch} | 8 ++-----
debian/patches/00list | 1 -
debian/patches/series | 1 +
debian/rules | 22 +++++++-------------
debian/source/format | 1 +
9 files changed, 38 insertions(+), 35 deletions(-)
rename debian/patches/{001_kodos.dpatch => 001-kodos.patch} (96%)
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 86a3e50..10e2177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+kodos (2.4.9-6.4) 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 copyright-without-copyright-notice (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix description-contains-homepage (Lintian).
+ * Fix capitalization-error-in-description Python (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 22 Apr 2012 22:53:32 +0300
+
kodos (2.4.9-6.3) 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 af48783..b928258 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ Source: kodos
Section: python
Priority: optional
Maintainer: Kevin Coyner <kcoy...@debian.org>
-Build-Depends: debhelper (>= 5.0.38), dpatch, python-all-dev (>= 2.5.4), python-central (>= 0.5.6)
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.5.4), python-central (>= 0.5.6)
XS-Python-Version: current
-Standards-Version: 3.7.2.2
+Standards-Version: 3.9.3
+Homepage: http://kodos.sourceforge.net
Package: kodos
Architecture: all
-Depends: ${python:Depends}, python-qt3, python-dev
+Depends: ${misc:Depends}, ${python:Depends}, python-qt3, python-dev
XB-Python-Version: ${python:Versions}
-Description: A visual regular expression editor
+Description: visual regular expression editor
Kodos is an application to aid in the creation and debugging of
- regular expressions in python. The GUI for Kodos should eliminate the
- need for using the python interpreter for regex design in most
+ regular expressions in Python. The GUI for Kodos should eliminate the
+ need for using the Python interpreter for regex design in most
instances.
- Homepage: http://kodos.sourceforge.net/
diff --git a/debian/copyright b/debian/copyright
index a588746..5b5f63a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,9 @@ Fri, 16 Jan 2004 07:29:40 +0100.
It was downloaded from http://kodos.sf.net/
-Upstream Author: Phil Schwartz
+Upstream Author:
+
+ Copyright (C) 2002-2006 Phil Schwartz <phil_schwa...@sourceforge.net>
Copyright: Phil Schwartz
@@ -17,9 +19,5 @@ Copyright: Phil Schwartz
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, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL'.
+can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/001_kodos.dpatch b/debian/patches/001-kodos.patch
similarity index 96%
rename from debian/patches/001_kodos.dpatch
rename to debian/patches/001-kodos.patch
index dec5725..0656f59 100644
--- a/debian/patches/001_kodos.dpatch
+++ b/debian/patches/001-kodos.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 001_kodos_patch.dpatch by Kevin Coyner <kcoy...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: 001 kodos patch
+From: Kevin Coyner <kcoy...@debian.org>
+Subject: Support xpm
-@DPATCH@
diff -Naur kodos-2.4.9.orig/images/kodos_icon.xpm kodos-2.4.9/images/kodos_icon.xpm
--- kodos-2.4.9.orig/images/kodos_icon.xpm 1970-01-01 00:00:00.000000000 +0000
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 8c0a50a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-001_kodos
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f78a652
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001-kodos.patch
diff --git a/debian/rules b/debian/rules
index 0a63dc1..b38946c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,14 +23,17 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-build: patch build-stamp
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
python setup.py build
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -38,19 +41,10 @@ clean-patched:
-find . -name '*.py[co]' | xargs rm -f
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_clean -k
+ dh_prep
dh_installdirs
python setup.py install --prefix=$(CURDIR)/debian/kodos/usr $(py_setup_install_args)
-find debian/kodos -name '*.py[co]' | xargs rm -f
@@ -90,4 +84,4 @@ binary-arch: build install
# We have nothing to do by default.
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched configure
+.PHONY: build clean binary-indep binary-arch binary install clean-patched configure
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.10
