Packaging files for opie-vlc

diff --git a/ipkg/control b/ipkg/control
index f8a8c3eab6f8bee438e8fb09434aba4ef75044e0..ef945cf3f7639e6ad817365a1e749c5d0f8a4457 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -4,6 +4,7 @@ Priority: optional
 Version: 0.4.6
 Release: 1
 Architecture: arm
+Conflicts: task-opie, gpe
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
 Depends: libc6, task-x, sdl, libgtk1.2
 Copyright: GPL

diff --git a/ipkg/control.gpe b/ipkg/control.gpe
index 3f082aba29f6b004b9bc450b5ad7f24280058414..6b21a4a94f302453703a18c9218276787913ad31 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -3,7 +3,7 @@ Section: graphics
 Priority: optional
 Version: 0.4.6
 Release: 1
-Conflicts: opie
+Conflicts: task-opie, vlc
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
 Depends: gpe, libc6, libsdl, libgpewidget0, libgtk1.2 

diff --git a/ipkg/control.opie b/ipkg/control.opie
index 1ef0af3b485fd28172f61069756399941d636428..338a8cc6f59fe178c7b4a2c991667755e4b8f2b8 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -2,8 +2,8 @@ Package: opie-vlc
 Section: graphics
 Priority: optional
 Version: 0.4.6
-Release: 1
-Conflicts: gpe
+Release: 2
+Conflicts: gpe, vlc
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
 Depends: libc6, task-opie

diff --git a/ipkg/postinst.opie b/ipkg/postinst.opie
index 2c584984771abba1ee1ca2bc2034f704698b3f25..90b9b243642d065235f820cc45fa1e76ecc17ac1 100755 (executable)
--- a/ipkg/postinst.opie
+++ b/ipkg/postinst.opie
@@ -4,7 +4,7 @@ if [ -x /usr/share/videolan ] ; then
    ln -s /usr/share/videolan /opt/QtPalmtop/pics/videolan
 fi
 # Added support for iPaq 3870
-if [ -x /usr/local/qt-embedded/lib/fonts/fontdir ] ;
+if [ -x /usr/local/qt-embedded/lib/fonts/fontdir ] ; then
    ln -s /usr/local/qt-embedded/lib/fonts/fontdir  /opt/QtPalmtop/lib/fonts/fontdir
 fi
 exit 0

diff --git a/ipkg/vlc.opie b/ipkg/vlc.opie
index 17b9b299925a5cc3f5c8b9813ebdf4259eabe70f..95ebedebc4d5fdd45bc1ea3270e30a862722bd0b 100755 (executable)
--- a/ipkg/vlc.opie
+++ b/ipkg/vlc.opie
@@ -1,4 +1,9 @@
 #!/bin/sh
 export QTDIR=/opt/QtPalmtop
 export LD_LIBRARY_PATH=.:/usr/X11R6/lib:/opt/QtPalmtop/lib:/usr/lib/videolan/vlc
-/usr/bin/vlc udp://@:1234
+if [ "$*" = "" ] ; then
+   /usr/bin/vlc udp://@:1234
+else
+   /usr/bin/vlc $*
+fi
+