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

 . changed codename to Urumov
 . cleaned a lot of stuff in the Debian package generation.

  If anyone objects with the versioning scheme, let's fight in the
  dirt and sort that out. Or change it yourself.

  Debian packages can be tried here: http://armitage.via.ecp.fr/~sam/vlc/

diff --git a/configure b/configure
index 42db13a40082731ba502a6e1b7eda4908c0bb5aa..9cd1a54b523f3fd93fc7bc986f2d61fedd689893 100755 (executable)
--- 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 96d71114cf71321105a54820170641535e52c873..a7b9494655761ce55a0b27d972d3484a341f28da 100644 (file)
--- 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 e1860de923ba477822c777c66a9d9b3ee2ffc46d..d216dfb667b56ddbf993fb8e96b91f55d73789f8 100644 (file)
--- a/debian/changelog
+++ b/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

diff --git a/debian/control b/debian/control
index 7911694a298b74444686bc8fd54400b967353789..a01502925519a460c9b74f38244e8b3b8a176595 100644 (file)
--- a/debian/control
+++ b/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
- 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 8db01cd2932f151e1a70593df49598393c517802..c190e8fe2dd5b1c5f25410017b56c04ea33688bd 100755 (executable)
--- 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 (file)
index 9cdac8f..0000000
--- 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 (file)
index 362b49b..0000000
--- 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 (file)
index d03a4a4..0000000
--- 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 (file)
index d9a9200..0000000
--- 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 (file)
index fad6d67..0000000
--- 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 6bd7a921fc3ad4e65d7f13683e3a5d9dfcb50bd0..e886e30aa2f114d85bdab88b7fa2915cad4c50ce 100644 (file)
--- 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 (file)
index 44850b7..0000000
--- 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 d057af2d31d6e73c9f315c7e877ec62764d1ad71..f3d523785574e5a7ea77af5926a68ea4016ffcc2 100644 (file)
--- a/debian/vlc.copyright
+++ b/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
 

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 5c71cf7377b11b36caff194cb8cb4f3f5fdbdedc..ee558760bbe5f4299158d24178f131e405be971b 100644 (file)
--- 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 ceece950073652a34e02fb4a95fbf1af24ce53ae..a52de515e07f3af4e11a28753105a84ed495809c 100644 (file)
--- 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/