Juglin with dependencies.

diff --git a/ipkg/control b/ipkg/control
index 59aec1bcc72740ab9e05d641dd4572456cc695ba..7362f2c8fe19423e5b88950abce1fb25c3227412 100644 (file)
--- a/ipkg/control
+++ b/ipkg/control
@@ -4,7 +4,7 @@ Priority: optional
 Version: 0.5.1
 Release: 2
 Architecture: arm
-Conflicts: gpe-vlc, gpe-apps, opie-vlc, opie-libsdl,  opie-oipkg, opie-base, opie-multikey, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-handwriting, opie-irdaapplet, opie-launcher-settings, opie-networksetup
+Conflicts: gpe-vlc, opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
 Depends: libc6, procps, xserver-tiny-h3600, xbase-clients, xfonts-base, xfonts-75dpi, xfonts-ttf, matchbox, xcalibrate, libsdl, libgtk1.2, esddsp, libffmpeg
 Copyright: GPL

diff --git a/ipkg/control.gpe b/ipkg/control.gpe
index af82bfa41d9ece7488591da1433482e2d378a47d..4fc9fdeebd14495b97de80fede9733eeec6e4b2f 100644 (file)
--- a/ipkg/control.gpe
+++ b/ipkg/control.gpe
@@ -3,9 +3,9 @@ Section: graphics
 Priority: optional
 Version: 0.5.1
 Release: 2
-Conflicts: task-opie, vlc, opie-vlc, opie-libsdl
+Conflicts: opie-vlc, opie-libsdl, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-launcher-settings, opie-netsetup, vlc
 Architecture: arm
-Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
+Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, gpe-apps, libsdl, esddsp, libffmpeg
 Copyright: GPL
 Description: VideoLAN Client is a free network-aware MPEG and DVD player.

diff --git a/ipkg/control.opie b/ipkg/control.opie
index 2fc10dc376923e0e9d321f82076e2629f6409803..27b163758ad95373ec628be0d94d16479547b0dc 100644 (file)
--- a/ipkg/control.opie
+++ b/ipkg/control.opie
@@ -5,7 +5,7 @@ Version: 0.5.1
 Release: 2
 Conflicts: gpe-apps, vlc, gpe-vlc, libsdl
 Architecture: arm
-Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>,  Christophe Massiot <massiot@via.ecp.fr>
+Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
 Depends: libc6, opie-base, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-handwriting, opie-launcher-settings, opie-netsetup, opie-libsdl, libffmpeg
 Copyright: GPL
 Description: VideoLAN Client is a free network-aware MPEG and DVD player.

diff --git a/ipkg/control.zaurus b/ipkg/control.zaurus
index 6b17d67fe5dade043e12d5b2d12978f4901a262e..c2e5aac8b27cdbd8010219f43e5de204e88868e4 100644 (file)
--- a/ipkg/control.zaurus
+++ b/ipkg/control.zaurus
@@ -2,11 +2,11 @@ Package: zaurus-vlc
 Section: graphics
 Priority: optional
 Version: 0.5.1
-Release: 2
+Release: test2
 Conflicts: gpe-apps, gpe-vlc, vlc, libsdl
 Architecture: arm
 Maintainer: Jean-Paul Saman <jpsaman@wxs.nl>
-Depends: libc6, opie-oipkg, opie-base, opie-multikey, opie-handwriting, opie-volumeapplet, opie-embeddedkonsole, opie-handwriting, opie-irdaapplet, opie-launcher-settings, opie-networksetup, opie-libsdl, libffmpeg
+Depends: libc6, opie-base, zaurus-libsdl, libffmpeg
 Copyright: GPL
 Description: VideoLAN Client is a free network-aware MPEG and DVD player.
  VideoLAN is a free MPEG1/2 software solution licensed under GPL. The original 

diff --git a/ipkg/rules.zaurus b/ipkg/rules.zaurus
index 75e07c8c9388878facf9f1c1bbb89ce147bb89fe..551bd550c8006229800e6707552472baedd050ab 100755 (executable)
--- a/ipkg/rules.zaurus
+++ b/ipkg/rules.zaurus
@@ -76,6 +76,7 @@ install: build
        cp share/vlc48x48.png  ${PKGDIR}/usr/share/vlc
        cp vlc $(PKGDIR)/usr/bin
        cp ipkg/vlc.zaurus ${PKGDIR}/opt/QtPalmtop/sharp/bin/opie-vlc
+       cp ipkg/vlc.zaurus ${PKGDIR}/opt/QtPalmtop/sharp/bin/zaurus-vlc
        cp ipkg/vlc.desktop ${PKGDIR}/opt/QtPalmtop/sharp/apps/Applications
 
 install-plugins: install