* debian/rules:

    + Disabled the GNOME, Qt, GTK+ and KDE interfaces in favour of the
      WxWidgets one.

diff --git a/debian/changelog b/debian/changelog
index c9d5baba67e4b96090a17c8a5499ae40a877c985..f62b0f7ba97fdaa3fd330ce9c325bf4e4f628674 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+vlc (0.7.2.svn20040827-1) unstable; urgency=high
+
+  * New SVN snapshot.
+  * debian/rules:
+    + Activated x264 support.
+    + Re-enabled libmodplug support.
+    + Build PIC plugins even on x86.
+    + Disabled SLP because its code is broken.
+    + Disabled the GNOME, Qt, GTK+ and KDE interfaces in favour of the
+      WxWidgets one.
+    + Activated HAL support.
+  * debian/control:
+    + Force the vlc-plugin-arts dependencies.
+    + Build-depend on jam and nasm because of x264.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 27 Aug 2004 21:31:13 +0200
+
 vlc (0.7.2.final-11) unstable; urgency=medium
 
   * configure.ac:

diff --git a/debian/control b/debian/control
index 413cd2e75c44f4bad0bafdf5b73cf09dede4e39f..a30e8ad6e45436f53f867044c1a8f5f2bfe45739 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev
 Build-Conflicts: libavcodec-dev
 Standards-Version: 3.6.1.1
 
@@ -39,32 +39,30 @@ Description: development files for VLC
  streams from various network sources.
 
 Package: gnome-vlc
-Section: gnome
+Section: oldlibs
 Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: vlc-plugin-esd
+Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-gnome (<< 0.5.0)
 Replaces: vlc-gnome (<< 0.5.0)
-Description: GNOME frontend for VLC
- This plugin adds a GNOME interface to the VLC media player. To activate
- it, use the `--intf gnome' flag or run the `gnome-vlc' program.
+Description: GNOME frontend for VLC (dummy legacy package)
+ The gnome-vlc package has been discontinued. You should use the wxvlc
+ package instead.
  .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
+ This package is only useful to ensure clean upgrades from old Debian
+ releases and can be safely removed.
 
 Package: gvlc
+Section: oldlibs
 Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
 Replaces: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
-Description: GTK+ frontend for VLC
- This plugin adds a GTK+ interface to the VLC media player. To activate
- it, use the `--intf gtk' flag or run the `gvlc' program.
+Description: GTK+ frontend for VLC (dummy legacy package)
+ The gvlc package has been discontinued. You should use the wxvlc
+ package instead.
  .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
+ This package is only useful to ensure clean upgrades from old Debian
+ releases and can be safely removed.
 
 Package: vlc-plugin-esd
 Architecture: any
@@ -138,17 +136,17 @@ Description: Glide video output plugin for VLC
  streams from various network sources.
 
 Package: qvlc
+Section: oldlibs
 Architecture: any
-Depends: vlc (= ${Source-Version}), libqt3c102-mt, ${misc:Depends}
+Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: vlc-qt (<< 0.5.0)
 Replaces: vlc-qt (<< 0.5.0)
-Description: Qt frontend for VLC
- This plugin adds a Qt interface to the VLC media player. To activate it,
- use the `--intf qt' flag or run the `qvlc' program.
+Description: Qt frontend for VLC (dummy legacy package)
+ The qvlc package has been discontinued. You should use the wxvlc
+ package instead.
  .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
+ This package is only useful to ensure clean upgrades from old Debian
+ releases and can be safely removed.
 
 Package: vlc-plugin-arts
 Architecture: any
@@ -179,19 +177,18 @@ Description: multimedia plugin for Mozilla based on VLC
  streams from various network sources.
 
 Package: kvlc
-Section: kde
+Section: oldlibs
 Architecture: any
-Depends: vlc (= ${Source-Version}), kdelibs4 (>= 4:3.1.5-1), ${misc:Depends}
+Depends: wxvlc, vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: vlc-plugin-arts
 Conflicts: vlc-kde (<< 0.5.0)
 Replaces: vlc-kde (<< 0.5.0)
-Description: KDE frontend for VLC
- This plugin adds a KDE interface to the VLC media player. To activate it,
- use the `--intf kde' flag or run the `kvlc' program.
+Description: KDE frontend for VLC (dummy legacy package)
+ The kvlc package has been discontinued. You should use the wxvlc
+ package instead.
  .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
