Merge remote branch 'nutyx-2009/master'

9 files changed, 42 insertions, 139 deletions

diff --git a/extra/isomaster/.footprint b/extra/isomaster/.footprint
index b12a30d1e..eeef62416 100644
--- a/extra/isomaster/.footprint
+++ b/extra/isomaster/.footprint
@@ -1,25 +1,45 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/local/
-drwxr-xr-x	root/root	usr/local/bin/
--rwxr-xr-x	root/root	usr/local/bin/isomaster
-drwxr-xr-x	root/root	usr/local/share/
-drwxr-xr-x	root/root	usr/local/share/applications/
--rw-r--r--	root/root	usr/local/share/applications/isomaster.desktop
-drwxr-xr-x	root/root	usr/local/share/isomaster/
-drwxr-xr-x	root/root	usr/local/share/isomaster/icons/
--rw-r--r--	root/root	usr/local/share/isomaster/icons/add2-kearone.png
--rw-r--r--	root/root	usr/local/share/isomaster/icons/delete-kearone.png
--rw-r--r--	root/root	usr/local/share/isomaster/icons/extract2-kearone.png
--rw-r--r--	root/root	usr/local/share/isomaster/icons/folder-new-kearone.png
--rw-r--r--	root/root	usr/local/share/isomaster/icons/go-back-kearone.png
--rw-r--r--	root/root	usr/local/share/isomaster/icons/isomaster.png
-drwxr-xr-x	root/root	usr/local/share/locale/
-drwxr-xr-x	root/root	usr/local/share/locale/fr/
-drwxr-xr-x	root/root	usr/local/share/locale/fr/LC_MESSAGES/
--rw-r--r--	root/root	usr/local/share/locale/fr/LC_MESSAGES/isomaster.mo
-drwxr-xr-x	root/root	usr/local/share/man/
-drwxr-xr-x	root/root	usr/local/share/man/man1/
--rw-r--r--	root/root	usr/local/share/man/man1/isomaster.1.gz
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/isomaster
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/isomaster.desktop
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/bkisofs/
+-rw-r--r--	root/root	usr/share/doc/bkisofs/book1.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/c589.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/c713.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/c73.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/c9.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x153.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x23.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x240.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x313.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x32.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x343.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x377.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x390.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x492.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x613.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x620.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x634.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x641.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x653.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x674.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x69.html
+-rw-r--r--	root/root	usr/share/doc/bkisofs/x95.html
+drwxr-xr-x	root/root	usr/share/isomaster/
+drwxr-xr-x	root/root	usr/share/isomaster/icons/
+-rw-r--r--	root/root	usr/share/isomaster/icons/add2-kearone.png
+-rw-r--r--	root/root	usr/share/isomaster/icons/delete-kearone.png
+-rw-r--r--	root/root	usr/share/isomaster/icons/extract2-kearone.png
+-rw-r--r--	root/root	usr/share/isomaster/icons/folder-new-kearone.png
+-rw-r--r--	root/root	usr/share/isomaster/icons/go-back-kearone.png
+-rw-r--r--	root/root	usr/share/isomaster/icons/isomaster.png
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/fr/
+drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/isomaster.mo
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/isomaster.1.gz
diff --git a/extra/isomaster/Pkgfile b/extra/isomaster/Pkgfile
index 74cf3ad99..b8cfdc036 100644
--- a/extra/isomaster/Pkgfile
+++ b/extra/isomaster/Pkgfile
@@ -13,7 +13,7 @@ build() {
 	cd $name-$version
         ./configure --prefix=/usr
         make
-        make DESTDIR=$PKG install
+        make PREFIX=/usr DESTDIR=$PKG install
 	install -D -m 644 ../$name.desktop \
 	$PKG/usr/share/applications/$name.desktop
 }
