[SCM] kodi/master: Generate "from Debian" logo from SVG
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Fri Jan 2 16:30:28 UTC 2015
The following commit has been merged in the master branch:
commit c26ac63209e04c9a26d096a70839fd7f7d75d510
Author: Balint Reczey <balint at balintreczey.hu>
Date: Fri Jan 2 15:00:18 2015 +0100
Generate "from Debian" logo from SVG
diff --git a/debian/control b/debian/control
index 8907523..369130c 100644
--- a/debian/control
+++ b/debian/control
@@ -96,7 +96,7 @@ Build-Depends: debhelper (>= 9~),
libavutil-ffmpeg-dev,
libpostproc-ffmpeg-dev,
libswscale-ffmpeg-dev,
- gimp,
+ inkscape,
groovy,
libcommons-lang-java,
doxygen,
diff --git a/debian/copyright b/debian/copyright
index 94e86fe..c63b36b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3240,3 +3240,55 @@ OpenSSH contains no GPL code.
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- End of OpenSSH License --
+
+The the part starting here is in machine-readable format:
+
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Kodi
+Source: http://kodi.tv/
+
+Files: debian/*
+Copyright: Copyright 2008-2009 Ouattara Oumar Aziz <wattazoum at gmail.com>
+ Copyright 2012-2013 Andres Mejia <amejia at debian.org>
+ Copyright 2014-2015 Balint Reczey <balint at balintreczey.hu>
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+Files: debian/from-debian-logo.svg
+Copyright: Copyright 1999 Software in the Public Interest, Inc.
+ Copyright 2015 Balint Reczey <balint at balintreczey.hu>
+License: LGPL-3+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-3".
diff --git a/debian/from-debian-logo.svg b/debian/from-debian-logo.svg
new file mode 100644
index 0000000..e0779d9
--- /dev/null
+++ b/debian/from-debian-logo.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77) -->
+
+<svg
+ xmlns:ns0="http://ns.adobe.com/SaveForWeb/1.0/"
+ xmlns:ns="http://ns.adobe.com/Variables/1.0/"
+ 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ i:viewOrigin="251 467"
+ i:rulerOrigin="0 0"
+ i:pageBounds="0 792 612 0"
+ width="124.60188"
+ height="41.382854"
+ viewBox="0 0 124.60188 41.382856"
+ overflow="visible"
+ enable-background="new 0 0 108.758 144.133"
+ xml:space="preserve"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="kodi-from-debian-logo.svg"
+ style="overflow:visible"><defs
+ id="defs49"><filter
+ inkscape:label="Drop Shadow"
+ id="filter4007"
+ color-interpolation-filters="sRGB"><feFlood
+ flood-opacity="0.267"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood4009" /><feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="in"
+ result="composite1"
+ id="feComposite4011" /><feGaussianBlur
+ stdDeviation="6"
+ result="blur"
+ id="feGaussianBlur4013" /><feOffset
+ dx="2.77556e-17"
+ dy="2.77556e-17"
+ result="offset"
+ id="feOffset4015" /><feComposite
+ in="SourceGraphic"
+ in2="offset"
+ operator="over"
+ result="composite2"
+ id="feComposite4017" /></filter><filter
+ inkscape:label="Drop Shadow"
+ id="filter4019"
+ color-interpolation-filters="sRGB"><feFlood
+ flood-opacity="0.267"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood4021" /><feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="in"
+ result="composite1"
+ id="feComposite4023" /><feGaussianBlur
+ stdDeviation="6"
+ result="blur"
+ id="feGaussianBlur4025" /><feOffset
+ dx="2.77556e-17"
+ dy="2.77556e-17"
+ result="offset"
+ id="feOffset4027" /><feComposite
+ in="SourceGraphic"
+ in2="offset"
+ operator="over"
+ result="composite2"
+ id="feComposite4029" /></filter><filter
+ inkscape:label="Drop Shadow"
+ id="filter4055"
+ y="-0.5"
+ height="2"
+ color-interpolation-filters="sRGB"><feFlood
+ flood-opacity="0.25"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood4057" /><feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="in"
+ result="composite1"
+ id="feComposite4059" /><feGaussianBlur
+ stdDeviation="6"
+ result="blur"
+ id="feGaussianBlur4061" /><feOffset
+ dx="2.77556e-17"
+ dy="2.77556e-17"
+ result="offset"
+ id="feOffset4063" /><feComposite
+ in="SourceGraphic"
+ in2="offset"
+ operator="over"
+ result="composite2"
+ id="feComposite4065" /></filter></defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1438"
+ inkscape:window-height="879"
+ id="namedview47"
+ showgrid="false"
+ inkscape:zoom="2.3156003"
+ inkscape:cx="9.2522673"
+ inkscape:cy="8.9090173"
+ inkscape:window-x="0"
+ inkscape:window-y="19"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ showguides="true"
+ inkscape:guide-bbox="true" /><metadata
+ id="metadata4"><ns:variableSets><ns:variableSet
+ varSetName="binding1"
+ locked="none"><ns:variables /><ns:sampleDataSets /></ns:variableSet></ns:variableSets><ns0:sfw><ns0:slices /><ns0:sliceSourceBounds
+ y="322.867"
+ x="251"
+ width="108.758"
+ height="144.133"
+ bottomLeftOrigin="true" /></ns0:sfw><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><g
+ id="g4043"
+ style="filter:url(#filter4055)"
+ transform="translate(-179.24258,-86.71267)"><g
+ transform="matrix(0.5678998,0,0,0.5678998,231.69733,35.897279)"
+ id="g4105"><path
+ i:knockout="Off"
+ d="m 13.437,125.506 c -0.045,0.047 -0.045,7.506 -0.138,9.453 -0.092,1.574 -0.232,4.957 -3.568,4.957 -3.429,0 -4.263,-3.939 -4.541,-5.652 -0.324,-1.9 -0.324,-3.477 -0.324,-4.17 0,-2.225 0.139,-8.436 5.375,-8.436 1.576,0 2.456,0.465 3.151,0.834 l 0.045,3.014 z M 0,130.975 c 0,13.066 6.951,13.066 7.97,13.066 2.873,0 4.727,-1.576 5.514,-4.309 l 0.093,4.123 c 0.881,-0.047 1.761,-0.139 3.197,-0.139 0.51,0 0.926,0 1.298,0.047 0.371,0 0.741,0.045 1.158,0.092 -0.741,-1.482 -1.297,-4.818 -1.297,-12.049 0,-7.043 0,-18.951 0.602,-22.566 -1.667,0.789 -3.105,1.299 -6.256,1.576 1.251,1.344 1.251,2.039 1.251,8.154 -0.879,-0.277 -1.992,-0.602 -3.892,-0.602 C 1.344,118.369 0,125.598 0,130.975"
+ id="path33"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ i:knockout="Off"
+ d="m 25.13,128.609 c 0.047,-3.846 0.835,-7.275 4.124,-7.275 3.615,0 3.891,3.984 3.799,7.275 H 25.13 z m 12.51,0.465 c 0,-5.422 -1.065,-10.752 -7.923,-10.752 -9.452,0 -9.452,10.475 -9.452,12.697 0,9.406 4.216,13.113 11.306,13.113 3.149,0 4.68,-0.461 5.514,-0.695 -0.046,-1.668 0.185,-2.734 0.465,-4.17 -0.975,0.604 -2.226,1.391 -5.006,1.391 -7.229,0 -7.322,-6.582 -7.322,-8.852 H 37.55 l 0.09,-2.732"
+ id="path35"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ i:knockout="Off"
+ d="m 52.715,131.066 c 0,4.309 -0.787,10.102 -6.162,10.102 -0.742,0 -1.668,-0.141 -2.27,-0.279 -0.093,-1.668 -0.093,-4.541 -0.093,-7.877 0,-3.986 0.416,-6.068 0.742,-7.09 0.972,-3.289 3.15,-3.334 3.566,-3.334 3.522,0 4.217,4.865 4.217,8.478 z m -13.298,5.051 c 0,3.43 0,5.375 -0.556,6.857 1.9,0.742 4.262,1.158 7.09,1.158 1.807,0 7.043,0 9.869,-5.791 1.344,-2.688 1.807,-6.303 1.807,-9.037 0,-1.668 -0.186,-5.328 -1.529,-7.646 -1.296,-2.176 -3.382,-3.289 -5.605,-3.289 -4.449,0 -5.746,3.707 -6.44,5.607 0,-2.363 0.045,-10.611 0.415,-14.828 -3.011,1.391 -4.866,1.621 -6.857,1.807 1.807,0.74 1.807,3.801 1.807,13.764 v 11.398"
+ id="path37"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ i:knockout="Off"
+ d="m 66.535,143.855 c -0.928,-0.139 -1.578,-0.232 -2.922,-0.232 -1.48,0 -2.502,0.094 -3.566,0.232 0.463,-0.881 0.648,-1.299 0.787,-4.309 0.186,-4.125 0.232,-15.154 -0.092,-17.471 -0.232,-1.762 -0.648,-2.039 -1.297,-2.502 3.799,-0.371 4.865,-0.648 6.625,-1.482 -0.369,2.037 -0.418,3.059 -0.418,6.162 -0.091,15.989 -0.138,17.702 0.883,19.602"
+ id="path39"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ i:knockout="Off"
+ d="m 81.373,130.74 c -0.092,2.92 -0.139,4.959 -0.928,6.58 -0.973,2.086 -2.594,2.688 -3.799,2.688 -2.783,0 -3.383,-2.316 -3.383,-4.586 0,-4.355 3.893,-4.682 5.652,-4.682 h 2.458 z m -12.744,5.701 c 0,2.92 0.881,5.838 3.477,7.09 1.158,0.51 2.316,0.51 2.688,0.51 4.264,0 5.699,-3.152 6.58,-5.098 -0.047,2.039 0,3.289 0.139,4.912 0.834,-0.047 1.668,-0.139 3.059,-0.139 0.787,0 1.529,0.092 2.316,0.139 -0.51,-0.787 -0.787,-1.252 -0.928,-3.059 -0.092,-1.76 -0.092,-3.521 -0.092,-5.977 l 0.047,-9.453 c 0,-3.523 -0.928,-6.998 -7.879,-6.998 -4.586,0 -7.273,1.391 -8.617,2.086 0.557,1.02 1.02,1.898 1.436,3.893 1.809,-1.576 4.172,-2.41 6.58,-2.41 3.848,0 3.848,2.549 3.848,6.162 -0.881,-0.045 -1.623,-0.137 -2.875,-0.137 -5.887,10e-4 -9.779,2.268 -9.779,8.479"
+ id="path41"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ i:knockout="Off"
+ d="m 108.063,139.268 c 0.047,1.576 0.047,3.244 0.695,4.588 -1.021,-0.092 -1.623,-0.232 -3.521,-0.232 -1.113,0 -1.715,0.094 -2.596,0.232 0.184,-0.602 0.279,-0.834 0.371,-1.623 0.139,-1.064 0.232,-4.633 0.232,-5.885 v -5.004 c 0,-2.178 0,-5.33 -0.141,-6.441 -0.092,-0.787 -0.322,-2.918 -3.012,-2.918 -2.641,0 -3.521,1.945 -3.846,3.521 -0.369,1.621 -0.369,3.383 -0.369,10.24 0.045,5.932 0.045,6.486 0.508,8.109 -0.787,-0.092 -1.76,-0.184 -3.15,-0.184 -1.113,0 -1.854,0.045 -2.779,0.184 0.324,-0.742 0.51,-1.113 0.602,-3.707 0.094,-2.549 0.279,-15.061 -0.141,-18.025 -0.23,-1.809 -0.695,-2.225 -1.203,-2.688 3.754,-0.186 4.957,-0.789 6.117,-1.389 v 4.91 c 0.555,-1.438 1.713,-4.635 6.348,-4.635 5.793,0 5.838,4.217 5.885,6.996 v 13.951"
+ id="path43"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ i:knockout="Off"
+ d="m 66.926,111.533 -3.838,3.836 -3.836,-3.836 3.836,-3.836 3.838,3.836"
+ id="path45"
+ inkscape:connector-curvature="0"
+ style="fill:#a80030" /></g><text
+ sodipodi:linespacing="125%"
+ id="text4101"
+ y="113.59251"
+ x="189.35947"
+ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+ xml:space="preserve"><tspan
+ y="113.59251"
+ x="189.35947"
+ id="tspan4103"
+ sodipodi:role="line">from</tspan></text>
+</g></svg>
\ No newline at end of file
diff --git a/debian/kodi-logo.xcf b/debian/kodi-logo.xcf
deleted file mode 100644
index 3db18c2..0000000
Binary files a/debian/kodi-logo.xcf and /dev/null differ
diff --git a/debian/rules b/debian/rules
index 6a023ea..60cb8f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,9 +118,8 @@ override_dh_auto_configure: configure
$(CURDIR)/media/Fonts/arial.ttf
./bootstrap
./configure $(KODI_CONFIG_OPTIONS)
- # Add Debian related notes to Kodi's original logo
- mkdir -p $(CURDIR)/debian/tmp/home/user
- HOME=$(CURDIR)/debian/tmp/home/user gimp -i -b '(load "debian/xcf2png.scm") (xcf2png "debian/kodi-logo.xcf" "addons/skin.confluence/media/kodi-logo.png") (gimp-quit 0)'
+ # Add "from Debian" next to Kodi's original logo
+ inkscape -z --export-png=addons/skin.confluence/media/from-debian-logo.png debian/from-debian-logo.svg
override_dh_auto_install:
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 927902c..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/kodi-logo.xcf
diff --git a/debian/xcf2png.scm b/debian/xcf2png.scm
deleted file mode 100644
index c8a7443..0000000
--- a/debian/xcf2png.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-; based on http://stackoverflow.com/questions/5794640/how-to-convert-xcf-to-png-using-gimp-from-the-command-line
-(define (xcf2png from to)
- (let* ((image 0) (layer 0))
- (set! image (car (gimp-file-load RUN-NONINTERACTIVE from from)))
- (set! layer (car (gimp-image-merge-visible-layers image CLIP-TO-IMAGE)))
- (gimp-file-save RUN-NONINTERACTIVE image layer to to)
- )
- )
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list