+ This package is only useful to ensure clean upgrades from old Debian
+ releases and can be safely removed.
 
 Package: vlc-plugin-svgalib
 Architecture: i386

diff --git a/debian/gnome-vlc.menu b/debian/gnome-vlc.menu
index 035fae4f36cc4bfbec0f1580f38b73388e043d5b..db1f0d880c9291dd67cbf455e584c45eb42aadeb 100644 (file)
--- a/debian/gnome-vlc.menu
+++ b/debian/gnome-vlc.menu
@@ -1,3 +1,3 @@
-?package(gnome-vlc):command="/usr/bin/gnome-vlc" hotkey="V" needs="X11" \
-                    section="Apps/Viewers" title="VLC media player for GNOME" \
+?package(gnome-vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
+                    section="Apps/Viewers" title="VLC media player" \
                     icon="/usr/share/vlc/gnome-vlc.xpm" hints="Video"

diff --git a/debian/gvlc.menu b/debian/gvlc.menu
index 661baf0dd0a4366c3c4aad0c44225c7756f30e96..9ec85d85111b7d82b1bc436ec927b5aebf9e0da3 100644 (file)
--- a/debian/gvlc.menu
+++ b/debian/gvlc.menu
@@ -1,3 +1,3 @@
-?package(gvlc):command="/usr/bin/gvlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="VLC media player for Gtk+" \
+?package(gvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
+               section="Apps/Viewers" title="VLC media player" \
                icon="/usr/share/vlc/gvlc.xpm" hints="Video"

diff --git a/debian/kvlc.menu b/debian/kvlc.menu
index f9608eb076959cd8994910063f060be4bf3c6e8d..de016bc871bc77838bca93de8b2ea75b528c24e3 100644 (file)
--- a/debian/kvlc.menu
+++ b/debian/kvlc.menu
@@ -1,3 +1,3 @@
-?package(kvlc):command="/usr/bin/kvlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="VLC media player for KDE" \
+?package(kvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
+               section="Apps/Viewers" title="VLC media player" \
                icon="/usr/share/vlc/kvlc.xpm" hints="Video"

diff --git a/debian/qvlc.menu b/debian/qvlc.menu
index d80289bbbce9b3d63897e28918eee4448a33f304..90afa5ab3874d4a913db8d84640f1701145efdff 100644 (file)
--- a/debian/qvlc.menu
+++ b/debian/qvlc.menu
@@ -1,3 +1,3 @@
-?package(qvlc):command="/usr/bin/qvlc" hotkey="V" needs="X11" \
-               section="Apps/Viewers" title="VLC media player for Qt" \
+?package(qvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
+               section="Apps/Viewers" title="VLC media player" \
                icon="/usr/share/vlc/qvlc.xpm" hints="Video"

diff --git a/debian/rules b/debian/rules
index 3f38f4deff5bd42278d9cf5778e8e2864c8f27e0..c502cb519f539c025a4c2ddcd4627c7c8839dccf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,14 +13,14 @@ include /usr/share/dpatch/dpatch.make
 
 CONFIG_FLAGS = --enable-release --prefix=/usr
 CONFIG_FLAGS += \
-       --enable-gnome \
-       --enable-gtk \
+       --disable-gnome \
+       --disable-gtk \
        --disable-familiar \
        --disable-fb \
        --enable-ggi \
        --enable-sdl \
        --enable-esd \
-       --enable-qt \
+       --disable-qt \
        --enable-mad \
        --enable-arts \
        --enable-alsa \
@@ -30,9 +30,9 @@ CONFIG_FLAGS += \
        --enable-dvbpsi \
        --enable-xosd \
        --enable-mozilla \
-       --enable-kde \
+       --disable-kde \
        --enable-mp4 \
-       --disable-dvb \
+       --enable-dvb \
        --enable-dv \
        --disable-satellite \
        --enable-ogg \
@@ -98,7 +98,7 @@ configure-stamp:
        test -d extras/ffmpeg
        if test ! '(' -d CVS -o -d .svn ')'; then \
          cd extras/ffmpeg \
-         && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx \
+         && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx --disable-altivec \
          && cd libavcodec \
          && $(MAKE); \
        fi
@@ -232,32 +232,32 @@ install: build
        ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
 
        # Package: gnome-vlc
-       mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
+       #mv debian/vlc/usr/bin/gnome-vlc debian/gnome-vlc/usr/bin/
        ln -s vlc debian/gnome-vlc/usr/share/doc/gnome-vlc
-       mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
-         debian/gnome-vlc/usr/lib/vlc/gui/
-       mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
-         debian/gnome-vlc/usr/lib/vlc/gui/
-       ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
-       mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
-       mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
+       #mv debian/vlc/usr/lib/vlc/misc/libgnome_main_plugin.so \
+       #  debian/gnome-vlc/usr/lib/vlc/gui/
+       #mv debian/vlc/usr/lib/vlc/gui/libgnome_plugin.so \
+       #  debian/gnome-vlc/usr/lib/vlc/gui/
+       #ln -s vlc.1.gz debian/gnome-vlc/usr/share/man/man1/gnome-vlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
+       #mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
 
        # Package: vlc-gnome
        mkdir -p debian/vlc-gnome/usr/share/doc/
        ln -s vlc debian/vlc-gnome/usr/share/doc/vlc-gnome
 
        # Package: gvlc
-       mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
+       #mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
        ln -s vlc debian/gvlc/usr/share/doc/gvlc
-       mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
-         debian/gvlc/usr/lib/vlc/gui/
-       mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
-         debian/gvlc/usr/lib/vlc/gui/
+       #mv debian/vlc/usr/lib/vlc/misc/libgtk_main_plugin.so \
+       #  debian/gvlc/usr/lib/vlc/gui/
+       #mv debian/vlc/usr/lib/vlc/gui/libgtk_plugin.so \
+       #  debian/gvlc/usr/lib/vlc/gui/
        #mv debian/vlc/usr/lib/vlc/gui/libfamiliar_plugin.so \
        #  debian/gvlc/usr/lib/vlc/gui/
-       ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
-       mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
-       mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
+       #ln -s vlc.1.gz debian/gvlc/usr/share/man/man1/gvlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
 
        # Package: vlc-gtk
        mkdir -p debian/vlc-gtk/usr/share/doc/
@@ -313,13 +313,13 @@ ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
 endif
 
        # Package: qvlc
-       mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
+       #mv debian/vlc/usr/bin/qvlc debian/qvlc/usr/bin/
        ln -s vlc debian/qvlc/usr/share/doc/qvlc
-       mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \
-         debian/qvlc/usr/lib/vlc/gui/
-       ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
-       mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
-       mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
+       #mv debian/vlc/usr/lib/vlc/gui/libqt_plugin.so \
+       #  debian/qvlc/usr/lib/vlc/gui/
+       #ln -s vlc.1.gz debian/qvlc/usr/share/man/man1/qvlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
 
        # Package: vlc-qt
        mkdir -p debian/vlc-qt/usr/share/doc/
@@ -340,14 +340,14 @@ endif
        ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
 
        # Package: kvlc
-       mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
+       #mv debian/vlc/usr/bin/kvlc debian/kvlc/usr/bin/
        ln -s vlc debian/kvlc/usr/share/doc/kvlc
-       mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
-         debian/kvlc/usr/lib/vlc/gui/
-       mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR)
-       ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
-       mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
-       mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
+       #mv debian/vlc/usr/lib/vlc/gui/libkde_plugin.so \
+       #  debian/kvlc/usr/lib/vlc/gui/
+       #mv debian/vlc/$(VIDDIR)/ui.rc debian/kvlc/$(VIDDIR)
+       #ln -s vlc.1.gz debian/kvlc/usr/share/man/man1/kvlc.1.gz
+       #mv debian/vlc/$(VIDDIR)/kvlc32x32.xpm debian/kvlc/$(VIDDIR)/kvlc.xpm
+       #mv debian/vlc/$(VIDDIR)/kvlc48x48.png debian/kvlc/$(PIXDIR)/kvlc.png
 
        # Package: vlc-plugin-svgalib
 ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)

diff --git a/debian/wxvlc.menu b/debian/wxvlc.menu
index 64fcb1ba55f4610d395f3e036930e01b86592730..7a9262536b001b358c37a994f62c66fc5c8a0bb4 100644 (file)
--- a/debian/wxvlc.menu
+++ b/debian/wxvlc.menu
@@ -1,3 +1,3 @@
 ?package(wxvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
-                section="Apps/Viewers" title="VLC media player for wxWindows" \
+                section="Apps/Viewers" title="VLC media player" \
                 icon="/usr/share/vlc/wxvlc.xpm" hints="Video"