From ad2f2df5dbad483d7dd055531fb0f3d8c6de9f9d Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Wed, 4 Jan 2012 11:06:50 +0100
Subject: [PATCH] Fix copyright headers for etc/org/ files.

Rename etc/org/COPYRIGHT-AND-LICENSE to etc/org/README for consistency
with other copyright files, and add a reference to it in the .xml
files.

This changes have been made by Chong Yidong in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-01/msg00010.html
---
 etc/styles/OrgOdtContentTemplate.xml         |  1 +
 etc/styles/OrgOdtStyles.xml                  |  1 +
 etc/styles/{COPYRIGHT-AND-LICENSE => README} | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 10 deletions(-)
 rename etc/styles/{COPYRIGHT-AND-LICENSE => README} (75%)

diff --git a/etc/styles/OrgOdtContentTemplate.xml b/etc/styles/OrgOdtContentTemplate.xml
index f4982f620..f50588b2a 100644
--- a/etc/styles/OrgOdtContentTemplate.xml
+++ b/etc/styles/OrgOdtContentTemplate.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- See etc/org/README for copyright information -->
 <office:document-content
     xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
     xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
diff --git a/etc/styles/OrgOdtStyles.xml b/etc/styles/OrgOdtStyles.xml
index 762d56abc..4fb282064 100644
--- a/etc/styles/OrgOdtStyles.xml
+++ b/etc/styles/OrgOdtStyles.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- See etc/org/README for copyright information -->
 <office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" office:version="1.2">
  <office:font-face-decls>
   <style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol"/>
diff --git a/etc/styles/COPYRIGHT-AND-LICENSE b/etc/styles/README
similarity index 75%
rename from etc/styles/COPYRIGHT-AND-LICENSE
rename to etc/styles/README
index 7c4acde62..a14b0cb9a 100644
--- a/etc/styles/COPYRIGHT-AND-LICENSE
+++ b/etc/styles/README
@@ -1,14 +1,9 @@
-OrgOdtContentTemplate.xml --- Aux XML file (Org-mode's OpenDocument export)
-OrgOdtStyles.xml	  --- Aux XML file (Org-mode's OpenDocument export)
+The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the
+following copyright information:
 
-Copyright (C) 2010-2012 Free Software Foundation, Inc.
+Copyright (C) 2010-2011 Free Software Foundation, Inc.
 
-Author: Jambunathan K <kjambunathan at gmail dot com>
-Keywords: outlines, hypermedia, calendar, wp
-Homepage: http://orgmode.org
-
-These file are not (yet) part of GNU Emacs.
-However, it is distributed under the same license.
+These file are part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,9 +18,14 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
+
+Author: Jambunathan K <kjambunathan at gmail dot com>
+Keywords: outlines, hypermedia, calendar, wp
+Homepage: http://orgmode.org
+
 Commentary:
 
-Above files are part of Org-mode's OpenDocument export module.
+These files are part of Org-mode's OpenDocument export module.
 
 OrgOdtContentTemplate.xml provides a template within which the content
 of an exported document is enclosed.  This file contributes to
-- 
2.11.4.GIT