Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

3 files changed, 34 insertions, 33 deletions

diff --git a/extra/fusion-icon/.footprint b/extra/fusion-icon/.footprint
index 68bee8b0f..edbe99faa 100755
--- a/extra/fusion-icon/.footprint
+++ b/extra/fusion-icon/.footprint
@@ -2,36 +2,36 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/fusion-icon
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/FusionIcon/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/data.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/data.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/environment.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/environment.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/execute.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/execute.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface.pyc
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_gtk/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_gtk/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_gtk/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_gtk/main.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_gtk/main.pyc
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_qt4/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_qt4/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_qt4/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_qt4/main.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/interface_qt4/main.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/parser.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/parser.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/start.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/start.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/util.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/FusionIcon/util.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/fusion_icon-0.1.0-py2.6.egg-info
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/FusionIcon/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/data.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/data.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/environment.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/environment.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/execute.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/execute.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_gtk/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_gtk/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_gtk/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_gtk/main.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_gtk/main.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_qt4/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_qt4/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_qt4/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_qt4/main.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/interface_qt4/main.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/parser.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/parser.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/start.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/start.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/util.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/FusionIcon/util.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/fusion_icon-0.1.0-py2.7.egg-info
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/fusion-icon.desktop
diff --git a/extra/fusion-icon/Pkgfile b/extra/fusion-icon/Pkgfile
index e2b2f4df6..b7a04d60e 100755
--- a/extra/fusion-icon/Pkgfile
+++ b/extra/fusion-icon/Pkgfile
@@ -3,14 +3,15 @@
 # Maintainer: NuTyX core team
 # Packager: tux03 at tuxfamily dot org
 # Depends on: xorg-xvinfo
+
 name=fusion-icon
 version=0.1.0
 release=1
-group=
+
 source=(http://ftp.de.debian.org/debian/pool/main/f/fusion-icon/fusion-icon_0.1.0.orig.tar.gz)
 build() {
-cd $name-$version
-       python setup.py build install --root=$PKG 
+	cd $name-$version
+       	python2 setup.py build install --root=$PKG 
 }
 
   
diff --git a/extra/python-numpy/.Pkgfile.swp b/extra/python-numpy/.Pkgfile.swp
deleted file mode 100644
index b2ffb46e4..000000000
--- a/extra/python-numpy/.Pkgfile.swp
+++ /dev/null