Merge branch 'master' of github.com:pisilinux/main

util/misc/ibus/pspec.xml

@@ -26,6 +26,8 @@
             <Dependency>iso-codes</Dependency>
             <Dependency>libxslt</Dependency>
             <Dependency>gtk-doc</Dependency>
+            <Dependency>nodejs</Dependency>
+            <Dependency>json-glib-devel</Dependency>
             <Dependency>gobject-introspection-devel</Dependency>
             <Dependency>docbook-xsl</Dependency>
         </BuildDependencies>
@@ -40,6 +42,7 @@
             <Dependency>gtk2</Dependency>
             <Dependency>gtk3</Dependency>
             <Dependency>cairo</Dependency>
+            <Dependency>json-glib</Dependency>
             <!--Dependency>gconf</Dependency-->
             <Dependency>libXi</Dependency>
             <Dependency>pango</Dependency>

util/misc/pugixml/actions.py

@@ -7,7 +7,7 @@ from pisi.actionsapi import cmaketools
 from pisi.actionsapi import get
 from pisi.actionsapi import shelltools
 
-WorkDir = "pugixml-1.7/scripts"
+#WorkDir = "pugixml-1.8/scripts"
 
 def setup():    
     cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \

util/misc/strace/actions.py

@@ -21,4 +21,4 @@ def check():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("ChangeLog", "CREDITS", "NEWS", "README", "README-linux",)
+    pisitools.dodoc("ChangeLog", "CREDITS", "NEWS", "README", "README-linux-ptrace",)