* ./plugins/gtk/gtk.glade, plugins/gtk/gnome.glade, ./plugins/kde/kde.cpp:

    replaced the outdated author list with a "VideoLAN Team" entry.
  * ./debian/rules, ./debian/control: deactivated the vlc-kde package because
    it does not work, and removed the vlc-a52 package because liba52 is
    statically linked into vlc.
  * ./debian/control: added more helpful package descriptions.
  * ALL: changed version to 0.3.0. Yeah, it's coming.
  * ./Makefile: fixed make dist.

diff --git a/ChangeLog b/ChangeLog
index 35c5d51da9f5ace4121f755b067ca84bab2d57f3..d64421d82e24092ea98529959c8c1851c07a2426 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
 
 HEAD
 
+  * ./plugins/gtk/gtk.glade, plugins/gtk/gnome.glade, ./plugins/kde/kde.cpp:
+    replaced the outdated author list with a "VideoLAN Team" entry.
+  * ./debian/rules, ./debian/control: deactivated the vlc-kde package because
+    it does not work, and removed the vlc-a52 package because liba52 is
+    statically linked into vlc.
+  * ./debian/control: added more helpful package descriptions.
+  * ALL: changed version to 0.3.0. Yeah, it's coming.
+  * ./Makefile: fixed make dist.
   * ./src/video_output/video_output.c: fixed a vout4 image starvation bug.
   * ./plugins/dvd/dvd.c: we look for libdvdcss.so.2 as well as -.so.1.
   * ./configure.in: BSD/OS fixes thanks to Steven M. Schultz.

diff --git a/Makefile b/Makefile
index 4d4e69a55c7407d9c296d854848f67af5011afae..83082ca9a2fb903ee0bfcc52f785a276c73daed3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ endif
 #
 # Misc variables
 #
-VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
+VLC_QUICKVERSION := $(shell grep '^ *VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
 
 # All symbols must be exported
 export

diff --git a/configure b/configure
index c18322d47b2a3051cd1ea839f1be283936d3a133..d6224d3da9decf9daed03172bc217626e42d02e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -757,7 +757,7 @@ test "$host_alias" != "$target_alias" &&
   program_prefix=${target_alias}-
 
 
-VERSION="0.2.92-dev"
+VERSION="0.3.0"
 CODENAME=Ourumov
 
 save_CFLAGS="${CFLAGS}"

diff --git a/configure.in b/configure.in
index 5c585a98c75793be22bb4693a100466518ff9773..2f86ff1f5d52d309e545850d464e3926c7b4a6fa 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_CONFIG_HEADER(include/defs.h)
 
 AC_CANONICAL_SYSTEM
 
-VERSION="0.2.92-dev"
+VERSION="0.3.0"
 CODENAME=Ourumov
 
 dnl Save CFLAGS and LDFLAGS

diff --git a/debian/changelog b/debian/changelog
index 25ada0058e9f8d8fa125eb7c973c3054c1be9c03..f34956c2762c707481a364765680c33b2928e603 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-vlc (0.2.92cvs-1) unstable; urgency=low
+vlc (0.3.0-1) unstable; urgency=low
 
-  * Development branch.
+  * New upstream release.
 
- -- Samuel Hocevar <sam@zoy.org>  Fri,  7 Dec 2001 20:18:56 +0100
+ -- Samuel Hocevar <sam@zoy.org>  Thu,  4 Apr 2002 07:37:17 +0200
 
 vlc (0.2.92-8) unstable; urgency=high
 

diff --git a/debian/control b/debian/control
index d733974d8fcf4277dae1ab8ab20a4c166e227942..41c0c7b3219f94b4c076efb54583d125770f7867 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Build-Depends: debhelper (>=2.2.0),
                libmad0-dev,
                liblircclient-dev,
                a52dec-dev,
-               kdelibs-dev (>=2.2.2),
                aalib1-dev
 Standards-Version: 3.5.6
 
@@ -37,7 +36,8 @@ Provides: vlc-gui
 Description: Gnome plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This plugin adds a Gnome interface to vlc, the VideoLAN Client.
+ This plugin adds a Gnome interface to vlc, the VideoLAN Client. To
+ activate it, use the `--intf gnome' flag or run the `gnome-vlc' program.
 
 Package: vlc-gtk
 Architecture: any
@@ -48,7 +48,8 @@ Provides: vlc-gui
 Description: Gtk+ plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This plugin adds a Gtk+ interface to vlc, the VideoLAN Client.
+ This plugin adds a Gtk+ interface to vlc, the VideoLAN Client. To
+ activate it, use the `--intf gtk' flag or run the `gvlc' program.
 
 Package: vlc-esd
 Architecture: any
@@ -56,8 +57,9 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Description: Esound plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This plugin adds support for the Enlightened Sound Daemon to
- vlc, the VideoLAN Client.
+ This plugin adds support for the Enlightened Sound Daemon to vlc, the
+ VideoLAN Client. To activate it, use the `--aout esd' flag or select
+ the `esd' aout plugin from the preferences menu.
 
 Package: vlc-alsa
 Architecture: any
@@ -66,7 +68,8 @@ Description: ALSA plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin adds support for the Advanced Linux Sound Architecture to
- vlc, the VideoLAN Client.
+ vlc, the VideoLAN Client. To activate it, use the `--aout alsa' flag or
+ select the `alsa' aout plugin from the preferences menu.
 
 Package: vlc-sdl
 Architecture: any
@@ -75,7 +78,9 @@ Description: SDL plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin adds support for the Simple DirectMedia Layer library to
- vlc, the VideoLAN Client.
+ vlc, the VideoLAN Client. To activate it, use the `--vout sdl' or
+ `--aout sdl' flags or select the `sdl' vout or aout plugin from the
+ preferences menu.
 
 Package: vlc-ggi
 Architecture: any
@@ -83,7 +88,9 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Description: GGI plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This is a GGI plugin for vlc, the VideoLAN Client.
+ This is a GGI plugin for vlc, the VideoLAN Client.  To activate it, use
+ the `--vout ggi' flag or select the `ggi' vout plugin from the preferences
+ menu.
 
 Package: vlc-glide
 Architecture: i386
@@ -91,7 +98,9 @@ Depends: vlc (= ${Source-Version}), libglide2
 Description: Glide plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This is a Glide (3dfx) plugin for vlc, the VideoLAN Client.
+ This is a Glide (3dfx) plugin for vlc, the VideoLAN Client. To activate
+ it, use the `--vout glide' flag or select the `glide' vout plugin from
+ the preferences menu.
 
 Package: vlc-qt
 Architecture: any
@@ -100,7 +109,8 @@ Provides: vlc-gui
 Description: Qt plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This plugin adds a Qt interface to vlc, the VideoLAN Client.
+ This plugin adds a Qt interface to vlc, the VideoLAN Client. To
+ activate it, use the `--intf qt' flag or run the `qvlc' program.
 
 Package: vlc-mad
 Architecture: any
@@ -108,8 +118,10 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Description: MAD plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This plugin adds support for libmad, the MPEG audio decoder library, to
- the VideoLAN Client. MAD is 100% fixed-point based.
+ This plugin adds support for libmad, the MPEG audio decoder library,
+ to the VideoLAN Client. MAD is 100% fixed-point based. To activate
+ this plugin, use the `--mpeg_adec mad' flag or select the `mad' MPEG
+ decoder from the preferences menu.
 
 Package: vlc-arts
 Architecture: any
@@ -118,32 +130,17 @@ Description: aRts plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin adds support for the aRts Sound System to vlc, the
- VideoLAN Client.
-
-Package: vlc-a52
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: A52 plugin for vlc
- VideoLAN is a free MPEG, MPEG2 and DVD software solution.
- .
- This plugin adds support for liba52 to vlc, the VideoLAN Client.
+ VideoLAN Client. To activate it, use the `--aout arts' flag or
+ select the `arts' aout plugin from the preferences menu.
 
 Package: vlc-lirc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: lirc plugin for vlc
+Description: lirc (infrared remote control) plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
  This plugin is an infrared lirc interface for vlc, the
- VideoLAN Client.
-
-Package: vlc-kde
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Description: KDE plugin for vlc
- VideoLAN is a free MPEG, MPEG2 and DVD software solution.
- .
- This plugin adds a KDE interface to vlc, the VideoLAN Client.
+ VideoLAN Client. To activate it, use the `--intf lirc' flag.
 
 Package: vlc-aa
 Architecture: any
@@ -151,4 +148,6 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Description: ASCII art plugin for vlc
  VideoLAN is a free MPEG, MPEG2 and DVD software solution.
  .
- This is an ASCII art video output plugin for vlc, the VideoLAN Client.
+ This is an ASCII art video output plugin for vlc, the VideoLAN
+ Client. To activate it, use the `--vout aa' flag or select the `aa'
+ vout plugin from the preferences menu.

diff --git a/debian/rules b/debian/rules
index 35fd729834452499c7bf8e5cb15602feb2e5b1e0..f7ef192d78f4ea823121b78d50c64edd8ab219b0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 export DH_COMPAT=3
 
 # Compilation options
-export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-kde --enable-aa"
+export CONFIG_FLAGS="--enable-release --prefix=/usr --enable-gnome --enable-gtk --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa"
 # Change this to --without-dvdcss in totalitarian countries
 export DVDCSS_FLAGS="--enable-dvd"
 
@@ -55,9 +55,9 @@ install: build
        # make symlinks for packages and install plugins
        case $(DEB_BUILD_ARCH) in \
        i386) \
