Merge remote branch 'nutyx-2009/master'

10 files changed, 185 insertions, 7 deletions

diff --git a/base/jdk/.footprint b/base/jdk/.footprint
index 5df3c8dfa..5eba8d93f 100644
--- a/base/jdk/.footprint
+++ b/base/jdk/.footprint
@@ -1492,6 +1492,10 @@ drwxr-xr-x	root/root	opt/jdk/lib/visualvm/visualvm/update_tracking/
 -rw-r--r--	root/root	opt/jdk/lib/visualvm/visualvm/update_tracking/com-sun-tools-visualvm-tools.xml
 -rw-r--r--	root/root	opt/jdk/src.zip
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/firefox/
+drwxr-xr-x	root/root	usr/lib/firefox/plugins/
+lrwxrwxrwx	root/root	usr/lib/firefox/plugins/libnpjp2.so -> /opt/jdk/jre/lib/i386/libnpjp2.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile
index a500373d2..abdc1fa78 100644
--- a/base/jdk/Pkgfile
+++ b/base/jdk/Pkgfile
@@ -2,11 +2,10 @@
 # URL: http://java.sun.com/javase/downloads/index.jsp
 # Maintainer: NuTyX coreteam
 # Packager: thierryn1 at hispeed dot ch
-# Depends on:
 
 name=jdk
 version=6u18
-release=1
+release=2
 [ "`uname -m`" == "i686"   ] && _ARCH=i586
 [ "`uname -m`" == "x86_64"   ] && _ARCH=amd64
 
@@ -41,4 +40,11 @@ build() {
 	$PKG/usr/share/man/man1/
 	rm -r $PKG/opt/jdk/jre/man
 	rm -r $PKG/usr/share/man/ja*
+	# Installation du plugin
+	mkdir -p $PKG/usr/lib/firefox/plugins
+	if [ ${_ARCH} = "i586" ]; then
+		ln -s /opt/jdk/jre/lib/i386/libnpjp2.so $PKG/usr/lib/firefox/plugins
+	else
+		ln -s /opt/jdk/jre/lib/amd64/libnpjp2.so $PKG/usr/lib/firefox/plugins
+	fi
 }
diff --git a/base/virtuoso/.footprint b/base/virtuoso/.footprint
index 8ad599c9a..e53198295 100644
--- a/base/virtuoso/.footprint
+++ b/base/virtuoso/.footprint
@@ -1,7 +1,6 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/inifile
--rwxr-xr-x	root/root	usr/bin/isql
 -rwxr-xr-x	root/root	usr/bin/isqlw
 -rwxr-xr-x	root/root	usr/bin/virt_mail
 -rwxr-xr-x	root/root	usr/bin/virtuoso-t
diff --git a/base/virtuoso/Pkgfile b/base/virtuoso/Pkgfile
index 8bd103933..1fdd91dfa 100755
--- a/base/virtuoso/Pkgfile
+++ b/base/virtuoso/Pkgfile
@@ -5,7 +5,7 @@
 
 name=virtuoso
 version=6.1.0
