Package: myspell-sk
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 648f5fd594cec1291e6f684833ca1afe18b5a449 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Tue, 24 Apr 2012 22:38:26 +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 | 8 ++++----
debian/copyright | 2 +-
debian/patches/00list | 2 --
...o8859-2_utf-8.dpatch => 01-iso8859-2-utf-8.patch} | 8 ++------
.../{02_skSK_aff.dpatch => 02-skSK-aff.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 18 ++++--------------
debian/source/format | 1 +
10 files changed, 28 insertions(+), 34 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_iso8859-2_utf-8.dpatch => 01-iso8859-2-utf-8.patch} (88%)
rename debian/patches/{02_skSK_aff.dpatch => 02-skSK-aff.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 9252ee0..90e9f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+myspell-sk (0.5.5a-2.3) 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 description-synopsis-starts-with-article (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Tue, 24 Apr 2012 22:36:42 +0300
+
myspell-sk (0.5.5a-2.2) 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 d5bd008..f73b1c9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: text
Priority: optional
Maintainer: Miroslav Kure <ku...@debian.cz>
Uploaders: Ondřej Surý <ond...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>= 9)
Build-Depends-Indep: dictionaries-common-dev (>= 1.10.5)
-Standards-Version: 3.7.2
+Standards-Version: 3.9.3
Package: myspell-sk
Architecture: all
@@ -13,6 +13,6 @@ Depends: ${misc:Depends}, dictionaries-common (>= 0.10) | openoffice.org-updated
Conflicts: openoffice.org (<= 1.0.3-2)
Provides: myspell-dictionary, myspell-dictionary-sk
Suggests: openoffice.org (>= 1.0.3-3)
-Description: The Slovak dictionary for myspell
+Description: Slovak dictionary for myspell
This is the Slovak dictionary for use with the myspell spellchecker which is
- currently used within OpenOffice.org and the Mozilla spellchecker.
+ currently used in OpenOffice.org and the Mozilla spellchecker.
diff --git a/debian/copyright b/debian/copyright
index e2e4d70..53147b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,7 +34,7 @@ myspell are free software; you can redistribute it and/or modify
it under the terms of the GPL, GPL(v2), LGPL (v2.1) and/or MPL (1.1).
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL',
+Public License can be found in `/usr/share/common-licenses/GPL-2',
the text of the GNU Library General Public License can be
found in `/usr/share/common-licenses/LGPL-2.1'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7f9d4b4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_iso8859-2_utf-8
-02_skSK_aff
diff --git a/debian/patches/01_iso8859-2_utf-8.dpatch b/debian/patches/01-iso8859-2-utf-8.patch
similarity index 88%
rename from debian/patches/01_iso8859-2_utf-8.dpatch
rename to debian/patches/01-iso8859-2-utf-8.patch
index db6fb97..0297b6e 100644
--- a/debian/patches/01_iso8859-2_utf-8.dpatch
+++ b/debian/patches/01-iso8859-2-utf-8.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_iso8859-2_utf-8.dpatch by Ondřej Surý <ond...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix ISO8859-2 characters in README
+From: Ondřej Surý <ond...@debian.org>
+Subject: Fix ISO8859-2 characters in README
-@DPATCH@
--- myspell-sk-0.5.5a.orig/README_sk_SK.txt
+++ myspell-sk-0.5.5a/README_sk_SK.txt
diff --git a/debian/patches/02_skSK_aff.dpatch b/debian/patches/02-skSK-aff.patch
similarity index 68%
rename from debian/patches/02_skSK_aff.dpatch
rename to debian/patches/02-skSK-aff.patch
index 496809a..314c75b 100644
--- a/debian/patches/02_skSK_aff.dpatch
+++ b/debian/patches/02-skSK-aff.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_skSK_aff.dpatch by Ondřej Surý <ond...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix TRY line
+From: Ondřej Surý <ond...@debian.org>
+Subject: Fix TRY line
-@DPATCH@
--- myspell-sk-0.5.5a.orig/sk_SK.aff
+++ myspell-sk-0.5.5a/sk_SK.aff
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6dc8e4f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-iso8859-2-utf-8.patch
+02-skSK-aff.patch
diff --git a/debian/rules b/debian/rules
index 4440687..17c55c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,14 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
dh_testroot
@@ -21,7 +20,7 @@ clean1:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
installdeb-myspell --srcdir=.
@@ -47,15 +46,6 @@ binary-indep: build install
# Build architecture-dependent files here.
binary-arch: build install
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- #dpatch call-all -a=pkg-info >patch-stamp
-
-unpatch:
- dpatch deapply-all
- rm -rf patch-stamp debian/patched
-
binary: binary-indep binary-arch
-.PHONY: binary clean binary-indep binary-arch build install patch unpatch \
+.PHONY: binary clean binary-indep binary-arch build install \
clean1
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
