Erik de Castro Lopo wrote:

In my latest commit I have updated all version strings and copyright
dates.

Here are some fixes to this. (Patch 2 compressed due to mailing list size constraints.) Instead of the first patch, it would also be fine to leave the encoding at ISO-8859-1, but store the name "Hyvärinen" in that encoding.

Regarding the copyright years, it is obviously only relevant for the U.S., but as far as I understand it, contractions like "2000-2013" can only be used if _every_ year in the span actually had copyrightable changes.

Ulrich
>From c199d22d2be9ee6fea3dafff57afff74d4ee163e Mon Sep 17 00:00:00 2001
From: Ulrich Klauer <ulr...@chirlu.de>
Date: Sun, 26 May 2013 22:07:49 +0200
Subject: [PATCH 1/3] Declare UTF-8 encoding for changelog

The changelog declared "charset=ISO-8859-1", but used a UTF-8 encoded
name. Change the declaration to UTF-8 to fix this.
---
 doc/html/changelog.html |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index 85fec78..b7994fa 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -8,7 +8,7 @@
 <!-- A copy of the license can be found at http://www.gnu.org/copyleft/fdl.html -->
 <html>
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<meta name="author" content="Josh Coalson" />
 	<meta name="description" content="A free, open source codec for lossless audio compression and decompression" />
 	<meta name="keywords" content="free,lossless,audio,codec,encoder,decoder,compression,compressor,archival,archive,archiving,backup,music" />
-- 
1.7.10.4

Attachment: 0002-Properly-close-HTML-comments.patch.xz
Description: application/xz

>From 968ba2080db599d104d032a2b1e2e067008b717e Mon Sep 17 00:00:00 2001
From: Ulrich Klauer <ulr...@chirlu.de>
Date: Sun, 26 May 2013 22:19:50 +0200
Subject: [PATCH 3/3] src/flac/main.c : Fix copyright notice

There is no copyright for 2010, so "2000-2013" should not be used.
---
 src/flac/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/flac/main.c b/src/flac/main.c
index 4106493..39a2514 100644
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -478,7 +478,7 @@ int do_it(void)
 	}
 
 	flac__utils_printf(stderr, 2, "\n");
-	flac__utils_printf(stderr, 2, "flac %s, Copyright (C) 2000-2013  Josh Coalson & Xiph.Org Foundation\n", FLAC__VERSION_STRING);
+	flac__utils_printf(stderr, 2, "flac %s, Copyright (C) 2000-2009, 2011-2013  Josh Coalson & Xiph.Org Foundation\n", FLAC__VERSION_STRING);
 	flac__utils_printf(stderr, 2, "flac comes with ABSOLUTELY NO WARRANTY.  This is free software, and you are\n");
 	flac__utils_printf(stderr, 2, "welcome to redistribute it under certain conditions.  Type `flac' for details.\n\n");
 
-- 
1.7.10.4

_______________________________________________
flac-dev mailing list
flac-dev@xiph.org
http://lists.xiph.org/mailman/listinfo/flac-dev

Reply via email to