-release=1
+release=2
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-opensource-$version.tar.gz)
 build() {
 	cd $name-opensource-$version
@@ -17,5 +17,6 @@ build() {
     		    --disable-all-vads
 	make
 	make DESTDIR=$PKG install
+	rm -r $PKG/usr/bin/isql
 }
 
diff --git a/extra/comix/.footprint b/extra/comix/.footprint
new file mode 100644
index 000000000..6d898327a
--- /dev/null
+++ b/extra/comix/.footprint
@@ -0,0 +1,129 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/gconf/
+drwxr-xr-x	root/root	etc/gconf/schemas/
+-rw-r--r--	root/root	etc/gconf/schemas/comicbook.schemas
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+lrwxrwxrwx	root/root	usr/bin/comix -> ../share/comix/src/comix.py
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
+-rw-r--r--	root/root	usr/share/applications/comix.desktop
+drwxr-xr-x	root/root	usr/share/comix/
+drwxr-xr-x	root/root	usr/share/comix/images/
+drwxr-xr-x	root/root	usr/share/comix/images/16x16/
+-rw-r--r--	root/root	usr/share/comix/images/16x16/comix.png
+-rw-r--r--	root/root	usr/share/comix/images/comix.svg
+-rw-r--r--	root/root	usr/share/comix/images/comments.png
+-rw-r--r--	root/root	usr/share/comix/images/double-page.png
+-rw-r--r--	root/root	usr/share/comix/images/fitbest.png
+-rw-r--r--	root/root	usr/share/comix/images/fitheight.png
+-rw-r--r--	root/root	usr/share/comix/images/fitmanual.png
+-rw-r--r--	root/root	usr/share/comix/images/fitwidth.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-flip-horizontal.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-flip-vertical.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-rotate-180.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-rotate-270.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-rotate-90.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-thumbnails.png
+-rw-r--r--	root/root	usr/share/comix/images/gimp-transform.png
+-rw-r--r--	root/root	usr/share/comix/images/lens.png
+-rw-r--r--	root/root	usr/share/comix/images/library.png
+-rw-r--r--	root/root	usr/share/comix/images/manga.png
+-rw-r--r--	root/root	usr/share/comix/images/tango-add-bookmark.png
+-rw-r--r--	root/root	usr/share/comix/images/tango-archive.png
+-rw-r--r--	root/root	usr/share/comix/images/tango-enhance-image.png
+-rw-r--r--	root/root	usr/share/comix/images/tango-image.png
+-rw-r--r--	root/root	usr/share/comix/images/zoom.png
+drwxr-xr-x	root/root	usr/share/comix/src/
+-rw-r--r--	root/root	usr/share/comix/src/about.py
+-rw-r--r--	root/root	usr/share/comix/src/about.pyc
+-rw-r--r--	root/root	usr/share/comix/src/archive.py
+-rw-r--r--	root/root	usr/share/comix/src/archive.pyc
+-rw-r--r--	root/root	usr/share/comix/src/bookmark.py
+-rw-r--r--	root/root	usr/share/comix/src/bookmark.pyc
+-rwxr-xr-x	root/root	usr/share/comix/src/comix.py
+-rw-r--r--	root/root	usr/share/comix/src/comment.py
+-rw-r--r--	root/root	usr/share/comix/src/comment.pyc
+-rw-r--r--	root/root	usr/share/comix/src/constants.py
+-rw-r--r--	root/root	usr/share/comix/src/constants.pyc
+-rw-r--r--	root/root	usr/share/comix/src/cursor.py
+-rw-r--r--	root/root	usr/share/comix/src/cursor.pyc
+-rw-r--r--	root/root	usr/share/comix/src/deprecated.py
+-rw-r--r--	root/root	usr/share/comix/src/deprecated.pyc
+-rw-r--r--	root/root	usr/share/comix/src/edit.py
+-rw-r--r--	root/root	usr/share/comix/src/edit.pyc
+-rw-r--r--	root/root	usr/share/comix/src/encoding.py
+-rw-r--r--	root/root	usr/share/comix/src/encoding.pyc
+-rw-r--r--	root/root	usr/share/comix/src/enhance.py
+-rw-r--r--	root/root	usr/share/comix/src/enhance.pyc
+-rw-r--r--	root/root	usr/share/comix/src/event.py
+-rw-r--r--	root/root	usr/share/comix/src/event.pyc
+-rw-r--r--	root/root	usr/share/comix/src/filechooser.py
+-rw-r--r--	root/root	usr/share/comix/src/filechooser.pyc
+-rw-r--r--	root/root	usr/share/comix/src/filehandler.py
+-rw-r--r--	root/root	usr/share/comix/src/filehandler.pyc
+-rw-r--r--	root/root	usr/share/comix/src/histogram.py
+-rw-r--r--	root/root	usr/share/comix/src/histogram.pyc
+-rw-r--r--	root/root	usr/share/comix/src/icons.py
+-rw-r--r--	root/root	usr/share/comix/src/icons.pyc
+-rw-r--r--	root/root	usr/share/comix/src/image.py
+-rw-r--r--	root/root	usr/share/comix/src/image.pyc
+-rw-r--r--	root/root	usr/share/comix/src/labels.py
+-rw-r--r--	root/root	usr/share/comix/src/labels.pyc
+-rw-r--r--	root/root	usr/share/comix/src/lens.py
+-rw-r--r--	root/root	usr/share/comix/src/lens.pyc
+-rw-r--r--	root/root	usr/share/comix/src/library.py
+-rw-r--r--	root/root	usr/share/comix/src/library.pyc
+-rw-r--r--	root/root	usr/share/comix/src/librarybackend.py
+-rw-r--r--	root/root	usr/share/comix/src/librarybackend.pyc
+-rw-r--r--	root/root	usr/share/comix/src/main.py
+-rw-r--r--	root/root	usr/share/comix/src/main.pyc
+-rw-r--r--	root/root	usr/share/comix/src/portability.py
+-rw-r--r--	root/root	usr/share/comix/src/portability.pyc
+-rw-r--r--	root/root	usr/share/comix/src/preferences.py
+-rw-r--r--	root/root	usr/share/comix/src/preferences.pyc
+-rw-r--r--	root/root	usr/share/comix/src/process.py
+-rw-r--r--	root/root	usr/share/comix/src/process.pyc
+-rw-r--r--	root/root	usr/share/comix/src/properties.py
+-rw-r--r--	root/root	usr/share/comix/src/properties.pyc
+-rw-r--r--	root/root	usr/share/comix/src/recent.py
+-rw-r--r--	root/root	usr/share/comix/src/recent.pyc
+-rw-r--r--	root/root	usr/share/comix/src/slideshow.py
+-rw-r--r--	root/root	usr/share/comix/src/slideshow.pyc
+-rw-r--r--	root/root	usr/share/comix/src/status.py
+-rw-r--r--	root/root	usr/share/comix/src/status.pyc
+-rw-r--r--	root/root	usr/share/comix/src/thumbbar.py
+-rw-r--r--	root/root	usr/share/comix/src/thumbbar.pyc
+-rw-r--r--	root/root	usr/share/comix/src/thumbnail.py
+-rw-r--r--	root/root	usr/share/comix/src/thumbnail.pyc
+-rw-r--r--	root/root	usr/share/comix/src/thumbremover.py
+-rw-r--r--	root/root	usr/share/comix/src/thumbremover.pyc
+-rw-r--r--	root/root	usr/share/comix/src/ui.py
+-rw-r--r--	root/root	usr/share/comix/src/ui.pyc
+drwxr-xr-x	root/root	usr/share/icons/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/comix.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/comix.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/24x24/apps/comix.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/comix.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/comix.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/comix.svg
+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/comix.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/comix.1.gz
diff --git a/extra/comix/.md5sum b/extra/comix/.md5sum
new file mode 100644
index 000000000..5fc039c07
--- /dev/null
+++ b/extra/comix/.md5sum
@@ -0,0 +1 @@
+029227a77b122f7080ee0280d41bee78  comix-4.0.4.tar.gz
diff --git a/extra/comix/Pkgfile b/extra/comix/Pkgfile
new file mode 100644
index 000000000..b004ae299
--- /dev/null
+++ b/extra/comix/Pkgfile
@@ -0,0 +1,18 @@
+# Description: Visionneur de bandes dessinée
+# URL: http://comix.sourceforge.net
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: pygtk, pil, unrar, xdg-utils, gconf
+
+name=comix
+version=4.0.4
+release=1
+source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+
+build() {
+	cd $name-$version
+	mkdir -p $PKG/usr
+	python install.py install --no-mime --dir $PKG/usr
+	install -D -m644 mime/comicbook.schemas \
+	$PKG/etc/gconf/schemas/comicbook.schemas
+}
diff --git a/extra/comix/post-install b/extra/comix/post-install
new file mode 100755
index 000000000..073764cba
--- /dev/null
+++ b/extra/comix/post-install
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+port=comix
+
+# gconf schemas
+SCHEMAS="`pkginfo -l $port | grep etc/gconf/schemas/.*\.schemas$`"
+
+for SCHEMA in $SCHEMAS
+do
+	export GCONF_CONFIG_SOURCE=`$GNOME_PREFIX/bin/gconftool-2 --get-default-source`
+	$GNOME_PREFIX/bin/gconftool-2 --makefile-install-rule /$SCHEMA > /dev/null
+done
+
+# reload gconf caches
+if [ ! -z "`pidof gconfd-2`" ]
+then
+	killall -HUP gconfd-2 > /dev/null
+fi
+
+# End of file
diff --git a/extra/cover-thumbnailer/.footprint b/extra/cover-thumbnailer/.footprint
index c917f912a..5826c1804 100644
--- a/extra/cover-thumbnailer/.footprint
+++ b/extra/cover-thumbnailer/.footprint
@@ -8,7 +8,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cover-thumbnailer-gui
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
--rw-r--r--	root/root	usr/share/cover-thumbnailer-gui.desktop
+-rw-r--r--	root/root	usr/share/applications/cover-thumbnailer-gui.desktop
 drwxr-xr-x	root/root	usr/share/cover-thumbnailer/
 -rw-r--r--	root/root	usr/share/cover-thumbnailer/cover-thumbnailer-gui.glade
 -rw-r--r--	root/root	usr/share/cover-thumbnailer/icon.png
diff --git a/extra/cover-thumbnailer/Pkgfile b/extra/cover-thumbnailer/Pkgfile
index dc95c514f..e681ea088 100644
--- a/extra/cover-thumbnailer/Pkgfile
+++ b/extra/cover-thumbnailer/Pkgfile
@@ -6,7 +6,7 @@
 
 name=cover-thumbnailer
 version=0.7
-release=1
+release=2
 source=(http://download.flogisoft.com/files/Software/Cover_thumbnailer/${name}_${version}_src.tar.gz)
 
 build() {
@@ -25,7 +25,7 @@ build() {
 	#man
 	cp ./man/* $PKG/usr/share/man/man1/
 	#.desktop
-	cp ./freedesktop/* $PKG/usr/share/
+	cp ./freedesktop/* $PKG/usr/share/applications
 	#locale
 	cp ./locale/fr.mo $PKG/usr/share/locale/fr/LC_MESSAGES/cover-thumbnailer-gui.mo
 	#doc