From a342cb2d934ef1f0aaf39fa138086bef961bb77d Mon Sep 17 00:00:00 2001
From: Jean-Paul Saman <jpsaman@videolan.org>
Date: Tue, 26 Nov 2002 19:52:56 +0000
Subject: [PATCH] Packaging for Opie and Qt Embedded support.

---
 ipkg/control.gpe   | 3 ++-
 ipkg/control.opie  | 3 ++-
 ipkg/postinst.opie | 4 ++--
 ipkg/postrm.opie   | 2 +-
 ipkg/vlc.desktop   | 4 ++--
 ipkg/vlc.opie      | 4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ipkg/control.gpe b/ipkg/control.gpe
index a592a5ba57..3f082aba29 100644
--- 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 7cd9d21c04..1ef0af3b48 100644
--- 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 253d06583c..f2bb784c07 100755
--- 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 d43c38afbc..ef9f42cb12 100755
--- 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 5c2b37d4b2..4766d17331 100644
--- 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 df756d405e..17b9b29992 100755
--- 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
-- 
2.25.4