Commit b69b9d33 authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed icons location and Debian desktop menus.
parent 15ca5a44
...@@ -483,7 +483,7 @@ clean: ...@@ -483,7 +483,7 @@ clean:
rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ) rm -f $(C_OBJ) $(CPP_OBJ) $(ASM_OBJ) $(STD_PLUGIN_OBJ)
rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak rm -f plugins/*/*.o plugins/*/*.moc plugins/*/*.bak
rm -f src/*/*.o extras/*/*.o rm -f src/*/*.o extras/*/*.o
rm -f lib/*.so vlc gvlc kvlc qvlc rm -f lib/*.so vlc gnome-vlc gvlc kvlc qvlc
distclean: clean distclean: clean
rm -f **/*.o **/*~ *.log rm -f **/*.o **/*~ *.log
...@@ -559,9 +559,11 @@ snapshot: ...@@ -559,9 +559,11 @@ snapshot:
changelog changelog-css rules rules-css vlc.dirs \ changelog changelog-css rules rules-css vlc.dirs \
vlc.menu ; do \ vlc.menu ; do \
cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done cp debian/$$file /tmp/vlc-@VLC_VERSION@/debian/ ; done
for file in default8x16.psf default8x9.psf gvlc.png vlc.png \ for file in default8x16.psf default8x9.psf ; do \
gvlc.xpm vlc.xpm ; do \ cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done
cp share/$$file /tmp/vlc-@VLC_VERSION@/share/ ; done for icon in vlc gvlc qvlc gnome-vlc ; do \
cp share/$$icon.xpm share/$$icon.png \
/tmp/vlc-@VLC_VERSION@/share/ ; done
# build css-enabled archives # build css-enabled archives
(cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \ (cd /tmp ; tar cf vlc-@VLC_VERSION@.tar vlc-@VLC_VERSION@ ; \
...@@ -581,7 +583,7 @@ FORCE: ...@@ -581,7 +583,7 @@ FORCE:
# GTK/Gnome and Framebuffer aliases - don't add new aliases which could bloat # GTK/Gnome and Framebuffer aliases - don't add new aliases which could bloat
# the namespace # the namespace
# #
gvlc kvlc qvlc: vlc gnome-vlc gvlc kvlc qvlc: vlc
rm -f $@ && ln -s vlc $@ rm -f $@ && ln -s vlc $@
......
...@@ -3267,8 +3267,6 @@ if test x$host_os = xbeos; then ...@@ -3267,8 +3267,6 @@ if test x$host_os = xbeos; then
else else
GVLC=0
# Check whether --enable-dsp or --disable-dsp was given. # Check whether --enable-dsp or --disable-dsp was given.
if test "${enable_dsp+set}" = set; then if test "${enable_dsp+set}" = set; then
enableval="$enable_dsp" enableval="$enable_dsp"
...@@ -3301,17 +3299,17 @@ else ...@@ -3301,17 +3299,17 @@ else
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3305: checking for $ac_hdr" >&5 echo "configure:3303: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3310 "configure" #line 3308 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3375,17 +3373,17 @@ if test "${with_sdl+set}" = set; then ...@@ -3375,17 +3373,17 @@ if test "${with_sdl+set}" = set; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3379: checking for $ac_hdr" >&5 echo "configure:3377: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3384 "configure" #line 3382 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3423,17 +3421,17 @@ fi ...@@ -3423,17 +3421,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3427: checking for $ac_hdr" >&5 echo "configure:3425: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3432 "configure" #line 3430 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3497,7 +3495,7 @@ fi ...@@ -3497,7 +3495,7 @@ fi
# Check whether --enable-gnome or --disable-gnome was given. # Check whether --enable-gnome or --disable-gnome was given.
if test "${enable_gnome+set}" = set; then if test "${enable_gnome+set}" = set; then
enableval="$enable_gnome" enableval="$enable_gnome"
if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; GVLC=1; fi if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gnome-vlc "; fi
fi fi
# Check whether --enable-gtk or --disable-gtk was given. # Check whether --enable-gtk or --disable-gtk was given.
...@@ -3508,8 +3506,7 @@ fi ...@@ -3508,8 +3506,7 @@ fi
if test x$enable_gtk != xno; then if test x$enable_gtk != xno; then
if which gtk-config; then if which gtk-config; then
PLUGINS=${PLUGINS}"gtk " PLUGINS=${PLUGINS}"gtk "; ALIASES=${ALIASES}"gvlc "
GVLC=1
fi fi
fi fi
# Check whether --enable-x11 or --disable-x11 was given. # Check whether --enable-x11 or --disable-x11 was given.
...@@ -3523,17 +3520,17 @@ if test x$enable_x11 != xno; then ...@@ -3523,17 +3520,17 @@ if test x$enable_x11 != xno; then
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3527: checking for $ac_hdr" >&5 echo "configure:3524: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3532 "configure" #line 3529 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3572,17 +3569,17 @@ if test "${enable_alsa+set}" = set; then ...@@ -3572,17 +3569,17 @@ if test "${enable_alsa+set}" = set; then
enableval="$enable_alsa" enableval="$enable_alsa"
if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'` if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6 echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
echo "configure:3576: checking for sys/asoundlib.h" >&5 echo "configure:3573: checking for sys/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3581 "configure" #line 3578 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3599,7 +3596,7 @@ fi ...@@ -3599,7 +3596,7 @@ fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6 echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
echo "configure:3603: checking for main in -lasound" >&5 echo "configure:3600: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'` ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -3607,14 +3604,14 @@ else ...@@ -3607,14 +3604,14 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS" LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3611 "configure" #line 3608 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
main() main()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -3643,8 +3640,6 @@ fi ...@@ -3643,8 +3640,6 @@ fi
fi fi
if test x$GVLC = x1 ; then ALIASES=${ALIASES}"gvlc "; fi
fi fi
......
...@@ -158,8 +158,6 @@ if test x$host_os = xbeos; then ...@@ -158,8 +158,6 @@ if test x$host_os = xbeos; then
dnl default case dnl default case
else else
GVLC=0
AC_ARG_ENABLE(dsp, AC_ARG_ENABLE(dsp,
[ --disable-dsp Linux /dev/dsp support (default enabled)]) [ --disable-dsp Linux /dev/dsp support (default enabled)])
if test x$enable_dsp != xno; then if test x$enable_dsp != xno; then
...@@ -235,13 +233,12 @@ AC_ARG_ENABLE(kde, ...@@ -235,13 +233,12 @@ AC_ARG_ENABLE(kde,
[if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi]) [if test x$enable_kde = xyes; then PLUGINS=${PLUGINS}"kde "; ALIASES=${ALIASES}"kvlc "; fi])
AC_ARG_ENABLE(gnome, AC_ARG_ENABLE(gnome,
[ --enable-gnome Gnome interface support (default disabled)], [ --enable-gnome Gnome interface support (default disabled)],
[if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; GVLC=1; fi]) [if test x$enable_gnome = xyes; then PLUGINS=${PLUGINS}"gnome "; ALIASES=${ALIASES}"gnome-vlc "; fi])
AC_ARG_ENABLE(gtk, AC_ARG_ENABLE(gtk,
[ --disable-gtk Gtk+ support (default enabled)]) [ --disable-gtk Gtk+ support (default enabled)])
if test x$enable_gtk != xno; then if test x$enable_gtk != xno; then
if which gtk-config; then if which gtk-config; then
PLUGINS=${PLUGINS}"gtk " PLUGINS=${PLUGINS}"gtk "; ALIASES=${ALIASES}"gvlc "
GVLC=1
fi fi
fi fi
AC_ARG_ENABLE(x11, AC_ARG_ENABLE(x11,
...@@ -257,8 +254,6 @@ AC_ARG_ENABLE(alsa, ...@@ -257,8 +254,6 @@ AC_ARG_ENABLE(alsa,
[ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)], [ --enable-alsa Alsa sound drivers support (Only for linux) (default disabled)],
[if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi]) [if test x$enable_alsa = xyes; then AC_CHECK_HEADER(sys/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test $have_alsa = true; then PLUGINS=${PLUGINS}"alsa "; fi; fi])
if test x$GVLC = x1 ; then ALIASES=${ALIASES}"gvlc "; fi
fi fi
AC_SUBST(SYS) AC_SUBST(SYS)
......
...@@ -7,7 +7,7 @@ Standards-Version: 3.0.1 ...@@ -7,7 +7,7 @@ Standards-Version: 3.0.1
Package: vlc Package: vlc
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, vlc-gtk Depends: ${shlibs:Depends}, vlc-gui
Suggests: vlc-sdl, vlc-esd, vlc-gnome Suggests: vlc-sdl, vlc-esd, vlc-gnome
Description: the free MPEG and DVD player VideoLAN Client Description: the free MPEG and DVD player VideoLAN Client
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
...@@ -17,7 +17,8 @@ Description: the free MPEG and DVD player VideoLAN Client ...@@ -17,7 +17,8 @@ Description: the free MPEG and DVD player VideoLAN Client
Package: vlc-gnome Package: vlc-gnome
Architecture: any Architecture: any
Depends: vlc (= ${Source-Version}), vlc-gtk (= ${Source-Version}), ${shlibs:Depends} Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Provides: vlc-gui
Description: Gnome plugin for the VideoLAN Client Description: Gnome plugin for the VideoLAN Client
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
. .
...@@ -28,6 +29,7 @@ Architecture: any ...@@ -28,6 +29,7 @@ Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Replaces: vlc-gnome (<= 0.2.63-2) Replaces: vlc-gnome (<= 0.2.63-2)
Conflicts: vlc-gnome (<= 0.2.63-2) Conflicts: vlc-gnome (<= 0.2.63-2)
Provides: vlc-gui
Description: Gtk+ plugin for the VideoLAN Client Description: Gtk+ plugin for the VideoLAN Client
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
. .
...@@ -79,6 +81,7 @@ Description: Glide plugin for the VideoLAN Client ...@@ -79,6 +81,7 @@ Description: Glide plugin for the VideoLAN Client
Package: vlc-qt Package: vlc-qt
Architecture: any Architecture: any
Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Provides: vlc-gui
Description: Qt plugin for the VideoLAN Client Description: Qt plugin for the VideoLAN Client
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
. .
......
...@@ -2,7 +2,7 @@ Source: vlc-css ...@@ -2,7 +2,7 @@ Source: vlc-css
Section: non-US/main Section: non-US/main
Priority: optional Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org> Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlib6g-dev Build-Depends: debhelper (>=2.2.0)
Standards-Version: 3.0.1 Standards-Version: 3.0.1
Package: vlc-css Package: vlc-css
......
[Desktop Entry]
Name=GNOME VideoLAN Client
Name[fr]=Client VideoLAN pour GNOME
Comment=GNOME DVD and MPEG player
Comment[fr]=Lecteur de DVD et MPEG pour GNOME
Exec=gnome-vlc
Icon=gnome-vlc.png
Terminal=0
Type=Application
[Desktop Entry]
Name=Gtk+ VideoLAN Client
Name[fr]=Client VideoLAN pour Gtk+
Comment=Gtk+ DVD and MPEG player
Comment[fr]=Lecteur de DVD et MPEG pour Gtk+
Exec=gvlc
Icon=gvlc.png
Terminal=0
Type=Application
...@@ -61,16 +61,48 @@ install: build ...@@ -61,16 +61,48 @@ install: build
mkdir -p debian/vlc-gtk/usr/bin/ mkdir -p debian/vlc-gtk/usr/bin/
mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/ mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
mkdir -p debian/vlc-gnome/usr/bin/
mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
mkdir -p debian/vlc-qt/usr/bin/ mkdir -p debian/vlc-qt/usr/bin/
mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/ mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
mkdir -p debian/vlc-gtk/usr/share/videolan/ mkdir -p debian/vlc/usr/share/pixmaps/
mv debian/vlc/usr/share/videolan/gvlc.png \ mv debian/vlc/usr/share/videolan/vlc.png \
debian/vlc/usr/share/videolan/gvlc.xpm \ debian/vlc/usr/share/pixmaps/
debian/vlc-gtk/usr/share/videolan/ mkdir -p debian/vlc/usr/share/gnome/apps/Multimedia/
cp debian/vlc.desktop debian/vlc/usr/share/gnome/apps/Multimedia/
mkdir -p debian/vlc-gtk/usr/share/videolan/ \
debian/vlc-gtk/usr/share/pixmaps/
mv debian/vlc/usr/share/videolan/gvlc.xpm \
debian/vlc-gtk/usr/share/videolan/
mv debian/vlc/usr/share/videolan/gvlc.png \
debian/vlc-gtk/usr/share/pixmaps/
mkdir -p debian/vlc-gtk/usr/share/gnome/apps/Multimedia/
cp debian/gvlc.desktop debian/vlc-gtk/usr/share/gnome/apps/Multimedia/
mkdir -p debian/vlc-gnome/usr/share/videolan/ \
debian/vlc-gnome/usr/share/pixmaps/
mv debian/vlc/usr/share/videolan/gnome-vlc.xpm \
debian/vlc-gnome/usr/share/videolan/
mv debian/vlc/usr/share/videolan/gnome-vlc.png \
debian/vlc-gnome/usr/share/pixmaps/
mkdir -p debian/vlc-gnome/usr/share/gnome/apps/Multimedia/
cp debian/gnome-vlc.desktop debian/vlc-gnome/usr/share/gnome/apps/Multimedia/
mkdir -p debian/vlc-qt/usr/share/videolan/ \
debian/vlc-qt/usr/share/pixmaps/
mv debian/vlc/usr/share/videolan/qvlc.xpm \
debian/vlc-qt/usr/share/videolan/
mv debian/vlc/usr/share/videolan/qvlc.png \
debian/vlc-qt/usr/share/pixmaps/
mkdir -p debian/vlc/usr/share/man/man1/
gzip < doc/vlc.1 >| debian/vlc/usr/share/man/man1/vlc.1.gz
mkdir -p debian/vlc-gtk/usr/share/man/man1/ mkdir -p debian/vlc-gtk/usr/share/man/man1/
ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
mkdir -p debian/vlc-gnome/usr/share/man/man1/
ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
mkdir -p debian/vlc-qt/usr/share/man/man1/ mkdir -p debian/vlc-qt/usr/share/man/man1/
ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
...@@ -90,9 +122,9 @@ binary-arch: build install ...@@ -90,9 +122,9 @@ binary-arch: build install
# dh_installemacsen # dh_installemacsen
# dh_installpam # dh_installpam
# dh_installinit # dh_installinit
dh_installcron #dh_installcron
dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt doc/vlc.1 # dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt doc/vlc.1
dh_installinfo #dh_installinfo
# dh_undocumented # dh_undocumented
dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa -Nvlc-qt
dh_link dh_link
......
?package(vlc-gnome):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="Gnome VideoLAN Client" \
icon="/usr/share/videolan/gnome-vlc.xpm"
?package(vlc-gtk):command="/usr/bin/gvlc" hotkey="V" needs="X11" \ ?package(vlc-gtk):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="Gnome/Gtk VideoLAN Client" \ section="Apps/Viewers" title="Gtk+ VideoLAN Client" \
icon="/usr/share/videolan/gvlc.xpm" icon="/usr/share/videolan/gvlc.xpm"
?package(vlc-qt):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="Qt VideoLAN Client" \
icon="/usr/share/videolan/qvlc.xpm"
[Desktop Entry]
Name=VideoLAN Client
Name[fr]=Client VideoLAN
Comment=DVD and MPEG player
Comment[fr]=Lecteur de DVD et MPEG
Exec=vlc
Icon=vlc.png
Terminal=0
Type=Application
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.\" .sp <n> insert n+1 empty lines .\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7) .\" for manpage-specific macros, see man(7)
.SH NAME .SH NAME
vlc, gvlc, kvlc, qvlc \- The VideoLAN Client vlc, gvlc, gnome-vlc, kvlc, qvlc \- The VideoLAN Client
.SH SYNOPSIS .SH SYNOPSIS
.B vlc .B vlc
.RI [ OPTIONS ] .RI [ OPTIONS ]
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_gnome.c: Gnome interface * intf_gnome.c: Gnome interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gnome.c,v 1.26 2001/04/08 07:24:47 stef Exp $ * $Id: intf_gnome.c,v 1.27 2001/04/11 12:52:09 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -128,6 +128,11 @@ static int intf_Probe( probedata_t *p_data ) ...@@ -128,6 +128,11 @@ static int intf_Probe( probedata_t *p_data )
return( 999 ); return( 999 );
} }
if( TestProgram( "gnome-vlc" ) )
{
return( 200 );
}
return( 100 ); return( 100 );
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_gtk.c: Gtk+ interface * intf_gtk.c: Gtk+ interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: intf_gtk.c,v 1.11 2001/04/08 07:24:47 stef Exp $ * $Id: intf_gtk.c,v 1.12 2001/04/11 12:52:10 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -125,6 +125,11 @@ static int intf_Probe( probedata_t *p_data ) ...@@ -125,6 +125,11 @@ static int intf_Probe( probedata_t *p_data )
return( 999 ); return( 999 );
} }
if( TestProgram( "gvlc" ) )
{
return( 190 );
}
return( 90 ); return( 90 );
} }
......
/* XPM */
static char * gnome_vlc_xpm[] = {
"48 48 427 2",
" c None",
". c #000000",
"+ c #B96500",
"@ c #D47E18",
"# c #CD7F24",
"$ c #9D611C",
"% c #B86500",
"& c #BF7722",
"* c #9C682D",