[xhtmlrenderer] 24/26: Really merge face-sad.svg on master branch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to annotated tag debian/0.0_R8+dfsg2-1
in repository xhtmlrenderer.

commit c1b642ea414fd3e8f8a057c9d1bf7b8bdb02c402
Author: Markus Koschany <apo at debian.org>
Date:   Mon Jan 11 13:18:18 2016 +0100

    Really merge face-sad.svg on master branch
---
 demos/svg/xhtml/dat/face-sad.svg | 94 +++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 60 deletions(-)

diff --git a/demos/svg/xhtml/dat/face-sad.svg b/demos/svg/xhtml/dat/face-sad.svg
index 4f0cc19..fdfa02d 100644
--- a/demos/svg/xhtml/dat/face-sad.svg
+++ b/demos/svg/xhtml/dat/face-sad.svg
@@ -2,22 +2,30 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="face-sad.svg"
    sodipodi:docbase="/home/jimmac/gfx/ximian/tango-desktop-theme/scalable/emotes"
-   inkscape:version="0.41+cvs"
+   inkscape:version="0.46"
    sodipodi:version="0.32"
    id="svg4376"
    height="48px"
-   width="48px">
+   width="48px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs3">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective39" />
     <linearGradient
        id="linearGradient3290">
       <stop
@@ -123,7 +131,7 @@
        inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
-     inkscape:window-y="184"
+     inkscape:window-y="109"
      inkscape:window-x="223"
      inkscape:window-height="739"
      inkscape:window-width="700"
@@ -144,74 +152,40 @@
      fill="#edd400" />
   <metadata
      id="metadata4">
-    <rdf:RDF
-       id="RDF5">
+    <rdf:RDF>
       <cc:Work
-         id="Work6"
          rdf:about="">
-        <dc:format
-           id="format7">image/svg+xml</dc:format>
+        <dc:format>image/svg+xml</dc:format>
         <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
-           id="type9" />
-        <dc:title
-           id="title8909">Face - Sad</dc:title>
-        <dc:subject
-           id="subject8911">
-          <rdf:Bag
-             id="Bag8913">
-            <rdf:li
-               id="li3283">emoticon</rdf:li>
-            <rdf:li
-               id="li3285">emote</rdf:li>
-            <rdf:li
-               id="li3287">smiley</rdf:li>
-            <rdf:li
-               id="li3289">sad</rdf:li>
-            <rdf:li
-               id="li3291">:(</rdf:li>
-            <rdf:li
-               id="li3293">:-(</rdf:li>
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Face - Sad</dc:title>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>emoticon</rdf:li>
+            <rdf:li>emote</rdf:li>
+            <rdf:li>smiley</rdf:li>
+            <rdf:li>sad</rdf:li>
+            <rdf:li>:(</rdf:li>
+            <rdf:li>:-(</rdf:li>
           </rdf:Bag>
         </dc:subject>
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/"
-           id="license9103" />
-        <dc:creator
-           id="creator9121">
-          <cc:Agent
-             id="Agent9123">
-            <dc:title
-               id="title9125">Jakub Steiner</dc:title>
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Steiner</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:source
-           id="source9127">http://jimmac.musichall.cz</dc:source>
+        <dc:source>http://jimmac.musichall.cz</dc:source>
       </cc:Work>
       <cc:License
-         id="License9105"
-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.0/">
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
         <cc:permits
-           id="permits9107"
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           id="permits9109"
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           id="requires9111"
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           id="requires9113"
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:prohibits
-           id="prohibits9115"
-           rdf:resource="http://web.resource.org/cc/CommercialUse" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           id="permits9117"
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           id="requires9119"
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/xhtmlrenderer.git