diff --git a/debian/patches/05_fix_displayed_full_paths.dpatch b/debian/patches/05_fix_displayed_full_paths.dpatch
index b97716a110d213dbea2e79eed3e01183bdb94c59..6a1345c92c3f817a7cdb522de60374d35289384e 100644 (file)
-#! /bin/sh -e
-## 05_fix_displayed_full_paths.dpatch by <boll@andariel>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_displayed_full_paths.dpatch by Søren Boll Overgaard <boll@andariel>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
+## DP: Adapt the path name of binaries in an error message to the paths as
+## DP: used in the Debian package.
@DPATCH@
-diff -urNad /home/boll/mlmmj/mlmmj-1.0.0-RELEASE/include/mlmmj.h mlmmj-1.0.0-RELEASE/include/mlmmj.h
---- /home/boll/mlmmj/mlmmj-1.0.0-RELEASE/include/mlmmj.h 2004-09-07 11:49:10.000000000 +0000
-+++ mlmmj-1.0.0-RELEASE/include/mlmmj.h 2004-10-03 08:29:27.000000000 +0000
+
+diff a/include/mlmmj.h b/include/mlmmj.h
+--- a/include/mlmmj.h
++++ b/include/mlmmj.h
@@ -70,7 +70,7 @@
#define CHECKFULLPATH(name) if(strchr(name, '/') == NULL) { \
fprintf(stderr, "All mlmmj binaries have to " \