[Emacs-diffs] /srv/bzr/emacs/trunk r106767: Fix copyright headers for etc/org/ files.

[Chong Yidong]

------------------------------------------------------------
revno: 106767
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-01-04 14:39:31 +0800
message:
  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.
renamed:
  etc/org/COPYRIGHT-AND-LICENSE => etc/org/README
modified:
  etc/org/OrgOdtContentTemplate.xml
  etc/org/OrgOdtStyles.xml
  etc/org/README

=== modified file 'etc/org/OrgOdtContentTemplate.xml'
--- a/etc/org/OrgOdtContentTemplate.xml 2012-01-03 17:27:21 +0000
+++ b/etc/org/OrgOdtContentTemplate.xml 2012-01-04 06:39:31 +0000
@@ -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"

=== modified file 'etc/org/OrgOdtStyles.xml'
--- a/etc/org/OrgOdtStyles.xml  2012-01-03 17:27:21 +0000
+++ b/etc/org/OrgOdtStyles.xml  2012-01-04 06:39:31 +0000
@@ -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"/>

=== renamed file 'etc/org/COPYRIGHT-AND-LICENSE' => 'etc/org/README'
--- a/etc/org/COPYRIGHT-AND-LICENSE     2012-01-03 17:27:21 +0000
+++ b/etc/org/README    2012-01-04 06:39:31 +0000
@@ -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-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 @@
 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