. changed program version to 0.2.5 (preparing 0.3.0 release).

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

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

debian/changelog

@@ -1,3 +1,9 @@
+vlc (0.2.5-1) unstable; urgency=low
+
+  * Unstable release.
+
+ -- Samuel Hocevar <sam@zoy.org>  Fri, 19 Jan 2001 05:16:58 +0100
+
 vlc (0.1.99i) unstable; urgency=low
 
   * Fixed the framerate display

debian/control

@@ -2,65 +2,66 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
+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
+Suggests: vlc-gnome, vlc-sdl, vlc-esd
- VideoLAN is a free MPEG2 software solution.
+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,
+ This is the VideoLAN Client. It plays MPEG and MPEG2 files, unencrypted
- or MPEG2 streams from a network source.
+ 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
+Description: Gnome plugin for the VideoLAN Client
- VideoLAN is a free MPEG2 software solution.
+ VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This is the Gnome version of the VideoLAN Client. It plays MPEG2 files,
+ This plugin adds a Gnome interface to the VideoLAN Client.
- 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.
 
 Package: vlc-ggi
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: GGI plugin for the VideoLAN MPEG2 and DVD player vlc
+Description: GGI plugin for the VideoLAN Client
- VideoLAN is a free MPEG2 software solution.
+ 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
+Description: Glide plugin for the VideoLAN Client
- VideoLAN is a free MPEG2 software solution.
+ 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
+Description: Esound plugin for the VideoLAN Client
- VideoLAN is a free MPEG2 software solution.
+ 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
+Description: SDL plugin for the VideoLAN Client
- VideoLAN is a free MPEG2 software solution.
+ VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin adds support for the Simple DirectMedia Layer library to
  the VideoLAN Client.

debian/rules

@@ -15,9 +15,8 @@ build-stamp:
 	./configure --prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--enable-gnome --enable-fb \
+		--enable-gnome --enable-fb --with-glide --with-ggi \
-		--with-ggi --enable-esd --with-glide \
+		--with-sdl --enable-esd --enable-alsa
-		--with-sdl
 	$(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 \
+	for alias in ggi gnome glide esd sdl alsa ; do \
-		ln -s vlc debian/tmp/usr/share/doc/vlc-$$alias ; done
+		mkdir -p debian/vlc-$$alias/usr/share/doc/ ; \
-	ln -s vlc.1.gz debian/tmp/usr/share/man/man1/fbvlc.1.gz
+		ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
-	ln -s vlc.1.gz debian/tmp/usr/share/man/man1/gvlc.1.gz
+		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

debian/vlc-esd.files

@@ -1,2 +0,0 @@
-usr/lib/videolan/vlc/esd.so
-usr/share/doc/vlc-esd

debian/vlc-fb.files

@@ -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

debian/vlc-ggi.files

@@ -1,2 +0,0 @@
-usr/lib/videolan/vlc/ggi.so
-usr/share/doc/vlc-ggi

debian/vlc-glide.files

@@ -1,2 +0,0 @@
-usr/lib/videolan/vlc/glide.so
-usr/share/doc/vlc-glide

debian/vlc-gnome.files

@@ -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

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"

debian/vlc-sdl.files

@@ -1,2 +0,0 @@
-usr/lib/videolan/vlc/sdl.so
-usr/share/doc/vlc-sdl

debian/vlc.copyright

@@ -1,9 +1,9 @@
-This package was debianized by Samuel Hocevar <sam@via.ecp.fr> on
+This package was debianized by Samuel Hocevar <sam@zoy.org> 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 <videolan@via.ecp.fr>
+Upstream Author(s): The VideoLAN Team <videolan@videolan.org>
 
 VideoLAN is Copyright 1996, 1997, 1998, 1999, 2000 The VideoLAN Team
 

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"

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/