Package: spell
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 bd882b2a77ab8f86ef7d6c58b74befd46a0cfdb3 Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Sun, 29 Apr 2012 21:35:20 +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 | 10 ++++++++++
debian/compat | 2 +-
debian/control | 6 +++---
debian/patches/00list | 1 -
...conglomeration.dpatch => 20-conglomeration.patch} | 7 ++-----
debian/patches/series | 1 +
debian/rules | 9 ++++++---
debian/source/format | 1 +
spell.c | 18 ++----------------
9 files changed, 26 insertions(+), 29 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01-conglomeration.dpatch => 20-conglomeration.patch} (99%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 406af1e..b6cc1c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+spell (1.0-24.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 required build-arch and build-indep targets to rules file.
+ * Fix missing-dependency-on-install-info (Lintian).
+
+ -- Jari Aalto <[email protected]> Sun, 29 Apr 2012 21:04:58 +0300
+
spell (1.0-24) unstable; urgency=low
* Support also aspell (Closes: #381511)
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 55d5542..0530d5a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: spell
Section: text
Priority: optional
Maintainer: Giacomo Catenazzi <[email protected]>
-Build-Depends: debhelper (>= 7), dpatch, texinfo
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 9), texinfo
+Standards-Version: 3.9.3
Homepage: http://directory.fsf.org/project/spell/
Package: spell
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ispell | aspell,
- iamerican | ibritish | ispell-dictionary
+ iamerican | ibritish | ispell-dictionary, install-info
Description: GNU Spell, a clone of Unix `spell'
GNU Spell is a spell checking program which prints each misspelled word on a
line of its own. It is designed as a clone of the standard Unix `spell'
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4926043..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-conglomeration.dpatch
diff --git a/debian/patches/01-conglomeration.dpatch b/debian/patches/20-conglomeration.patch
similarity index 99%
rename from debian/patches/01-conglomeration.dpatch
rename to debian/patches/20-conglomeration.patch
index 3461269..aa482b0 100644
--- a/debian/patches/01-conglomeration.dpatch
+++ b/debian/patches/20-conglomeration.patch
@@ -1,9 +1,6 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-conglomeration.dpatch
-##
-## DP: Needs to be broken out (FIXME).
+From: Unknown
+Subject: Needs to be broken out (FIXME).
-@DPATCH@
diff -Naur spell-1.0.orig/spell.c spell-1.0/spell.c
--- spell-1.0.orig/spell.c 1996-04-10 04:41:09.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e15f093
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+20-conglomeration.patch
diff --git a/debian/rules b/debian/rules
index 674f50e..1e51c08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
#!/usr/bin/make -f
-include /usr/share/dpatch/dpatch.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -11,7 +10,7 @@ else
CROSS=
endif
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -20,11 +19,15 @@ clean: unpatch
dh_clean
-config.status: configure patch-stamp
+config.status: configure
dh_testdir
CFLAGS="$(CFLAGS)" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+build-arch: build
+build-indep: build
+
build: build-stamp
build-stamp: config.status
dh_testdir
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/spell.c b/spell.c
index 5fc83a6..2e95553 100644
--- a/spell.c
+++ b/spell.c
@@ -279,23 +279,9 @@ main (int argc, char **argv)
by `str_make'), or find it in the `PATH' environmental variable,
or exit with an error if it is not found. */
-static char *
-find_file_in_path (char * program) ;
-
char *
find_ispell ()
{
- char * ret;
- if (NULL != (ret = find_file_in_path("ispell")))
- return ret;
- if (NULL != (ret = find_file_in_path("aspell")))
- return ret;
- error (EXIT_FAILURE, 0, "unable to locate Ispell/Aspell");
-}
-
-static char *
-find_file_in_path (char * program)
-{
char *ispell = NULL;
char *path = NULL;
int path_len = 0;
@@ -320,13 +306,13 @@ find_file_in_path (char * program)
if (file->str[file->len - 1] != '/')
str_add_char (file, '/');
- str_add_str (file, nstr_to_str (program));
+ str_add_str (file, nstr_to_str ("ispell"));
if (stat (str_to_nstr (file), &stat_buf) != -1)
return xstrdup (str_to_nstr (file));
if (pos >= path_len)
- return NULL;
+ error (EXIT_FAILURE, 0, "unable to locate Ispell");
pos++;
}
--
1.7.10
