Packaging for Opie and Qt Embedded support.

diff --git a/ipkg/control.gpe b/ipkg/control.gpe
index a592a5ba5738b2a18785ab2d382dfc446f4d4648..3f082aba29f6b004b9bc450b5ad7f24280058414 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -1,8 +1,9 @@
-Package: vlc
+Package: gpe-vlc
 Section: graphics
 Priority: optional
 Version: 0.4.6
 Release: 1
+Conflicts: opie
 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 7cd9d21c0468384a8bf6bdbfc4f8df0098d48292..1ef0af3b485fd28172f61069756399941d636428 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -1,8 +1,9 @@
-Package: vlc
+Package: opie-vlc
 Section: graphics
 Priority: optional
 Version: 0.4.6
 Release: 1
+Conflicts: gpe
 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 253d06583c87621ba16c586f80edae23cf56f160..f2bb784c0733329dc4866764e0c44f134350f2fd 100755 (executable)
--- a/ipkg/postinst.opie
+++ b/ipkg/postinst.opie
@@ -1,6 +1,6 @@
 #!/bin/sh
 ldconfig
-if [ -x /usr/share/vlc ] ; then
-   ln -s /usr/share/vlc /opt/QtPalmtop/pics/vlc
+if [ -x /usr/share/videolan ] ; then
+   ln -s /usr/share/videolan /opt/QtPalmtop/pics/videolan
 fi
 exit 0

diff --git a/ipkg/postrm.opie b/ipkg/postrm.opie
index d43c38afbc351c965a7a1550f4caf6c3d21dd481..ef9f42cb12eb0c56a6d8f415163512684fb58a00 100755 (executable)
--- a/ipkg/postrm.opie
+++ b/ipkg/postrm.opie
@@ -1,5 +1,5 @@
 #!/bin/sh
 ldconfig
-[ -x /opt/QtPalmtop/pics/vlc ] || rm /opt/QtPalmtop/pics/vlc
+[ -x /opt/QtPalmtop/pics/videolan ] || rm /opt/QtPalmtop/pics/videolan
 exit 0
 

diff --git a/ipkg/vlc.desktop b/ipkg/vlc.desktop
index 5c2b37d4b2957af9447e5e61282ea868aacb46e6..4766d17331cd52d767f749120a047afeeb8cbdde 100644 (file)
--- a/ipkg/vlc.desktop
+++ b/ipkg/vlc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Comment=Multiplatform Multimedia Player
-Exec=vlc.opie
-Icon=vlc/vlc48x48.png
+Exec=opie-vlc
+Icon=videolan/vlc48x48.png
 Name=VideoLAN Client

diff --git a/ipkg/vlc.opie b/ipkg/vlc.opie
index df756d405efff9b27bf94321bef6af6074824d68..17b9b299925a5cc3f5c8b9813ebdf4259eabe70f 100755 (executable)
--- a/ipkg/vlc.opie
+++ b/ipkg/vlc.opie
@@ -1,4 +1,4 @@
 #!/bin/sh
 export QTDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=.:/usr/X11R6/lib:/opt/QtPalmtop/lib:/lib/videolan/vlc
-/usr/bin/vlc
+export LD_LIBRARY_PATH=.:/usr/X11R6/lib:/opt/QtPalmtop/lib:/usr/lib/videolan/vlc
+/usr/bin/vlc udp://@:1234