[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xsf-docs: Changes to 'master'



 Makefile                |    3 
 howtos/triage-bugs.mdwn |    6 -
 xsf.css                 |    1 
 xsf.svg                 |  210 +++++++++++++++++++++++++++++++++++++++++-------
 4 files changed, 186 insertions(+), 34 deletions(-)

New commits:
commit 56d61f15b89893ee40313d413294850752c83457
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Jan 19 07:11:23 2011 +0100

    triage-bugs: Fix typo.

diff --git a/howtos/triage-bugs.mdwn b/howtos/triage-bugs.mdwn
index acc2fe8..e523584 100644
--- a/howtos/triage-bugs.mdwn
+++ b/howtos/triage-bugs.mdwn
@@ -65,7 +65,7 @@ Categories are
 [documented on the wiki](http://wiki.debian.org/bugs.debian.org/usertags),
 and they would probably be welcome in the `intel` and `ati` cases
 above, as well as in the “multiple tools in a single bundle”
-cases.. An example of what we could achieve is the
+cases… An example of what we could achieve is the
 [devscripts bug page](http://bugs.debian.org/devscripts) (it takes
 some time to load, plenty of bugs).
 

commit af2eec9d03172cd42fad5a124eb486a16f2966e3
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Jan 19 07:07:45 2011 +0100

    triage-bugs: Cheat a bit and make the pdf look nicer.

diff --git a/howtos/triage-bugs.mdwn b/howtos/triage-bugs.mdwn
index 9e98a1a..acc2fe8 100644
--- a/howtos/triage-bugs.mdwn
+++ b/howtos/triage-bugs.mdwn
@@ -6,8 +6,8 @@ Cyril Brulebois &lt;kibi@debian.org>
 ## Packaging bugs or upstream bugs?
 
 It’d be nice to get all upstream bugs tagged as such (`upstream` tag),
-forwarded upstream (<http://bugs.freedesktop.org/> for most packages),
-and marked as such.
+forwarded upstream (which means the bugzilla instance on
+<http://bugs.freedesktop.org/> for most packages), and marked as such.
 
 A mail to `control@bugs.debian.org` would look like:
 

commit 052b9391f49e02c03f393a9e19aaf0a9da45aaff
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Jan 19 07:05:06 2011 +0100

    makefile: Make pdf file generation depend on the logo.

diff --git a/Makefile b/Makefile
index 055d62e..5dfa59c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ pdf_files = $(patsubst %.mdwn,%.pdf,$(mdwn_pages))
 MDWN_TO_HTML = ./mdwn2html
 HTML_TO_PDF  = wkhtmltopdf
 CSS_FILE     = xsf.css
+LOGO_FILE    = xsf.svg
 
 all: html pdf
 
@@ -19,7 +20,7 @@ pdf: $(pdf_files)
 %.html: %.mdwn $(MDWN_TO_HTML)
 	$(MDWN_TO_HTML) $< $@
 
-%.pdf: %.html $(CSS_FILE)
+%.pdf: %.html $(CSS_FILE) $(LOGO_FILE)
 	$(HTML_TO_PDF) $< $@
 
 clean:

commit 691a56ae4430ec5cd9e35585900cce2d77476df7
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Jan 19 07:05:03 2011 +0100

    css: Add some top margin to the authors paragraph accordingly.

diff --git a/xsf.css b/xsf.css
index 4e57253..8af2227 100644
--- a/xsf.css
+++ b/xsf.css
@@ -64,6 +64,7 @@ code, pre {
 /* Assume it's the author(s) paragraph */
 h1 + p {
   text-align: right;
+  margin-top: 40px;
   margin-bottom: 40px;
   font-size: 90%;
 }

commit b38ac8835c4d93c28c32d85b89a372ad86982eb5
Author: Cyril Brulebois <kibi@debian.org>
Date:   Wed Jan 19 07:04:55 2011 +0100

    logo: Mix X and Debian logos.

diff --git a/xsf.svg b/xsf.svg
index e99d747..864a1c1 100644
--- a/xsf.svg
+++ b/xsf.svg
@@ -2,35 +2,115 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/";
    xmlns:dc="http://purl.org/dc/elements/1.1/";
    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://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
-   width="160"
-   height="20"
-   id="svg2876"
+   width="80"
+   height="80"
+   id="svg2958"
    version="1.1"
    inkscape:version="0.47 r22583"
-   sodipodi:docname="xsf.svg">
+   sodipodi:docname="attempt3.svg">
   <defs
-     id="defs2878">
+     id="defs2960">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 526.18109 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_z="744.09448 : 526.18109 : 1"
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2884" />
+       id="perspective2966" />
     <inkscape:perspective
-       id="perspective2849"
+       id="perspective2940"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
        inkscape:vp_z="1 : 0.5 : 1"
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3239"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#LO"
+       id="linearGradient3224"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396" />
+    <linearGradient
+       id="LO"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396">
+      <stop
+         style="stop-color:#e54c18"
+         offset="0"
+         id="stop3094" />
+      <stop
+         style="stop-color:#fec350"
+         offset="1"
+         id="stop3096" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#LO"
+       id="linearGradient3284"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#LO"
+       id="linearGradient3291"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#LO"
+       id="linearGradient3300"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#LO"
+       id="linearGradient3306"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#LO"
+       id="linearGradient3309"
+       gradientUnits="userSpaceOnUse"
+       x1="319.20822"
+       y1="235.14877"
+       x2="657.65295"
+       y2="269.49396"
+       gradientTransform="matrix(0.33444317,0,0,0.33444317,160.14506,391.84518)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -39,46 +119,116 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="184.70479"
-     inkscape:cy="2.7400352"
+     inkscape:zoom="1.4"
+     inkscape:cx="57.251616"
+     inkscape:cy="2.651303"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="761"
+     inkscape:window-width="666"
+     inkscape:window-height="756"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     units="px" />
+     inkscape:window-maximized="0" />
   <metadata
-     id="metadata2881">
+     id="metadata2963">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="Calque 1"
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-222.54938,-527.86216)">
-    <text
-       xml:space="preserve"
-       style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;fill:#d70751;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="226.46407"
-       y="545.35217"
-       id="text2816"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan2818"
-         x="226.46407"
-         y="545.35217"
-         style="font-size:20px;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#d70751;fill-opacity:1;font-family:URW Bookman L;-inkscape-font-specification:URW Bookman L Bold Italic">X Strike Force</tspan></text>
+     transform="translate(-288.5803,-423.06919)">
+    <rect
+       id="rect3105"
+       height="0"
+       width="0.16891931"
+       y="465.94339"
+       x="406.15314"
+       style="opacity:0.40740739;fill:#000cff" />
+    <g
+       id="g3375"
+       transform="matrix(0.61835866,0,0,0.61835866,129.38048,171.50702)">
+      <path
+         id="path3102"
+         d="m 274.54934,522.51286 37.15573,-48.57995 -38.25252,-53.41491 24.58638,0.0204 30.48048,42.00033 -45.57461,59.9741 -8.39546,0 z m 72.72393,0.0343 -30.27005,-42.07244 45.95411,-60.00228 8.18775,0 -37.30736,48.80915 38.02231,53.26557 -24.58676,0 z" />
+      <g
+         i:rgbTrio="#4F008000FFFF"
+         i:dimmedPercent="50"
+         i:layer="yes"
+         id="Layer_1"
+         transform="matrix(1.2459517,0,0,0.63116303,267.96832,440.28054)">
+        <g
+           id="g2900">
+          <path
+             id="path2902"
+             d="m 51.986,57.297 c -1.797,0.025 0.34,0.926 2.686,1.287 0.648,-0.506 1.236,-1.018 1.76,-1.516 -1.461,0.358 -2.948,0.366 -4.446,0.229"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2904"
+             d="m 61.631,54.893 c 1.07,-1.477 1.85,-3.094 2.125,-4.766 -0.24,1.192 -0.887,2.221 -1.496,3.307 -3.359,2.115 -0.316,-1.256 -0.002,-2.537 -3.612,4.546 -0.496,2.726 -0.627,3.996"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2906"
+             d="m 65.191,45.629 c 0.217,-3.236 -0.637,-2.213 -0.924,-0.978 0.335,0.174 0.6,2.281 0.924,0.978"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2908"
+             d="m 45.172,1.399 c 0.959,0.172 2.072,0.304 1.916,0.533 1.049,-0.23 1.287,-0.442 -1.916,-0.533"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2910"
+             d="M 47.088,1.932 46.41,2.072 47.041,2.016 47.088,1.932"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2912"
+             d="m 76.992,46.856 c 0.107,2.906 -0.85,4.316 -1.713,6.812 l -1.553,0.776 c -1.271,2.468 0.123,1.567 -0.787,3.53 -1.984,1.764 -6.021,5.52 -7.313,5.863 -0.943,-0.021 0.639,-1.113 0.846,-1.541 -2.656,1.824 -2.131,2.738 -6.193,3.846 L 60.16,65.878 C 50.142,70.591 36.226,61.251 36.409,48.507 c -0.107,0.809 -0.304,0.607 -0.526,0.934 -0.517,-6.557 3.028,-13.143 9.007,-15.832 5.848,-2.895 12.704,-1.707 16.893,2.197 -2.301,-3.014 -6.881,-6.209 -12.309,-5.91 -5.317,0.084 -10.291,3.463 -11.951,7.131 -2.724,1.715 -3.04,6.611 -4.227,7.507 -1.597,11.737 3.004,16.808 10.787,22.773 1.225,0.826 0.345,0.951 0.511,1.58 -2.586,-1.211 -4.954,-3.039 -6.901,-5.277 1.033,1.512 2.148,2.982 3.589,4.137 -2.438,-0.826 -5.695,-5.908 -6.646,-6.115 4.203,7.525 17.052,13.197 23.78,10.383 -3.113,0.115 -7.068,0.064 -10.566,-1.229 -1.469,-0.756 -3.467,-2.322 -3.11,-2.615 9.182,3.43 18.667,2.598 26.612,-3.771 2.021,-1.574 4.229,-4.252 4.867,-4.289 -0.961,1.445 0.164,0.695 -0.574,1.971 2.014,-3.248
  -0.875,-1.322 2.082,-5.609 l 1.092,1.504 c -0.406,-2.696 3.348,-5.97 2.967,-10.234 0.861,-1.304 0.961,1.403 0.047,4.403 1.268,-3.328 0.334,-3.863 0.66,-6.609 0.352,0.923 0.814,1.904 1.051,2.878 -0.826,-3.216 0.848,-5.416 1.262,-7.285 -0.408,-0.181 -1.275,1.422 -1.473,-2.377 0.029,-1.65 0.459,-0.865 0.625,-1.271 -0.324,-0.186 -1.174,-1.451 -1.691,-3.877 0.375,-0.57 1.002,1.478 1.512,1.562 -0.328,-1.929 -0.893,-3.4 -0.916,-4.88 -1.49,-3.114 -0.527,0.415 -1.736,-1.337 -1.586,-4.947 1.316,-1.148 1.512,-3.396 2.404,3.483 3.775,8.881 4.404,11.117 -0.48,-2.726 -1.256,-5.367 -2.203,-7.922 0.73,0.307 -1.176,-5.609 0.949,-1.691 C 83.519,18.706 76.074,10.902 69.225,7.24 70.063,8.007 71.121,8.97 70.741,9.121 67.335,7.093 67.934,6.935 67.446,6.078 64.671,4.949 64.489,6.169 62.651,6.08 57.421,3.306 56.413,3.601 51.6,1.863 l 0.219,1.023 c -3.465,-1.154 -4.037,0.438 -7.782,0.004 -0.228,-0.178 1.2,-0.644 2.375,-0.815 -3.35,0.442 -3.193,-0.66 -6.471,0.122 0.808,-0.567 1.662,-0.942 2.524,-1.4
 24 -2.732,0.166 -6.522,1.59 -5.352,0.295 -4.456,1.988 -12.37,4.779 -16.811,8.943 l -0.14,-0.933 c -2.035,2.443 -8.874,7.296 -9.419,10.46 l -0.544,0.127 c -1.059,1.793 -1.744,3.825 -2.584,5.67 -1.385,2.36 -2.03,0.908 -1.833,1.278 -2.724,5.523 -4.077,10.164 -5.246,13.97 0.833,1.245 0.02,7.495 0.335,12.497 -1.368,24.704 17.338,48.69 37.785,54.228 2.997,1.072 7.454,1.031 11.245,1.141 -4.473,-1.279 -5.051,-0.678 -9.408,-2.197 -3.143,-1.48 -3.832,-3.17 -6.058,-5.102 l 0.881,1.557 c -4.366,-1.545 -2.539,-1.912 -6.091,-3.037 l 0.941,-1.229 C 28.751,98.334 26.418,96.056 25.78,94.795 l -1.548,0.061 c -1.86,-2.295 -2.851,-3.949 -2.779,-5.23 l -0.5,0.891 c -0.567,-0.973 -6.843,-8.607 -3.587,-6.83 -0.605,-0.553 -1.409,-0.9 -2.281,-2.484 l 0.663,-0.758 c -1.567,-2.016 -2.884,-4.6 -2.784,-5.461 0.836,1.129 1.416,1.34 1.99,1.533 -3.957,-9.818 -4.179,-0.541 -7.176,-9.994 L 8.412,66.472 C 7.926,65.74 7.631,64.945 7.24,64.165 l 0.276,-2.75 C 4.667,58.121 6.719,47.409 7.13,41.534 7.415,39.145 9
 .508,36.602 11.1,32.614 l -0.97,-0.167 c 1.854,-3.234 10.586,-12.988 14.63,-12.486 1.959,-2.461 -0.389,-0.009 -0.772,-0.629 4.303,-4.453 5.656,-3.146 8.56,-3.947 3.132,-1.859 -2.688,0.725 -1.203,-0.709 5.414,-1.383 3.837,-3.144 10.9,-3.846 0.745,0.424 -1.729,0.655 -2.35,1.205 4.511,-2.207 14.275,-1.705 20.617,1.225 7.359,3.439 15.627,13.605 15.953,23.17 l 0.371,0.1 c -0.188,3.802 0.582,8.199 -0.752,12.238 l 0.908,-1.912"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2914"
+             d="m 32.372,59.764 -0.252,1.26 c 1.181,1.604 2.118,3.342 3.626,4.596 -1.085,-2.118 -1.891,-2.993 -3.374,-5.856"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2916"
+             d="m 35.164,59.654 c -0.625,-0.691 -0.995,-1.523 -1.409,-2.352 0.396,1.457 1.207,2.709 1.962,3.982 l -0.553,-1.63"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2918"
+             d="m 84.568,48.916 -0.264,0.662 c -0.484,3.438 -1.529,6.84 -3.131,9.994 1.77,-3.328 2.915,-6.968 3.395,-10.656"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2920"
+             d="M 45.527,0.537 C 46.742,0.092 48.514,0.293 49.803,0 48.123,0.141 46.451,0.225 44.8,0.438 l 0.727,0.099"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2922"
+             d="m 2.872,23.219 c 0.28,2.592 -1.95,3.598 0.494,1.889 1.31,-2.951 -0.512,-0.815 -0.494,-1.889"
+             i:knockout="Off"
+             style="fill:#d70751" />
+          <path
+             id="path2924"
+             d="M 0,35.215 C 0.563,33.487 0.665,32.449 0.88,31.449 -0.676,33.438 0.164,33.862 0,35.215"
+             i:knockout="Off"
+             style="fill:#d70751" />
+        </g>
+      </g>
+    </g>
   </g>
 </svg>


Reply to: