Thanks for the prompt reply, Martin.
On November 26, [EMAIL PROTECTED] said:
> The patches are good.
i did a bit more looking into the minicom build process, and of course
you're right: they're good. However, the build process emits a lot of
bad-looking error messages in the initial "clean" phase of the build.
Furthermore, it looks like if any of the patches actually do fail to
apply during the "configure-stamp" phase, it won't abort the build
process like it probably should.
dpatch is designed to do this kind of processing very cleanly, and to
trigger fatal errors for mis-applied patches as a reasonable safety
check.
i'm attaching a diff which converts the current minicom build process
to use dpatch.
The bulk of the patch just adds dpatch headers to the existing diffs.
The real meat of the patch comes from modifying debian/rules to patch
and unpatch the build tree in the right spots. It also modifies
debian/control to build-depend on dpatch instead of patch.
I hope you find this useful. i really appreciate your maintaining
this package.
--dkg
diff -ur minicom-2.1.orig/debian/control minicom-2.1/debian/control
--- minicom-2.1.orig/debian/control 2005-11-27 16:57:06.000000000 -0500
+++ minicom-2.1/debian/control 2005-11-27 16:55:03.000000000 -0500
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Martin A. Godisch <[EMAIL PROTECTED]>
Uploaders: Jordi Mallach <[EMAIL PROTECTED]>
-Build-Depends: autotools-dev, gettext, libncurses5-dev, patch
+Build-Depends: autotools-dev, gettext, libncurses5-dev, dpatch
Standards-Version: 3.6.2
Package: minicom
Only in minicom-2.1/debian/patches: 00list
diff -ur minicom-2.1.orig/debian/patches/01manual.diff
minicom-2.1/debian/patches/01manual.diff
--- minicom-2.1.orig/debian/patches/01manual.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/01manual.diff 2005-11-27 17:06:24.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01manual.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix man page for debian-specific documentation
+
[EMAIL PROTECTED]@
--- minicom-2.00.0.orig/man/minicom.1
+++ minicom-2.00.0/man/minicom.1
@@ -25,7 +25,7 @@
diff -ur minicom-2.1.orig/debian/patches/03norzsz.diff
minicom-2.1/debian/patches/03norzsz.diff
--- minicom-2.1.orig/debian/patches/03norzsz.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/03norzsz.diff 2005-11-27 17:10:23.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03norzsz.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: cleanly report missing sz (see bug #111060)
+
[EMAIL PROTECTED]@
--- minicom-2.00.0.orig/src/updown.c
+++ minicom-2.00.0/src/updown.c
@@ -352,6 +352,22 @@
diff -ur minicom-2.1.orig/debian/patches/04prport.diff
minicom-2.1/debian/patches/04prport.diff
--- minicom-2.1.orig/debian/patches/04prport.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/04prport.diff 2005-11-27 17:11:16.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04prport.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: port number should be public (see bug #18009)
+
[EMAIL PROTECTED]@
--- minicom-2.00.0.orig/src/rwconf.c
+++ minicom-2.00.0/src/rwconf.c
@@ -105,7 +105,7 @@
diff -ur minicom-2.1.orig/debian/patches/07configure.diff
minicom-2.1/debian/patches/07configure.diff
--- minicom-2.1.orig/debian/patches/07configure.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/07configure.diff 2005-11-27 17:12:03.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07configure.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patching configure
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/configure
+++ minicom-2.1/configure
@@ -8921,6 +8921,8 @@
diff -ur minicom-2.1.orig/debian/patches/08locales.diff
minicom-2.1/debian/patches/08locales.diff
--- minicom-2.1.orig/debian/patches/08locales.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/08locales.diff 2005-11-27 17:12:42.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08locales.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: allow spanish locale
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/src/minicom.c
+++ minicom-2.1/src/minicom.c
@@ -989,7 +989,7 @@
diff -ur minicom-2.1.orig/debian/patches/bug199924.diff
minicom-2.1/debian/patches/bug199924.diff
--- minicom-2.1.orig/debian/patches/bug199924.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug199924.diff 2005-11-27 17:19:24.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug199924.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #199924
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/src/util.c
+++ minicom-2.1/src/util.c
@@ -113,7 +113,7 @@
diff -ur minicom-2.1.orig/debian/patches/bug202896.diff
minicom-2.1/debian/patches/bug202896.diff
--- minicom-2.1.orig/debian/patches/bug202896.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug202896.diff 2005-11-27 17:19:24.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug202896.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #202896
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/src/minicom.c
+++ minicom-2.1/src/minicom.c
@@ -998,7 +998,6 @@
diff -ur minicom-2.1.orig/debian/patches/bug204522.diff
minicom-2.1/debian/patches/bug204522.diff
--- minicom-2.1.orig/debian/patches/bug204522.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug204522.diff 2005-11-27 17:19:25.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug204522.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #204522
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/src/config.c
+++ minicom-2.1/src/config.c
@@ -55,13 +55,16 @@
diff -ur minicom-2.1.orig/debian/patches/bug205503.diff
minicom-2.1/debian/patches/bug205503.diff
--- minicom-2.1.orig/debian/patches/bug205503.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug205503.diff 2005-11-27 17:19:25.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug205503.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #205503
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/man/minicom.1
+++ minicom-2.1/man/minicom.1
@@ -838,6 +838,8 @@
diff -ur minicom-2.1.orig/debian/patches/bug220396.diff
minicom-2.1/debian/patches/bug220396.diff
--- minicom-2.1.orig/debian/patches/bug220396.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug220396.diff 2005-11-27 17:19:26.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug220396.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #220396
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/po/pl.po
+++ minicom-2.1/po/pl.po
@@ -79,7 +79,7 @@
diff -ur minicom-2.1.orig/debian/patches/bug287654.diff
minicom-2.1/debian/patches/bug287654.diff
--- minicom-2.1.orig/debian/patches/bug287654.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug287654.diff 2005-11-27 17:19:26.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug287654.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #287654
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/src/window.c
+++ minicom-2.1/src/window.c
@@ -62,7 +62,7 @@
diff -ur minicom-2.1.orig/debian/patches/bug301931.diff
minicom-2.1/debian/patches/bug301931.diff
--- minicom-2.1.orig/debian/patches/bug301931.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug301931.diff 2005-11-27 17:19:26.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug301931.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #301931
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/man/minicom.1
+++ minicom-2.1/man/minicom.1
@@ -18,7 +18,7 @@
diff -ur minicom-2.1.orig/debian/patches/bug337178.diff
minicom-2.1/debian/patches/bug337178.diff
--- minicom-2.1.orig/debian/patches/bug337178.diff 2005-11-27
16:57:06.000000000 -0500
+++ minicom-2.1/debian/patches/bug337178.diff 2005-11-27 17:19:27.000000000
-0500
@@ -1,3 +1,10 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bug337178.diff
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug #337178
+
[EMAIL PROTECTED]@
--- minicom-2.1.orig/src/window.c
+++ minicom-2.1/src/window.c
@@ -1551,7 +1551,7 @@
diff -ur minicom-2.1.orig/debian/rules minicom-2.1/debian/rules
--- minicom-2.1.orig/debian/rules 2005-11-27 16:57:06.000000000 -0500
+++ minicom-2.1/debian/rules 2005-11-27 17:55:49.000000000 -0500
@@ -23,20 +23,30 @@
endif
export CFLAGS
-clean:
+patch: patch-stamp
+patch-stamp:
+ dpatch apply-all
+ touch patch-stamp
+
+unpatch:
+ dpatch deapply-all
+ rm -rf patch-stamp debian/patched
+
+clean: clean-patched unpatch
+ rm -rf debian/minicom
+ rm -f debian/files debian/rejected debian/substvars
+ rm -f aux/config.guess aux/config.sub po/*.gmo
+
+clean-patched:
$(testdir)
rm -f configure-stamp build-stamp
cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub aux
-$(MAKE) -i distclean
- -cat `ls -r debian/patches/*.diff` /dev/null | patch -RNtp1 -r
debian/rejected --no-backup-if-mismatch
- rm -rf debian/minicom
- rm -f debian/files debian/rejected debian/substvars
- rm -f aux/config.guess aux/config.sub po/*.gmo
+configure: patch
configure-stamp: configure
$(testdir)
cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub aux
- -cat debian/patches/*.diff | patch -Ntp1 -r debian/rejected
--no-backup-if-mismatch
./configure $(CONFFLAGS) --prefix=/usr --mandir=/usr/share/man
--sysconfdir=/etc/minicom
touch configure-stamp