diff --git a/extra/microdia/.footprint b/extra/microdia/.footprint
deleted file mode 100644
index 111e2fa58..000000000
--- a/extra/microdia/.footprint
+++ /dev/null
@@ -1,9 +0,0 @@
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/modules/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/media/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/media/video/
-drwxr-xr-x	root/root	lib/modules/<kernel-version>/kernel/drivers/media/video/videousb/
--rw-r--r--	root/root	lib/modules/<kernel-version>/kernel/drivers/media/video/videousb/sn9c20x.ko
diff --git a/extra/microdia/.md5sum b/extra/microdia/.md5sum
deleted file mode 100644
index e69de29bb..000000000
--- a/extra/microdia/.md5sum
+++ /dev/null
diff --git a/extra/microdia/Pkgfile b/extra/microdia/Pkgfile
deleted file mode 100644
index 0450e9950..000000000
--- a/extra/microdia/Pkgfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Description:microdia webcams
-# URL: http://wiki.archlinux.fr/howto:materiel:microdia
-# Maintainer: NuTyX core team
-# Packager: thierryn1 at hispeed dot ch
-# Depends on: ctags
-
-name=microdia
-version=20091122
-release=1
-_kernver=`uname -r`
-source=()
-
-
-
-build() {
-        git clone http://repo.or.cz/r/microdia.git
-	cd $name
-	sed -i -e "s/KERNEL_VERSION = .*/KERNEL_VERSION = ${_kernver}/" Makefile
-	make KVER=${_kernver}
-	mkdir -p $PKG/lib/modules/${_kernver}/kernel/drivers/media/video/videousb
-	cp sn9c20x.ko \
-	$PKG/lib/modules/${_kernver}/kernel/drivers/media/video/videousb/
-}
diff --git a/extra/microdia/post-install b/extra/microdia/post-install
deleted file mode 100644
index 81a8d1263..000000000
--- a/extra/microdia/post-install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# MAJ modules
-depmod
-# Ajout du module dans /etc/sysconfig/modules
-if ! grep "sn9c20x" /etc/sysconfig/modules >/dev/null; then
-        sed -i '/End/ i sn9c20x' /etc/sysconfig/modules
-fi
-
diff --git a/extra/python-qscintilla/.footprint b/extra/python-qscintilla/.footprint
deleted file mode 100644
index a1d7b2823..000000000
--- a/extra/python-qscintilla/.footprint
+++ /dev/null
@@ -1,60 +0,0 @@
-drwxr-xr-x	root/root	usr/
-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/PyQt4/
--rwxr-xr-x	root/root	usr/lib/python2.6/site-packages/PyQt4/Qsci.so
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/qt/
-drwxr-xr-x	root/root	usr/share/qt/qsci/
-drwxr-xr-x	root/root	usr/share/qt/qsci/api/
-drwxr-xr-x	root/root	usr/share/qt/qsci/api/python/
--rw-r--r--	root/root	usr/share/qt/qsci/api/python/QScintilla2.api
-drwxr-xr-x	root/root	usr/share/sip/
-drwxr-xr-x	root/root	usr/share/sip/Qsci/
--rw-r--r--	root/root	usr/share/sip/Qsci/qsciabstractapis.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qsciapis.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscicommand.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscicommandset.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscidocument.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexer.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerbash.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerbatch.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercmake.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercpp.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercsharp.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercss.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexercustom.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerd.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerdiff.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerfortran.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerfortran77.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerhtml.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeridl.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerjava.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerjavascript.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerlua.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexermakefile.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpascal.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerperl.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpostscript.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpov.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerproperties.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerpython.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerruby.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexersql.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexertcl.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexertex.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexervhdl.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexerxml.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscilexeryaml.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscimacro.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscimod3.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscimod4.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscimodcommon.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qsciprinter.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintilla.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintillabase3.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qsciscintillabase4.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscistyle.sip
--rw-r--r--	root/root	usr/share/sip/Qsci/qscistyledtext.sip
diff --git a/extra/python-qscintilla/.md5sum b/extra/python-qscintilla/.md5sum
deleted file mode 100644
index 7db981a45..000000000
--- a/extra/python-qscintilla/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz
diff --git a/extra/python-qscintilla/Pkgfile b/extra/python-qscintilla/Pkgfile
deleted file mode 100644
index 3e7b2de27..000000000
--- a/extra/python-qscintilla/Pkgfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Description: Bibliotheque QScintilla pour Python
-# URL: http://www.riverbankcomputing.com
-# Maintainer: NuTyX packager team
-# Packager: lesibel at free dot fr
-# Depends on: pyqt, qscintilla
-
-name=python-qscintilla
-version=2.4
-release=1
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$version.tar.gz)
-build() {
-	cd QScintilla-gpl-$version/Python
-	python configure.py
-	make
-	make DESTDIR=$PKG install
-}