[Pkg-mozext-commits] [firetray] 01/84: * update preferences-system.svg for DFSG-compatibility * add check for loglevel in Makefile

[David Prévot]

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

taffit pushed a commit to branch master
in repository firetray.

commit 1c76f1c1f94681af1ca5421cd140cef224fb57e5
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Nov 6 22:23:36 2013 +0100

    * update preferences-system.svg for DFSG-compatibility
    * add check for loglevel in Makefile
---
 src/Makefile                           | 13 +++++++-----
 src/chrome/skin/preferences-system.svg | 38 ++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index d14cda9..968aa76 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -133,7 +133,7 @@ xpi_includes := $(license) \
 build_includes := $(foreach f,$(xpi_includes),$(build_dir)/$(f))
 
 
-$(xpi_built): check_version $(build_dir) $(build_includes)
+$(xpi_built): check_version check_loglevel $(build_dir) $(build_includes)
 	@echo "Creating XPI file."
 	@cd $(build_dir); $(ZIP) $(xpi_file) $(xpi_includes)
 	@echo "Creating XPI file. Done!"
@@ -189,11 +189,14 @@ clean_build:
 	@echo "Removing build dirs: $(build_dir)*"
 	@rm -rf $(build_dir)*
 
-# Version fetched from install.rdf
-const_file := modules/commons.js
-
 VERSION_HARD_CODED := $(shell awk -F\" '/const\W+FIRETRAY_VERSION/ \
-  { print $$2}' $(const_file))
+  {print $$2}' modules/commons.js)
 check_version:
 	@echo "checking version consistency"
 	@[ "$(VERSION)" = "$(VERSION_HARD_CODED)" ]
+
+FIRETRAY_LOG_LEVEL := $(shell awk -F\" '/const\W+FIRETRAY_LOG_LEVEL/ \
+  {print $$2}' modules/logging.jsm)
+check_loglevel:
+	@echo "checking loglevel"
+	@[ "Warn" = "$(FIRETRAY_LOG_LEVEL)" ]
diff --git a/src/chrome/skin/preferences-system.svg b/src/chrome/skin/preferences-system.svg
index a6183e8..d41028f 100644
--- a/src/chrome/skin/preferences-system.svg
+++ b/src/chrome/skin/preferences-system.svg
@@ -2,12 +2,12 @@
 <!-- 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"
    inkscape:export-ydpi="90.000000"
    inkscape:export-xdpi="90.000000"
@@ -16,11 +16,19 @@
    height="48px"
    id="svg11300"
    sodipodi:version="0.32"
-   inkscape:version="0.43+devel"
+   inkscape:version="0.46"
    sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/categories"
-   sodipodi:docname="preferences-system.svg">
+   sodipodi:docname="preferences-system.svg"
+   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="perspective60" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient2250">
@@ -251,9 +259,9 @@
      inkscape:document-units="px"
      inkscape:showpageshadow="false"
      inkscape:window-width="1034"
-     inkscape:window-height="1010"
-     inkscape:window-x="296"
-     inkscape:window-y="83" />
+     inkscape:window-height="818"
+     inkscape:window-x="400"
+     inkscape:window-y="30" />
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -269,7 +277,7 @@
         </dc:creator>
         <dc:source>http://jimmac.musichall.cz</dc:source>
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
         <dc:title>Preferences System</dc:title>
         <dc:subject>
           <rdf:Bag>
@@ -282,19 +290,13 @@
         </dc:subject>
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+         rdf:about="http://creativecommons.org/licenses/publicdomain/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           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-mozext/firetray.git