| 1 |
#! /bin/sh -e
|
| 2 |
##
|
| 3 |
## DP: These are the changes to the 14_mkisofs_iconv.dpatch compared to the original
|
| 4 |
## DP: mkisofs-iconv-X patch. If you upgrade 14_mkisofs_iconv with the new
|
| 5 |
## DP: mkisovs-iconv patch, make sure that this post-patch still works.
|
| 6 |
|
| 7 |
if [ $# -ne 1 ]; then
|
| 8 |
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
|
| 9 |
exit 1
|
| 10 |
fi
|
| 11 |
case "$1" in
|
| 12 |
-patch) patch -f --no-backup-if-mismatch -p1 < $0;;
|
| 13 |
-unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
|
| 14 |
*)
|
| 15 |
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
|
| 16 |
exit 1;;
|
| 17 |
esac
|
| 18 |
|
| 19 |
exit 0
|
| 20 |
|
| 21 |
@DPATCH@
|
| 22 |
diff -urNad cdrtools-2.01.01~/mkisofs/mkisofs.c cdrtools-2.01.01/mkisofs/mkisofs.c
|
| 23 |
--- cdrtools-2.01.01~/mkisofs/mkisofs.c 2006-03-19 21:11:09.643588904 +0100
|
| 24 |
+++ cdrtools-2.01.01/mkisofs/mkisofs.c 2006-03-19 21:11:50.263413752 +0100
|
| 25 |
@@ -67,7 +67,7 @@
|
| 26 |
struct directory *root = NULL;
|
| 27 |
int path_ind;
|
| 28 |
|
| 29 |
-char version_string[] = "mkisofs 2.01.01a05";
|
| 30 |
+char version_string[] = "mkisofs 2.01.01a05-unofficial-iconv";
|
| 31 |
|
| 32 |
char *outfile;
|
| 33 |
FILE *discimage;
|
| 34 |
@@ -970,6 +970,7 @@
|
| 35 |
fprintf(stderr, "Usage: %s [options] file...\n", program_name);
|
| 36 |
fprintf(stderr, "\nUse %s -help\n", program_name);
|
| 37 |
fprintf(stderr, "to get a list of valid options.\n");
|
| 38 |
+ fprintf(stderr, "This version of mkisofs includes the unofficial iconv-patch\nfrom http://users.utu.fi/jahhein/mkisofs/\nReport errors to cdrtools@packages.debian.org\n");
|
| 39 |
|
| 40 |
exit(excode);
|
| 41 |
}
|
| 42 |
@@ -1065,6 +1066,7 @@
|
| 43 |
fprintf(stderr, "%s\n", ld_options[i].doc);
|
| 44 |
}
|
| 45 |
}
|
| 46 |
+ fprintf(stderr, "This version of mkisofs includes the unofficial iconv-patch\nfrom http://users.utu.fi/jahhein/mkisofs/\nReport errors to cdrtools@packages.debian.org\n");
|
| 47 |
exit(excode);
|
| 48 |
}
|
| 49 |
|
| 50 |
@@ -2407,10 +2409,11 @@
|
| 51 |
fprintf(stderr, "Unknown charset\nKnown charsets are:\n");
|
| 52 |
list_unls(); /* List all known charset names */
|
| 53 |
#ifdef USE_ICONV
|
| 54 |
- if(!iconv_possible)
|
| 55 |
- fprintf(stderr, "Iconv charsets cannot be used with "
|
| 56 |
- "Apple extension, HFS, ISO9660 version 2 or\n"
|
| 57 |
- "Rock Ridge.\n");
|
| 58 |
+ fprintf(stderr, "\nAdditional input charsets are available for Joliet through the iconv support."
|
| 59 |
+ "\nRun \"iconv -l\" to display them. Iconv charsets cannot be used with HFS, Apple"
|
| 60 |
+ "\nextension, ISO9660 version 2 or Rock Ridge.\n"
|
| 61 |
+ "\nIMPORTANT: never report problems with charset support directly"
|
| 62 |
+ "\nto Joerg Schilling! Report them to cdrtools@packages.debian.org first.\n");
|
| 63 |
#endif
|
| 64 |
exit(1);
|
| 65 |
}
|
Parent Directory
| 
Revision Log