diff --git a/configure b/configure index 42db13a400..9cd1a54b52 100755 --- a/configure +++ b/configure @@ -602,9 +602,9 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 -VLC_VERSION=0.1.99i +VLC_VERSION=0.2.5 -VLC_CODENAME=Onatopp +VLC_CODENAME=Urumov echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 diff --git a/configure.in b/configure.in index 96d71114cf..a7b9494655 100644 --- a/configure.in +++ b/configure.in @@ -4,9 +4,9 @@ AC_CONFIG_HEADER(include/defs.h) AC_CANONICAL_HOST -VLC_VERSION=0.1.99i +VLC_VERSION=0.2.5 AC_SUBST(VLC_VERSION) -VLC_CODENAME=Onatopp +VLC_CODENAME=Urumov AC_SUBST(VLC_CODENAME) dnl Check for tools diff --git a/debian/changelog b/debian/changelog index e1860de923..d216dfb667 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vlc (0.2.5-1) unstable; urgency=low + + * Unstable release. + + -- Samuel Hocevar Fri, 19 Jan 2001 05:16:58 +0100 + vlc (0.1.99i) unstable; urgency=low * Fixed the framerate display diff --git a/debian/control b/debian/control index 7911694a29..a015029255 100644 --- a/debian/control +++ b/debian/control @@ -2,65 +2,66 @@ Source: vlc Section: graphics Priority: optional Maintainer: Samuel Hocevar +Build-Depends: debhelper (>=2.2.0), xlib6g-dev, libgnome-dev, libggi2-dev, libglide-dev, libesd0-dev, libsdl1.1-dev, alsa-headers Standards-Version: 3.0.1 Package: vlc Architecture: any Depends: ${shlibs:Depends} -Description: VideoLAN Client - a free MPEG2 and DVD player - VideoLAN is a free MPEG2 software solution. +Suggests: vlc-gnome, vlc-sdl, vlc-esd +Description: the free MPEG and DVD player VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This is the VideoLAN Client. It plays MPEG2 files, unencrypted DVDs, - or MPEG2 streams from a network source. + This is the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted + DVDs, or MPEG streams from a network source. Package: vlc-gnome Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: Gnome VideoLAN Client - a free MPEG2 and DVD player for Gnome - VideoLAN is a free MPEG2 software solution. +Description: Gnome plugin for the VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. . - This is the Gnome version of the VideoLAN Client. It plays MPEG2 files, - unencrypted DVDs, or MPEG2 streams from a network source. - -Package: vlc-fb -Architecture: any -Depends: vlc (= ${Source-Version}) -Description: Framebuffer VideoLAN Client - a free MPEG2 and DVD player - VideoLAN is a free MPEG2 software solution. - . - This is the Linux framebuffer version of the VideoLAN Client. It plays - MPEG2 files, unencrypted DVDs, or MPEG2 streams from a network source. + This plugin adds a Gnome interface to the VideoLAN Client. Package: vlc-ggi Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: GGI plugin for the VideoLAN MPEG2 and DVD player vlc - VideoLAN is a free MPEG2 software solution. +Description: GGI plugin for the VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This is a GGI plugin for the VideoLAN Client. Package: vlc-glide Architecture: any Depends: vlc (= ${Source-Version}), libglide2 -Description: Glide plugin for the VideoLAN MPEG2 and DVD player vlc - VideoLAN is a free MPEG2 software solution. +Description: Glide plugin for the VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This is a Glide (3dfx) plugin for the VideoLAN Client. Package: vlc-esd Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: Esound plugin for the VideoLAN MPEG2 and DVD player vlc - VideoLAN is a free MPEG2 software solution. +Description: Esound plugin for the VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This plugin adds support for the Enlightened Sound Daemon to the VideoLAN Client. +Package: vlc-alsa +Architecture: any +Depends: vlc (= ${Source-Version}), ${shlibs:Depends} +Description: ALSA plugin for the VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. + . + This plugin adds support for the Advanced Linux Sound Architecture to + the VideoLAN Client. + Package: vlc-sdl Architecture: any Depends: vlc (= ${Source-Version}), ${shlibs:Depends} -Description: SDL plugin for the VideoLAN MPEG2 and DVD player vlc - VideoLAN is a free MPEG2 software solution. +Description: SDL plugin for the VideoLAN Client + VideoLAN is a free MPEG, MPEG2 and DVD software solution. . This plugin adds support for the Simple DirectMedia Layer library to the VideoLAN Client. diff --git a/debian/rules b/debian/rules index 8db01cd293..c190e8fe2d 100755 --- a/debian/rules +++ b/debian/rules @@ -15,9 +15,8 @@ build-stamp: ./configure --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ - --enable-gnome --enable-fb \ - --with-ggi --enable-esd --with-glide \ - --with-sdl + --enable-gnome --enable-fb --with-glide --with-ggi \ + --with-sdl --enable-esd --enable-alsa $(MAKE) touch build-stamp @@ -37,15 +36,26 @@ install: build dh_clean -k dh_installdirs - $(MAKE) install prefix=`pwd`/debian/tmp/usr + $(MAKE) install prefix=`pwd`/debian/vlc/usr # make symlinks for packages - for alias in ggi gnome fb glide esd sdl ; do \ - ln -s vlc debian/tmp/usr/share/doc/vlc-$$alias ; done - ln -s vlc.1.gz debian/tmp/usr/share/man/man1/fbvlc.1.gz - ln -s vlc.1.gz debian/tmp/usr/share/man/man1/gvlc.1.gz + for alias in ggi gnome glide esd sdl alsa ; do \ + mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \ + ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \ + mkdir -p debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \ + mv debian/vlc/usr/lib/videolan/vlc/$$alias.so \ + debian/vlc-$$alias/usr/lib/videolan/vlc/ ; \ + done - dh_movefiles + mkdir -p debian/vlc-gnome/usr/bin/ + mv debian/vlc/usr/bin/gvlc debian/vlc-gnome/usr/bin/ + mkdir -p debian/vlc-gnome/usr/share/videolan/ + mv debian/vlc/usr/share/videolan/gvlc.png \ + debian/vlc-gnome/usr/share/videolan/ + mkdir -p debian/vlc-gnome/usr/share/man/man1/ + ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gvlc.1.gz + + ln -s vlc.1.gz debian/vlc/usr/share/man/man1/fbvlc.1.gz # Build architecture-independent files here. binary-indep: build install @@ -64,16 +74,14 @@ binary-arch: build install # dh_installpam # dh_installinit dh_installcron - dh_installmanpages -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl + dh_installmanpages -Nvlc-gnome -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa dh_installinfo # dh_undocumented - dh_installchangelogs -Nvlc-gnome -Nvlc-fb -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl + dh_installchangelogs -Nvlc-gnome -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-sdl -Nvlc-alsa dh_link dh_strip dh_compress dh_fixperms - # You may want to make some executables suid here. - dh_suidregister # dh_makeshlibs dh_installdeb # dh_perl diff --git a/debian/vlc-esd.files b/debian/vlc-esd.files deleted file mode 100644 index 9cdac8f664..0000000000 --- a/debian/vlc-esd.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/videolan/vlc/esd.so -usr/share/doc/vlc-esd diff --git a/debian/vlc-fb.files b/debian/vlc-fb.files deleted file mode 100644 index 362b49b6f3..0000000000 --- a/debian/vlc-fb.files +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/videolan/vlc/fb.so -usr/bin/fbvlc -usr/share/doc/vlc-fb -usr/share/man/man1/fbvlc.1.gz diff --git a/debian/vlc-ggi.files b/debian/vlc-ggi.files deleted file mode 100644 index d03a4a4ca9..0000000000 --- a/debian/vlc-ggi.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/videolan/vlc/ggi.so -usr/share/doc/vlc-ggi diff --git a/debian/vlc-glide.files b/debian/vlc-glide.files deleted file mode 100644 index d9a9200362..0000000000 --- a/debian/vlc-glide.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/videolan/vlc/glide.so -usr/share/doc/vlc-glide diff --git a/debian/vlc-gnome.files b/debian/vlc-gnome.files deleted file mode 100644 index fad6d6705e..0000000000 --- a/debian/vlc-gnome.files +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/videolan/vlc/gnome.so -usr/bin/gvlc -usr/share/videolan/gvlc.png -usr/share/doc/vlc-gnome -usr/share/man/man1/gvlc.1.gz diff --git a/debian/vlc-gnome.menu b/debian/vlc-gnome.menu index 6bd7a921fc..e886e30aa2 100644 --- a/debian/vlc-gnome.menu +++ b/debian/vlc-gnome.menu @@ -1,3 +1,3 @@ ?package(vlc-gnome):command="/usr/bin/gvlc" hotkey="V" needs="X11" \ - section="Apps/Graphics" title="Gnome VideoLAN Client" \ + section="Apps/Viewers" title="Gnome VideoLAN Client" \ icon="/usr/share/videolan/gvlc.png" diff --git a/debian/vlc-sdl.files b/debian/vlc-sdl.files deleted file mode 100644 index 44850b7ced..0000000000 --- a/debian/vlc-sdl.files +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/videolan/vlc/sdl.so -usr/share/doc/vlc-sdl diff --git a/debian/vlc.copyright b/debian/vlc.copyright index d057af2d31..f3d5237855 100644 --- a/debian/vlc.copyright +++ b/debian/vlc.copyright @@ -1,9 +1,9 @@ -This package was debianized by Samuel Hocevar on +This package was debianized by Samuel Hocevar on Mon, 13 Mar 2000 02:21:45 +0100. -It was downloaded from ftp://ftp.via.ecp.fr/pub/videolan/ +It was downloaded from ftp://ftp.videolan.org/pub/videolan/ -Upstream Author(s): The VideoLAN Team +Upstream Author(s): The VideoLAN Team VideoLAN is Copyright 1996, 1997, 1998, 1999, 2000 The VideoLAN Team diff --git a/debian/dirs b/debian/vlc.dirs similarity index 100% rename from debian/dirs rename to debian/vlc.dirs diff --git a/debian/vlc.menu b/debian/vlc.menu index 5c71cf7377..ee558760bb 100644 --- a/debian/vlc.menu +++ b/debian/vlc.menu @@ -1,3 +1,3 @@ ?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \ - section="Apps/Graphics" title="VideoLAN Client" \ + section="Apps/Viewers" title="VideoLAN Client" \ icon="/usr/share/videolan/vlc.png" diff --git a/vlc.spec b/vlc.spec index ceece95007..a52de515e0 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,5 +1,5 @@ Name: vlc -Version: 0.1.99i +Version: 0.2.5 Release: 1 Copyright: GPL Url: http://www.videolan.org/