-               ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc kde aa glide" ;; \
+               ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa glide" ;; \
        *) \
-               ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa a52 lirc kde aa" ;; \
+               ARCH_ALIASES="ggi gtk gnome esd sdl qt arts mad alsa lirc aa" ;; \
        esac ;\
        for alias in $$ARCH_ALIASES ; do \
                ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
@@ -67,7 +67,7 @@ install: build
        mv debian/vlc/usr/bin/gvlc debian/vlc-gtk/usr/bin/
        mv debian/vlc/usr/bin/gnome-vlc debian/vlc-gnome/usr/bin/
        mv debian/vlc/usr/bin/qvlc debian/vlc-qt/usr/bin/
-       mv debian/vlc/usr/bin/kvlc debian/vlc-kde/usr/bin/
+       #mv debian/vlc/usr/bin/kvlc debian/vlc-kde/usr/bin/
 
        mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
        mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/vlc-gtk/$(VIDDIR)/gvlc.xpm
@@ -76,8 +76,8 @@ install: build
        mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/vlc-gnome/$(PIXDIR)/gnome-vlc.png
        mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/vlc-qt/$(VIDDIR)/qvlc.xpm
        mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/vlc-qt/$(PIXDIR)/qvlc.png
-       mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/vlc-kde/$(VIDDIR)/kvlc.xpm
-       mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/vlc-kde/$(PIXDIR)/kvlc.png
+       #mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/vlc-kde/$(VIDDIR)/kvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/vlc-kde/$(PIXDIR)/kvlc.png
 
        cp debian/vlc.desktop debian/vlc/$(GNOMEDIR)
        cp debian/gvlc.desktop debian/vlc-gtk/$(GNOMEDIR)
@@ -87,7 +87,7 @@ install: build
        ln -s vlc.1.gz debian/vlc-gtk/usr/share/man/man1/gvlc.1.gz
        ln -s vlc.1.gz debian/vlc-gnome/usr/share/man/man1/gnome-vlc.1.gz
        ln -s vlc.1.gz debian/vlc-qt/usr/share/man/man1/qvlc.1.gz
-       ln -s vlc.1.gz debian/vlc-kde/usr/share/man/man1/kvlc.1.gz
+       #ln -s vlc.1.gz debian/vlc-kde/usr/share/man/man1/kvlc.1.gz
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -109,7 +109,7 @@ binary-arch: build install
        dh_installman doc/vlc.1
 #      dh_installinfo
 #      dh_undocumented
-       dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-a52 -Nvlc-kde -Nvlc-aa ChangeLog
+       dh_installchangelogs -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt -Nvlc-arts -Nvlc-mad -Nvlc-lirc -Nvlc-aa ChangeLog
        dh_link
        dh_strip
        dh_compress

diff --git a/plugins/gtk/gnome.glade b/plugins/gtk/gnome.glade
index 7d163dea13a469891679391dbc9fa90473f27828..f1947ab65d5cb404016f36eb085046c65531debe 100644 (file)
--- a/plugins/gtk/gnome.glade
+++ b/plugins/gtk/gnome.glade
@@ -1331,25 +1331,9 @@
   <class>GnomeAbout</class>
   <name>intf_about</name>
   <modal>False</modal>
