Package: igerman98
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 9958a125162f5e93187a2d44f0f10aa064e0c5c6 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Thu, 12 Apr 2012 22:06:17 +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/README.source | 31 --------------------
debian/changelog | 9 ++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/patches/00list | 4 ---
.../{01_compeng.dpatch => 01-compeng.patch} | 10 ++-----
...HTML-entities.dpatch => 03-HTML-entities.patch} | 8 ++---
.../{12_fix_clean.dpatch => 12-fix-clean.patch} | 10 ++-----
.../patches/{18_aspell.dpatch => 18-aspell.patch} | 8 ++---
debian/patches/series | 4 +++
debian/rules | 24 ++++-----------
debian/source/format | 2 +-
12 files changed, 33 insertions(+), 83 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
rename debian/patches/{01_compeng.dpatch => 01-compeng.patch} (94%)
rename debian/patches/{03_HTML-entities.dpatch => 03-HTML-entities.patch} (80%)
rename debian/patches/{12_fix_clean.dpatch => 12-fix-clean.patch} (58%)
rename debian/patches/{18_aspell.dpatch => 18-aspell.patch} (90%)
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 264b9b9..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,31 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To get the fully patched source after unpacking the source package, cd
-to the root level of the source package and run:
-
- debian/rules patch
-
-Removing a patch is as simple as removing its entry from the
-debian/patches/00list file, and please also remove the patch file
-itself.
-
-Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
-where you should replace XX with a new number and patchname with a
-descriptive shortname of the patch. You can then simply edit all the
-files your patch wants to edit, and then simply "exit 0" from the shell
-to actually create the patch file.
-
-To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
-and replace XX_patchname with the actual filename from debian/patches
-you want to use.
-
-To clean up afterwards again, "debian/rules unpatch" will do the
-work for you - or you can of course choose to call
-"fakeroot debian/rules clean" all together.
-
----
-
-original text by Gerfried Fuchs, edited by Junichi Uekawa <dan...@debian.org>
-10 Aug 2008.
diff --git a/debian/changelog b/debian/changelog
index a3681d9..d7b126f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+igerman98 (20110609-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 to rules file.
+
+ -- Jari Aalto <jari.aa...@cante.net> Thu, 12 Apr 2012 22:06:07 +0300
+
igerman98 (20110609-1) unstable; urgency=low
* New upstream version 20110609.
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 aa23cb3..ed3d1bf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: text
Priority: optional
Maintainer: Roland Rosenfeld <rol...@debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Build-Depends-Indep: ispell (>= 3.1.20-12.1), hunspell, aspell (>= 0.60.5-2),
dictionaries-common-dev (>= 1.10.5)
-Build-Depends: debhelper (>= 5.0.0), dpatch
+Build-Depends: debhelper (>= 9)
Homepage: http://j3e.de/ispell/igerman98/
Package: ingerman
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 05908e6..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_compeng.dpatch
-03_HTML-entities.dpatch
-12_fix_clean.dpatch
-18_aspell.dpatch
diff --git a/debian/patches/01_compeng.dpatch b/debian/patches/01-compeng.patch
similarity index 94%
rename from debian/patches/01_compeng.dpatch
rename to debian/patches/01-compeng.patch
index 055ab3d..2ef2761 100644
--- a/debian/patches/01_compeng.dpatch
+++ b/debian/patches/01-compeng.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_compeng.dpatch by Roland Rosenfeld <rol...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove several English words from compeng.txt where good German
-## DP: translations exist (see bug #324225).
+From: Roland Rosenfeld <rol...@debian.org>
+Subject: Remove several English words from compeng.txt where good German
+ translations exist (see bug #324225).
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' igerman98~/dicts/compeng-xx-de_all.txt igerman98/dicts/compeng-xx-de_all.txt
--- igerman98~/dicts/compeng-xx-de_all.txt
+++ igerman98/dicts/compeng-xx-de_all.txt
diff --git a/debian/patches/03_HTML-entities.dpatch b/debian/patches/03-HTML-entities.patch
similarity index 80%
rename from debian/patches/03_HTML-entities.dpatch
rename to debian/patches/03-HTML-entities.patch
index 115005f..2716f07 100644
--- a/debian/patches/03_HTML-entities.dpatch
+++ b/debian/patches/03-HTML-entities.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_HTML-entities.dpatch by Roland Rosenfeld <rol...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds HTML entities to the german.aff file.
+From: Roland Rosenfeld <rol...@debian.org>
+Subject: Adds HTML entities to the german.aff file.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' igerman98~/ispell/de_DE.aff.in igerman98/ispell/de_DE.aff.in
--- igerman98~/ispell/de_DE.aff.in
+++ igerman98/ispell/de_DE.aff.in
diff --git a/debian/patches/12_fix_clean.dpatch b/debian/patches/12-fix-clean.patch
similarity index 58%
rename from debian/patches/12_fix_clean.dpatch
rename to debian/patches/12-fix-clean.patch
index 45bda41..1bedef7 100644
--- a/debian/patches/12_fix_clean.dpatch
+++ b/debian/patches/12-fix-clean.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fix_clean.dpatch by Roland Rosenfeld <rol...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Stop removing MD5sums in clean target, because it the upstream
-## DP: source provides it and the file is missing after the cleanup otherwise.
+From: Roland Rosenfeld <rol...@debian.org>
+Subject: Stop removing MD5sums in clean target, because it the upstream
+ source provides it and the file is missing after the cleanup otherwise.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' igerman98~/Makefile igerman98/Makefile
--- igerman98~/Makefile
+++ igerman98/Makefile
diff --git a/debian/patches/18_aspell.dpatch b/debian/patches/18-aspell.patch
similarity index 90%
rename from debian/patches/18_aspell.dpatch
rename to debian/patches/18-aspell.patch
index cc584d1..c524543 100644
--- a/debian/patches/18_aspell.dpatch
+++ b/debian/patches/18-aspell.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 18_aspell.dpatch by Roland Rosenfeld <rol...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build aspell cwl files for de_DE, de_AT, de_CH and de-common.
+From: Roland Rosenfeld <rol...@debian.org>
+Subject: Build aspell cwl files for de_DE, de_AT, de_CH and de-common.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' igerman98~/Makefile igerman98/Makefile
--- igerman98~/Makefile
+++ igerman98/Makefile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..852842c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-compeng.patch
+03-HTML-entities.patch
+12-fix-clean.patch
+18-aspell.patch
diff --git a/debian/rules b/debian/rules
index 3e7f237..d69f315 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ build-arch:
build-indep: build-stamp
-build-stamp: patch
+build-stamp:
dh_testdir
$(MAKE) ispell/de_DE.aff all.words.de_DE.tmp
@@ -44,7 +44,7 @@ build-stamp: patch
touch build-stamp
-clean: clean1 unpatch
+clean: clean1
clean1:
dh_testdir
dh_testroot
@@ -64,7 +64,7 @@ clean1:
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# copyright files:
@@ -156,7 +156,7 @@ install: build
ln -s ../../hunspell/de_LU.aff de-LU.aff; \
ln -s ../../hunspell/de_LU.dic de-LU.dic)
-# myspell-de-at (binary-indep)
+# myspell-de-at (binary-indep)
install -o root -g root -m644 myspell/de_AT.aff \
$(DROOT)/myspell-de-at/usr/share/hunspell
install -o root -g root -m644 myspell/de_AT.dic \
@@ -209,7 +209,7 @@ install: build
ln -s ../../hunspell/de_LU.aff de-LU.aff; \
ln -s ../../hunspell/de_LU.dic de-LU.dic)
-# hunspell-de-at (binary-indep)
+# hunspell-de-at (binary-indep)
install -o root -g root -m644 hunspell/de_AT.aff \
$(DROOT)/hunspell-de-at/usr/share/hunspell
install -o root -g root -m644 hunspell/de_AT.dic \
@@ -301,18 +301,6 @@ binary-indep: build install
binary-arch:
# does nothing, because the package is Architecture: all
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-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: build build-indep build-arch clean binary-indep binary-arch binary \
- install patch unpatch clean clean1
+ install clean clean1
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
