* debian/*.menu:

    + Removed unused menu files.
  * debian/rules:
    + Build libavformat.
  * include/vlc_common.h:
    + PACKAGE overrides PACKAGE_NAME.

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 9392adc0949020004c47bec21a2e5bbe772b8645..3fd447882aa0479147fa24190e299c6aa579eeb5 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -12,16 +12,12 @@ EXTRA_DIST = \
        vlc.menu \
        gnome-vlc.desktop \
        gnome-vlc.dirs \
-       gnome-vlc.menu \
        gvlc.desktop \
        gvlc.dirs \
-       gvlc.menu \
        kvlc.dirs \
-       kvlc.menu \
        libvlc0-dev.dirs \
        mozilla-plugin-vlc.dirs \
        qvlc.dirs \
-       qvlc.menu \
        vlc-plugin-alsa.dirs \
        vlc-plugin-arts.dirs \
        vlc-plugin-esd.dirs \

diff --git a/debian/control b/debian/control
index a30e8ad6e45436f53f867044c1a8f5f2bfe45739..8b942e0b653b32834b20b40fa3888ca9025d775c 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, 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-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, libtar-dev
 Build-Conflicts: libavcodec-dev
 Standards-Version: 3.6.1.1
 

diff --git a/debian/gnome-vlc.menu b/debian/gnome-vlc.menu
deleted file mode 100644 (file)
index db1f0d8..0000000
--- a/debian/gnome-vlc.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?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
deleted file mode 100644 (file)
index 9ec85d8..0000000
--- a/debian/gvlc.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?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
deleted file mode 100644 (file)
index de016bc..0000000
--- a/debian/kvlc.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?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
deleted file mode 100644 (file)
index 90afa5a..0000000
--- a/debian/qvlc.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-?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 c502cb519f539c025a4c2ddcd4627c7c8839dccf..fe1390a4fd7b201f30185ca15663537e2f7e8553 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -100,6 +100,8 @@ configure-stamp:
          cd extras/ffmpeg \
          && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx --disable-altivec \
          && cd libavcodec \
+         && $(MAKE) \
+         && cd ../libavformat \
          && $(MAKE); \
        fi
 
@@ -146,6 +148,12 @@ build-stamp: patch configure-stamp
          && rm -f Makefile.pic \
          && sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
          && $(MAKE) -f Makefile.pic \
+         && rm -f Makefile.pic \
+         && ../libavformat \
+         && $(MAKE) clean \
+         && rm -f Makefile.pic \
+         && sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
+         && $(MAKE) -f Makefile.pic \
          && rm -f Makefile.pic; \
        fi
 

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 88130e909d6b8904e92fbd5972204a5361322b37..64888852fd2349fc352632eb4e440acc62015893 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -38,10 +38,12 @@
 
 #include "config.h"
 
-#if !defined(PACKAGE_NAME)
+#if defined(PACKAGE)
+#   undef PACKAGE_NAME
 #   define PACKAGE_NAME PACKAGE
 #endif
-#if !defined(PACKAGE_VERSION)
+#if defined(VERSION)
+#   undef PACKAGE_VERSION
 #   define PACKAGE_VERSION VERSION
 #endif