-  <copyright>(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team</copyright>
-  <authors>Régis Duchesne &lt;regis@via.ecp.fr&gt;
-Michel Lespinasse &lt;walken@zoy.org&gt;
-Olivier Pomel &lt;pomel@via.ecp.fr&gt;
-Pierre Baillet &lt;oct@zoy.org&gt;
-Jean-Philippe Grimaldi &lt;jeanphi@via.ecp.fr&gt;
-Andres Krapf &lt;dae@via.ecp.fr&gt;
-Christophe Massiot &lt;massiot@via.ecp.fr&gt;
-Vincent Seguin &lt;seguin@via.ecp.fr&gt;
-Benoit Steiner &lt;benny@via.ecp.fr&gt;
-Arnaud de Bossoreille de Ribou &lt;bozo@via.ecp.fr&gt;
-Jean-Marc Dressler &lt;polux@via.ecp.fr&gt;
-Gaël Hendryckx &lt;jimmy@via.ecp.fr&gt;
-Samuel Hocevar &lt;sam@zoy.org&gt;
-Brieuc Jeunhomme &lt;bbp@via.ecp.fr&gt;
-Michel Kaempf &lt;maxx@via.ecp.fr&gt;
-Stéphane Borel &lt;stef@via.ecp.fr&gt;
-Renaud Dartus &lt;reno@via.ecp.fr&gt;
-Henri Fallon &lt;henri@via.ecp.fr&gt;
+  <copyright>(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002  - the VideoLAN Team</copyright>
+  <authors>the VideoLAN team &lt;videolan@videolan.org&gt;
+http://www.videolan.org/
 </authors>
   <comments>This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.</comments>
 </widget>

diff --git a/plugins/gtk/gnome_interface.c b/plugins/gtk/gnome_interface.c
index 76e440c742becef492d9417e68ec3189bdc44273..cdb0ccc6c1fc634b09611b9615d2be711e251a0a 100644 (file)
--- a/plugins/gtk/gnome_interface.c
+++ b/plugins/gtk/gnome_interface.c
@@ -1109,30 +1109,14 @@ GtkWidget*
 create_intf_about (void)
 {
   const gchar *authors[] = {
-    "Régis Duchesne <regis@via.ecp.fr>",
-    "Michel Lespinasse <walken@zoy.org>",
-    "Olivier Pomel <pomel@via.ecp.fr>",
-    "Pierre Baillet <oct@zoy.org>",
-    "Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>",
-    "Andres Krapf <dae@via.ecp.fr>",
-    "Christophe Massiot <massiot@via.ecp.fr>",
-    "Vincent Seguin <seguin@via.ecp.fr>",
-    "Benoit Steiner <benny@via.ecp.fr>",
-    "Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>",
-    "Jean-Marc Dressler <polux@via.ecp.fr>",
-    "Gaël Hendryckx <jimmy@via.ecp.fr>",
-    "Samuel Hocevar <sam@zoy.org>",
-    "Brieuc Jeunhomme <bbp@via.ecp.fr>",
-    "Michel Kaempf <maxx@via.ecp.fr>",
-    "Stéphane Borel <stef@via.ecp.fr>",
-    "Renaud Dartus <reno@via.ecp.fr>",
-    "Henri Fallon <henri@via.ecp.fr>",
+    "the VideoLAN team <videolan@videolan.org>",
+    "http://www.videolan.org/",
     NULL
   };
   GtkWidget *intf_about;
 
   intf_about = gnome_about_new ("VideoLAN Client", VERSION,
-                        _("(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"),
+                        _("(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002  - the VideoLAN Team"),
                         authors,
                         _("This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source."),
                         NULL);

diff --git a/plugins/gtk/gtk.glade b/plugins/gtk/gtk.glade
index a252a07e9b54ea2105bd598c25d7d7107ac0a5c6..7b6de009fc44fcfd439720024f300750a627fdfe 100644 (file)
--- a/plugins/gtk/gtk.glade
+++ b/plugins/gtk/gtk.glade
@@ -1398,7 +1398,7 @@
       <widget>
        <class>GtkLabel</class>
        <name>label18</name>
-       <label>(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team</label>
+       <label>(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team</label>
        <justify>GTK_JUSTIFY_LEFT</justify>
        <wrap>False</wrap>
        <xalign>0.5</xalign>
@@ -1427,24 +1427,8 @@
        <widget>
          <class>GtkLabel</class>
          <name>label16</name>
-         <label>Régis Duchesne &lt;regis@via.ecp.fr&gt;
-Michel Lespinasse &lt;walken@zoy.org&gt;
-Olivier Pomel &lt;pomel@via.ecp.fr&gt;
-Pierre Baillet &lt;oct@zoy.org&gt;
-Jean-Philippe Grimaldi &lt;jeanphi@via.ecp.fr&gt;
-Andres Krapf &lt;dae@via.ecp.fr&gt;
-Christophe Massiot &lt;massiot@via.ecp.fr&gt;
-Vincent Seguin &lt;seguin@via.ecp.fr&gt;
-Benoit Steiner &lt;benny@via.ecp.fr&gt;
-Arnaud de Bossoreille de Ribou &lt;bozo@via.ecp.fr&gt;
-Jean-Marc Dressler &lt;polux@via.ecp.fr&gt;
-Gaël Hendryckx &lt;jimmy@via.ecp.fr&gt;
-Samuel Hocevar &lt;sam@zoy.org&gt;
-Brieuc Jeunhomme &lt;bbp@via.ecp.fr&gt;
-Michel Kaempf &lt;maxx@via.ecp.fr&gt;
-Stéphane Borel &lt;stef@via.ecp.fr&gt;
-Renaud Dartus &lt;reno@via.ecp.fr&gt;
-Henri Fallon &lt;henri@via.ecp.fr&gt;</label>
+         <label>the VideoLAN team &lt;videolan@videolan.org&gt;
+http://www.videolan.org/</label>
          <justify>GTK_JUSTIFY_LEFT</justify>
          <wrap>False</wrap>
          <xalign>0.5</xalign>

diff --git a/plugins/gtk/gtk_interface.c b/plugins/gtk/gtk_interface.c
index 6b1eb8242a199229f378ea60836126f2d73ca006..3baf27412db4918209cc4275abe171499b41af35 100644 (file)
--- a/plugins/gtk/gtk_interface.c
+++ b/plugins/gtk/gtk_interface.c
@@ -1343,7 +1343,7 @@ create_intf_about (void)
   gtk_box_pack_start (GTK_BOX (vbox3), label14, TRUE, TRUE, 0);
   gtk_misc_set_padding (GTK_MISC (label14), 0, 10);
 
-  label18 = gtk_label_new (_("(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team"));
+  label18 = gtk_label_new (_("(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team"));
   gtk_widget_ref (label18);
   gtk_object_set_data_full (GTK_OBJECT (intf_about), "label18", label18,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -1359,7 +1359,7 @@ create_intf_about (void)
   gtk_widget_show (frame1);
   gtk_box_pack_start (GTK_BOX (vbox3), frame1, FALSE, FALSE, 0);
 
-  label16 = gtk_label_new (_("Régis Duchesne <regis@via.ecp.fr>\nMichel Lespinasse <walken@zoy.org>\nOlivier Pomel <pomel@via.ecp.fr>\nPierre Baillet <oct@zoy.org>\nJean-Philippe Grimaldi <jeanphi@via.ecp.fr>\nAndres Krapf <dae@via.ecp.fr>\nChristophe Massiot <massiot@via.ecp.fr>\nVincent Seguin <seguin@via.ecp.fr>\nBenoit Steiner <benny@via.ecp.fr>\nArnaud de Bossoreille de Ribou <bozo@via.ecp.fr>\nJean-Marc Dressler <polux@via.ecp.fr>\nGaël Hendryckx <jimmy@via.ecp.fr>\nSamuel Hocevar <sam@zoy.org>\nBrieuc Jeunhomme <bbp@via.ecp.fr>\nMichel Kaempf <maxx@via.ecp.fr>\nStéphane Borel <stef@via.ecp.fr>\nRenaud Dartus <reno@via.ecp.fr>\nHenri Fallon <henri@via.ecp.fr>"));
+  label16 = gtk_label_new (_("the VideoLAN team <videolan@videolan.org>\nhttp://www.videolan.org/"));
   gtk_widget_ref (label16);
   gtk_object_set_data_full (GTK_OBJECT (intf_about), "label16", label16,
                             (GtkDestroyNotify) gtk_widget_unref);

diff --git a/plugins/kde/kde.cpp b/plugins/kde/kde.cpp
index fa17841fe762afbfc793a6a47fe0441f63505617..64e3a5e78500d45f6a208d3c08f2e9ab3d9298f3 100644 (file)
--- a/plugins/kde/kde.cpp
+++ b/plugins/kde/kde.cpp
@@ -2,7 +2,7 @@
  * kde.cpp : KDE plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: kde.cpp,v 1.10 2002/03/19 00:30:44 sam Exp $
+ * $Id: kde.cpp,v 1.11 2002/04/04 15:35:09 sam Exp $
  *
  * Authors: Andres Krapf <dae@chez.com> Sun Mar 25 2001
  *
@@ -119,27 +119,10 @@ KThread::KThread(intf_thread_t *p_intf)
     p_intf->p_sys->p_about =
         new KAboutData( "VideoLAN Client", I18N_NOOP("Kvlc"), VERSION,
             "This is the VideoLAN client, a DVD and MPEG player. It can play MPEG and MPEG 2 files from a file or from a network source.", KAboutData::License_GPL,
-            "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team", 0, 0, "dae@chez.com");
+            "(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team", 0, 0, "dae@chez.com");
 
     char *authors[][2] = {
-        { "Régis Duchesne", "<regis@via.ecp.fr>" },
-        { "Michel Lespinasse", "<walken@zoy.org>" },
-        { "Olivier Pomel", "<pomel@via.ecp.fr>" },
-        { "Pierre Baillet", "<oct@zoy.org>" },
-        { "Jean-Philippe Grimaldi", "<jeanphi@via.ecp.fr>" },
-        { "Andres Krapf", "<dae@via.ecp.fr>" },
-        { "Christophe Massiot", "<massiot@via.ecp.fr>" },
-        { "Vincent Seguin", "<seguin@via.ecp.fr>" },
-        { "Benoit Steiner", "<benny@via.ecp.fr>" },
-        { "Arnaud de Bossoreille de Ribou", "<bozo@via.ecp.fr>" },
-        { "Jean-Marc Dressler", "<polux@via.ecp.fr>" },
-        { "Gaël Hendryckx", "<jimmy@via.ecp.fr>" },
-        { "Samuel Hocevar","<sam@zoy.org>" },
-        { "Brieuc Jeunhomme", "<bbp@via.ecp.fr>" },
-        { "Michel Kaempf", "<maxx@via.ecp.fr>" },
-        { "Stéphane Borel", "<stef@via.ecp.fr>" },
-        { "Renaud Dartus", "<reno@via.ecp.fr>" },
-        { "Henri Fallon", "<henri@via.ecp.fr>" },
+        { "the VideoLAN Team", "<videolan@videolan.org>" },
         { NULL, NULL },
     };
 

diff --git a/plugins/qt/intf_qt.cpp b/plugins/qt/intf_qt.cpp
index 3fe52898009b42bb4d923df699def715140d94d5..329aa41135c98cab883e015c295d4d4c78c60d9e 100644 (file)
--- a/plugins/qt/intf_qt.cpp
+++ b/plugins/qt/intf_qt.cpp
@@ -2,7 +2,7 @@
  * intf_qt.cpp: Qt interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_qt.cpp,v 1.12 2002/02/15 13:32:53 sam Exp $
+ * $Id: intf_qt.cpp,v 1.13 2002/04/04 15:35:09 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -407,7 +407,7 @@ void IntfWindow::About( void )
 {
     QMessageBox::about( this, "About",
         "VideoLAN Client\n"
-        "(C) 1996, 1997, 1998, 1999, 2000, 2001 - the VideoLAN Team\n"
+        "(C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 - the VideoLAN Team\n"
         "\n"
         "This is the VideoLAN client, a DVD and MPEG player.\n"
         "It can play MPEG and MPEG 2 files from a file "

diff --git a/vlc.spec b/vlc.spec
index 78fcf372b4d2f34935351f1eeab3bc11ea49a661..82222d2442f47e9fb583c56eacbf9baf0c9cd5d2 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
 %define name           vlc
-%define vlc_ver        0.2.92
+%define vlc_ver        0.3.0
 %define version                %vlc_ver
 
 %define cvs            0
@@ -298,6 +298,10 @@ rm -fr %buildroot
 %endif
 
 %changelog
+* Thu Apr 04 2002 Samuel Hocevar <sam@zoy.org> 0.3.0
+- version 0.3.0.
+- removed libdvdcss from the whole tarball.
+
 * Thu Jan 17 2002 Yves Duret <yduret@mandrakesoft.com> 0.2.92-2mdk
 - readded libdvdcss rpm in specfile. use %%define css 1 with correct sources
   to build libdvdcss rpm.