[xml/sgml-commit] r1888 - in /packages/docbook-xsl/trunk/debian: changelog copyright docbook-xsl.copyright

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Thu Nov 17 12:38:44 2011
New Revision: 1888

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1888
Log:
* debian/copyright: Adjusted and added parts of docbook-xsl-ns.
* debian/docbook-xsl-ns.copyright: Removed.

Added:
    packages/docbook-xsl/trunk/debian/copyright
      - copied, changed from r1886, packages/docbook-xsl/trunk/debian/docbook-xsl.copyright
Removed:
    packages/docbook-xsl/trunk/debian/docbook-xsl.copyright
Modified:
    packages/docbook-xsl/trunk/debian/changelog

Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1888&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Thu Nov 17 12:38:44 2011
@@ -13,13 +13,13 @@
     (Description): Mention XSL-FO (closes: #604004, #623977).
     (Recommends): Downgrade docbook-xsl-doc* packages to Suggests (closes:
     #610726, #623976).
-  * debian/copyright: Renamed to debian/docbook-xsl.copyright.
+  * debian/copyright: Adjusted and added parts of docbook-xsl-ns.
   * debian/docbook-xsl.docs: Adjusted source paths.
   * debian/docbook-xsl.examples: Ditto.
   * debian/docbook-xsl.install: Ditto.
   * debian/docbook-xsl.xmlcatalogs: Ditto.
-  * debian/docbook-xsl-ns.copyright: Copied and adjusted source paths.
-  * debian/docbook-xsl-ns.docs: Ditto.
+  * debian/docbook-xsl-ns.copyright: Copied and removed.
+  * debian/docbook-xsl-ns.docs: Copied and adjusted source paths.
   * debian/docbook-xsl-ns.examples: Ditto.
   * debian/docbook-xsl-ns.install: Ditto.
   * debian/docbook-xsl-ns.xmlcatalogs: Ditto.

Copied: packages/docbook-xsl/trunk/debian/copyright (from r1886, packages/docbook-xsl/trunk/debian/docbook-xsl.copyright)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/copyright?rev=1888&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.copyright (original)
+++ packages/docbook-xsl/trunk/debian/copyright Thu Nov 17 12:38:44 2011
@@ -14,16 +14,18 @@
   Copyright (C) 2005-2007 The DocBook Project.
 
   Several files in the
-  /usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting directory are
-  copyright:
+  /usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting
+  /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/highlighting
+  directory are copyright:
 
   delphi-hl.xml, ini-hl.xml, java-hl.xml, m2-hl.xml, myxml-hl.xml, 
   php-hl.xml:
                  Copyright (C) 2005 Michal Molhanec.
 
   Several JavaScript files in the
-  /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/browser directory are
-  copyright:
+  /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/browser
+  /usr/share/xml/docbook/stylesheet/docbook-xsl-ns/slides/browser
+  directory are copyright:
   
   xbLibrary.js:
                  Copyright (C) 2000 Bob Clary.
@@ -599,3 +601,14 @@
        use the text of this Exhibit A rather than the text found in the
        Original Code Source Code for Your Modifications.]
 
+==============================================================================
+
+The Debian packaging is
+
+   Copyright (C) 2004 Mark Johnson <mrj at debian.org>
+   Copyright (C) 2006-2011 Daniel Leidert <daniel.leidert at wgdd.de>
+
+and licensed under the GNU General Public license version 2, found at
+`/usr/share/common-licenses/GPL-2', or at your option any later version.
+The current version of the GNU General Public license can also be found at
+`/usr/share/common-licenses/GPL'.