Merge copyright messages into one string and change the run-time messages to avoid confusion (we are not technically based on the latest libjpeg, although we do borrow some code from it)

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@781 632fc199-4ca6-4c93-a231-07263d6284db

cjpeg.c

@@ -277,9 +277,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
       if (! printed_version) {
 	fprintf(stderr, "%s version %s (build %s)\n",
 		PACKAGE_NAME, VERSION, BUILD);
-	fprintf(stderr, "%s\n\n", LJTCOPYRIGHT);
+	fprintf(stderr, "%s\n\n", JCOPYRIGHT);
-	fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n",
+	fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
-		JVERSION, JCOPYRIGHT);
+		JVERSION);
 	printed_version = TRUE;
       }
       cinfo->err->trace_level++;

djpeg.c

@@ -244,9 +244,9 @@ parse_switches (j_decompress_ptr cinfo, int argc, char **argv,
       if (! printed_version) {
 	fprintf(stderr, "%s version %s (build %s)\n",
 		PACKAGE_NAME, VERSION, BUILD);
-	fprintf(stderr, "%s\n\n", LJTCOPYRIGHT);
+	fprintf(stderr, "%s\n\n", JCOPYRIGHT);
-	fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n",
+	fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
-		JVERSION, JCOPYRIGHT);
+		JVERSION);
 	printed_version = TRUE;
       }
       cinfo->err->trace_level++;

jpegtran.c

@@ -203,9 +203,9 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
       if (! printed_version) {
 	fprintf(stderr, "%s version %s (build %s)\n",
 		PACKAGE_NAME, VERSION, BUILD);
-	fprintf(stderr, "%s\n\n", LJTCOPYRIGHT);
+	fprintf(stderr, "%s\n\n", JCOPYRIGHT);
-	fprintf(stderr, "Based on Independent JPEG Group's libjpeg, version %s\n%s\n\n",
+	fprintf(stderr, "Emulating The Independent JPEG Group's libjpeg, version %s\n\n",
-		JVERSION, JCOPYRIGHT);
+		JVERSION);
 	printed_version = TRUE;
       }
       cinfo->err->trace_level++;

jversion.h

@@ -2,7 +2,7 @@
  * jversion.h
  *
  * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
- * Copyright (C) 2010, D. R. Commander.
+ * Copyright (C) 2010, 2012, D. R. Commander.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -14,23 +14,18 @@
 
 #define JVERSION	"8b  16-May-2010"
 
-#define JCOPYRIGHT	"Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding"
-
 #elif JPEG_LIB_VERSION >= 70
 
 #define JVERSION        "7  27-Jun-2009"
 
-#define JCOPYRIGHT      "Copyright (C) 2009, Thomas G. Lane, Guido Vollbeding"
-
 #else
 
 #define JVERSION	"6b  27-Mar-1998"
 
-#define JCOPYRIGHT	"Copyright (C) 1998, Thomas G. Lane"
-
 #endif
 
-#define LJTCOPYRIGHT	"Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
+#define JCOPYRIGHT	"Copyright (C) 1991-2010 Thomas G. Lane, Guido Vollbeding\n" \
+			"Copyright (C) 1999-2006 MIYASAKA Masaru\n" \
 			"Copyright (C) 2004 Landmark Graphics Corporation\n" \
 			"Copyright (C) 2005-2007 Sun Microsystems, Inc.\n" \
 			"Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \