diff --git a/debian/Makefile.am b/debian/Makefile.am
index d9b89f283710e3b72b0754ac300d172dfcbd97b6..55422934bb65cdf58f42a78706f28e0c97e9bbd0 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST = \
wxvlc.dirs \
wxvlc.menu \
patches/00list \
- patches/20_configure.dpatch \
patches/20_faad2.dpatch \
patches/20_ffmpeg.dpatch \
patches/20_interfaces.dpatch \
diff --git a/debian/changelog b/debian/changelog
index 5fb5eb95ac896cba1f1fd1cbb768072e0307e5fb..c9d5baba67e4b96090a17c8a5499ae40a877c985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+vlc (0.7.2.final-11) unstable; urgency=medium
+
+ * configure.ac:
+ + Fixed an LDFLAGS/CFLAGS confusion.
+ + Don't use -finline-limit since it now tries to inline functions that
+ have not been explicitely inlined (Closes: #265673).
+ * debian/patches/20_configure.dpatch:
+ + Don't manage this patch with dpatch since it causes ownership issues.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sun, 15 Aug 2004 01:35:35 +0200
+
+vlc (0.7.2.final-10) unstable; urgency=medium
+
+ * The "I hope I got it right this time" upload.
+ * configure.ac:
+ + Use -maltivec -mabi=altivec for the memcpyaltivec and deinterlace
+ plugins on PowerPC.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Tue, 10 Aug 2004 18:01:47 +0200
+
+vlc (0.7.2.final-9) unstable; urgency=low
+
+ * debian/control:
+ + Added a missing dpatch build dependency (Closes: #263363).
+ + Removed the modplug plugin until libmodplug-dev enters Debian.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Tue, 10 Aug 2004 11:01:15 +0200
+
+vlc (0.7.2.final-8) unstable; urgency=low
+
+ * debian/control:
+ + Added a missing dpatch build dependency.
+ * configure.ac:
+ + Fixed the powerpc build by conditionally re-enabling -maltivec
+ -mabi=altivec.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Fri, 30 Jul 2004 00:05:58 +0200
+
vlc (0.7.2.final-7) unstable; urgency=low
* debian/rules:
diff --git a/debian/control b/debian/control
index 01189775f7cf3d9868ae1c7cd0ce8a0a90067d9f..f3203269f707dbe469eb0785baf9ef75ba470404 100644
--- 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, libmodplug-dev, libxml2-dev, libid3tag0-dev, libtheora-dev
+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
Build-Conflicts: libavcodec-dev
Standards-Version: 3.6.1.1
diff --git a/debian/patches/00list b/debian/patches/00list
index ae7e9ef4834bbdd3ed8d0fd45d61cef8b53aa6f8..77202846da78d138578f74889a527c3a2f346977 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
-20_configure
20_faad2
20_ffmpeg
20_interfaces
diff --git a/debian/patches/20_configure.dpatch b/debian/patches/20_configure.dpatch
deleted file mode 100755
index 6c2f3668f0cdc8cde2521f85c4a36aa58e27a7aa..0000000000000000000000000000000000000000
--- a/debian/patches/20_configure.dpatch
+++ /dev/null
@@ -1,515 +0,0 @@
-#! /bin/sh -e
-## 20_configure.dpatch by <sam+deb@zoy.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure vlc-0.7.2.final/configure
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure 2004-07-29 17:34:03.000000000 +0200
-+++ vlc-0.7.2.final/configure 2004-07-29 17:36:45.000000000 +0200
-@@ -309,7 +309,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP EGREP OBJC OBJCFLAGS OBJCDEPMODE am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE RANLIB ac_ct_RANLIB AR ac_ct_AR LD ac_ct_LD UPX ac_ct_UPX WINDRES ac_ct_WINDRES HAVE_BEOS_TRUE HAVE_BEOS_FALSE HAVE_DARWIN_TRUE HAVE_DARWIN_FALSE HAVE_WIN32_TRUE HAVE_WIN32_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BUILD_INTL_TRUE BUILD_INTL_FALSE BUILD_GETOPT_TRUE BUILD_GETOPT_FALSE BUILD_DIRENT_TRUE BUILD_DIRENT_FALSE DVDNAV_CONFIG PKG_CONFIG LIBCDIO_CFLAGS LIBCDIO_LIBS LIBCDDB_CFLAGS LIBCDDB_LIBS VCDINFO_CFLAGS VCDINFO_LIBS SDL12_CONFIG SDL11_CONFIG SDL_CONFIG FREETYPE_CONFIG FRIBIDI_CONFIG CACA_CONFIG ESD_CONFIG ARTS_CONFIG XML2_CONFIG GTK12_CONFIG GTK_CONFIG GTK2_CFLAGS GTK2_LIBS GNOME_CONFIG WX_CONFIG ORBIT_CONFIG MOZILLA_CONFIG CYGPATH ac_ct_CYGPATH BUILD_MOZILLA_TRUE BUILD_MOZILLA_FALSE HAVE_PLUGINS_TRUE HAVE_PLUGINS_FALSE HAVE_BUILTINS_TRUE HAVE_BUILTINS_FALSE UNTRUE_TRUE UNTRUE_FALSE DATA_PATH PLUGIN_PATH VLC_CONFIG SYS ARCH ALIASES ASM MOC XPIDL XPIDL_INCL LIBEXT INCLUDES ALL_LINGUAS LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP EGREP OBJC OBJCFLAGS OBJCDEPMODE RANLIB ac_ct_RANLIB AR ac_ct_AR LD ac_ct_LD UPX ac_ct_UPX WINDRES ac_ct_WINDRES HAVE_BEOS_TRUE HAVE_BEOS_FALSE HAVE_DARWIN_TRUE HAVE_DARWIN_FALSE HAVE_WIN32_TRUE HAVE_WIN32_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BUILD_INTL_TRUE BUILD_INTL_FALSE BUILD_GETOPT_TRUE BUILD_GETOPT_FALSE BUILD_DIRENT_TRUE BUILD_DIRENT_FALSE DVDNAV_CONFIG PKG_CONFIG LIBCDIO_CFLAGS LIBCDIO_LIBS LIBCDDB_CFLAGS LIBCDDB_LIBS VCDINFO_CFLAGS VCDINFO_LIBS SDL12_CONFIG SDL11_CONFIG SDL_CONFIG FREETYPE_CONFIG FRIBIDI_CONFIG CACA_CONFIG ESD_CONFIG ARTS_CONFIG XML2_CONFIG GTK12_CONFIG GTK_CONFIG GTK2_CFLAGS GTK2_LIBS GNOME_CONFIG WX_CONFIG ORBIT_CONFIG MOZILLA_CONFIG CYGPATH ac_ct_CYGPATH BUILD_MOZILLA_TRUE BUILD_MOZILLA_FALSE HAVE_PLUGINS_TRUE HAVE_PLUGINS_FALSE HAVE_BUILTINS_TRUE HAVE_BUILTINS_FALSE UNTRUE_TRUE UNTRUE_FALSE DATA_PATH PLUGIN_PATH VLC_CONFIG SYS ARCH ALIASES ASM MOC XPIDL XPIDL_INCL LIBEXT INCLUDES ALL_LINGUAS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -1594,7 +1594,7 @@
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
--am__api_version="1.7"
-+am__api_version="1.6"
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -1815,15 +1815,6 @@
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
--rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
-- am__leading_dot=.
--else
-- am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--
- # test to see if srcdir already configured
- if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
-@@ -1832,16 +1823,6 @@
- { (exit 1); exit 1; }; }
- fi
-
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
-- if (cygpath --version) >/dev/null 2>/dev/null; then
-- CYGPATH_W='cygpath -w'
-- else
-- CYGPATH_W=echo
-- fi
--fi
--
--
- # Define the identity of the package.
- PACKAGE=vlc
- VERSION=0.7.2
-@@ -1970,10 +1951,14 @@
-
-
-
-+# Add the stamp file to the list of files AC keeps track of,
-+# along with our hook.
- ac_config_headers="$ac_config_headers config.h"
-
-
-
-+
-+
- CPPFLAGS_save="${CPPFLAGS}"
- CFLAGS_save="${CFLAGS}"
- CXXFLAGS_save="${CXXFLAGS}"
-@@ -2904,16 +2889,24 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--DEPDIR="${am__leading_dot}deps"
-+rm -f .deps 2>/dev/null
-+mkdir .deps 2>/dev/null
-+if test -d .deps; then
-+ DEPDIR=.deps
-+else
-+ # MS-DOS does not allow filenames that begin with a dot.
-+ DEPDIR=_deps
-+fi
-+rmdir .deps 2>/dev/null
-+
-
- ac_config_commands="$ac_config_commands depfiles"
-
-
- am_make=${MAKE-make}
- cat > confinc << 'END'
--am__doit:
-+doit:
- @echo done
--.PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
- echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-@@ -2928,7 +2921,7 @@
- # In particular we don't look at `^make:' because GNU make might
- # be invoked under some other name (usually "gmake"), in which
- # case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-@@ -2988,32 +2981,18 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ echo '#include "conftest.h"' > conftest.c
-+ echo 'int i;' > conftest.h
-+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -3031,20 +3010,13 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-- >/dev/null 2>conftest.err &&
-- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ source=conftest.c object=conftest.o \
-+ depfile=conftest.Po tmpdepfile=conftest.TPo \
-+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-- am_cv_CC_dependencies_compiler_type=$depmode
-- break
-- fi
-+ am_cv_CC_dependencies_compiler_type=$depmode
-+ break
- fi
- done
-
-@@ -3060,18 +3032,6 @@
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
--
--if
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-- am__fastdepCC_TRUE=
-- am__fastdepCC_FALSE='#'
--else
-- am__fastdepCC_TRUE='#'
-- am__fastdepCC_FALSE=
--fi
--
--
- if test "x$CC" != xcc; then
- echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
- echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
-@@ -3778,32 +3738,18 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
-
- am_cv_CXX_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ echo '#include "conftest.h"' > conftest.c
-+ echo 'int i;' > conftest.h
-+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -3821,20 +3767,13 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-- >/dev/null 2>conftest.err &&
-- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ source=conftest.c object=conftest.o \
-+ depfile=conftest.Po tmpdepfile=conftest.TPo \
-+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-- am_cv_CXX_dependencies_compiler_type=$depmode
-- break
-- fi
-+ am_cv_CXX_dependencies_compiler_type=$depmode
-+ break
- fi
- done
-
-@@ -3850,18 +3789,6 @@
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
--
--if
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-- am__fastdepCXX_TRUE=
-- am__fastdepCXX_FALSE='#'
--else
-- am__fastdepCXX_TRUE='#'
-- am__fastdepCXX_FALSE=
--fi
--
--
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4260,32 +4187,18 @@
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
-
- am_cv_OBJC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- : > sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ echo '#include "conftest.h"' > conftest.c
-+ echo 'int i;' > conftest.h
-+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
-@@ -4303,20 +4216,13 @@
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-- >/dev/null 2>conftest.err &&
-- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ source=conftest.c object=conftest.o \
-+ depfile=conftest.Po tmpdepfile=conftest.TPo \
-+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- # icc doesn't choke on unknown options, it will just issue warnings
-- # (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored.
-- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-- am_cv_OBJC_dependencies_compiler_type=$depmode
-- break
-- fi
-+ am_cv_OBJC_dependencies_compiler_type=$depmode
-+ break
- fi
- done
-
-@@ -4332,18 +4238,6 @@
- OBJCDEPMODE=depmode=$am_cv_OBJC_dependencies_compiler_type
-
-
--
--if
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_OBJC_dependencies_compiler_type" = gcc3; then
-- am__fastdepOBJC_TRUE=
-- am__fastdepOBJC_FALSE='#'
--else
-- am__fastdepOBJC_TRUE='#'
-- am__fastdepOBJC_FALSE=
--fi
--
--
- echo "$as_me:$LINENO: result: not implemented yet" >&5
- echo "${ECHO_T}not implemented yet" >&6
-
-@@ -35868,27 +35762,6 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
--if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then
-- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepOBJC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepOBJC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
--fi
- if test -z "${HAVE_BEOS_TRUE}" && test -z "${HAVE_BEOS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"HAVE_BEOS\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -36594,7 +36467,6 @@
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
- s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
- s,@INSTALL_DATA@,$INSTALL_DATA,;t t
--s,@CYGPATH_W@,$CYGPATH_W,;t t
- s,@PACKAGE@,$PACKAGE,;t t
- s,@VERSION@,$VERSION,;t t
- s,@ACLOCAL@,$ACLOCAL,;t t
-@@ -36609,7 +36481,6 @@
- s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
- s,@AWK@,$AWK,;t t
- s,@SET_MAKE@,$SET_MAKE,;t t
--s,@am__leading_dot@,$am__leading_dot,;t t
- s,@CC@,$CC,;t t
- s,@CFLAGS@,$CFLAGS,;t t
- s,@LDFLAGS@,$LDFLAGS,;t t
-@@ -36624,22 +36495,16 @@
- s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
- s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
- s,@CCDEPMODE@,$CCDEPMODE,;t t
--s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
- s,@CPP@,$CPP,;t t
- s,@CXX@,$CXX,;t t
- s,@CXXFLAGS@,$CXXFLAGS,;t t
- s,@ac_ct_CXX@,$ac_ct_CXX,;t t
- s,@CXXDEPMODE@,$CXXDEPMODE,;t t
--s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
--s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
- s,@CXXCPP@,$CXXCPP,;t t
- s,@EGREP@,$EGREP,;t t
- s,@OBJC@,$OBJC,;t t
- s,@OBJCFLAGS@,$OBJCFLAGS,;t t
- s,@OBJCDEPMODE@,$OBJCDEPMODE,;t t
--s,@am__fastdepOBJC_TRUE@,$am__fastdepOBJC_TRUE,;t t
--s,@am__fastdepOBJC_FALSE@,$am__fastdepOBJC_FALSE,;t t
- s,@RANLIB@,$RANLIB,;t t
- s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
- s,@AR@,$AR,;t t
-@@ -37199,29 +37064,13 @@
- cat $tmp/config.h
- rm -f $tmp/config.h
- fi
--# Compute $ac_file's index in $config_headers.
--_am_stamp_count=1
--for _am_header in $config_headers :; do
-- case $_am_header in
-- $ac_file | $ac_file:* )
-- break ;;
-- * )
-- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+ # Run the commands associated with the file.
-+ case $ac_file in
-+ config.h ) # update the timestamp
-+echo 'timestamp for config.h' >"./stamp-h1"
-+ ;;
- esac
- done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
--$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X$ac_file : 'X\(//\)[^/]' \| \
-- X$ac_file : 'X\(//\)$' \| \
-- X$ac_file : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X$ac_file |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`/stamp-h$_am_stamp_count
--done
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure.ac vlc-0.7.2.final/configure.ac
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/configure.ac 2004-07-29 17:34:03.000000000 +0200
-+++ vlc-0.7.2.final/configure.ac 2004-07-29 17:36:04.000000000 +0200
-@@ -1011,7 +1011,8 @@
- #include <altivec.h>
- #endif],
- [vec_ld(0, (unsigned char *)0);],
-- [ac_cv_c_altivec="-maltivec -mabi=altivec"],
-+ [ac_cv_c_altivec=""
-+ ac_cv_c_altivec_abi="-maltivec -mabi=altivec"],
- [# Linux/PPC test (old GCC versions)
- CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec"
- AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H
-@@ -1025,7 +1026,9 @@
- CFLAGS="${CFLAGS_save}"])
- if test "${ac_cv_c_altivec}" != "no"; then
- AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
-- AX_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec deinterlace i420_yuy2_altivec],[${ac_cv_c_altivec}])
-+ VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}])
-+ VLC_ADD_CFLAGS([idctaltivec motionaltivec memcpyaltivec deinterlace],[${ac_cv_c_altivec}])
-+ VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
- ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
- fi
-
-@@ -2178,9 +2181,9 @@
- else
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}"
- AC_CHECK_HEADERS(dts.h, [
-- AC_CHECK_LIB(dts, dts_free, [
-+ AC_CHECK_LIB(dts_pic, dts_free, [
- AX_ADD_PLUGINS([dtstofloat32])
-- AX_ADD_LDFLAGS([dtstofloat32],[-ldts])
-+ AX_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
- ],[
- if test "${enable_dts}" = "yes"; then
- AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html])
diff --git a/debian/rules b/debian/rules
index 897e5416e8c53082112984bcd9c8ddff653565eb..9383750d36627e8a5bc8863a3574d492c844e037 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,7 +153,7 @@ endif
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f configure-stamp build-stamp
@@ -176,8 +176,12 @@ clean:
# Remove spurious autotools stuff
rm -f config.log confdefs.h
+ touch configure.ac -d yesterday
+ touch aclocal.m4 -d yesterday
+ touch configure -d yesterday
+ touch config.h.in -d yesterday
+ touch `find . -name Makefile.in` -d yesterday
-$(MAKE) distclean
- $(MAKE) -f debian/rules unpatch
dh_clean
@@ -198,7 +202,7 @@ install: build
#cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
#strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
- rm -Rf debian/vlc/usr/share/vlc/skins
+ rm -Rf debian/vlc/$(VIDDIR)/skins
ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
# Package: libvlc0-dev
@@ -322,8 +326,7 @@ endif
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/usr/share/vlc/ui.rc \
- debian/kvlc/usr/share/vlc
+ 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
@@ -338,6 +341,7 @@ endif
# Package: wxvlc
mv debian/vlc/usr/bin/wxvlc debian/wxvlc/usr/bin/
ln -s vlc debian/wxvlc/usr/share/doc/wxvlc
+ cp debian/vlc/$(VIDDIR)/vlc.xpm debian/wxvlc/$(VIDDIR)/wxvlc.xpm
mv debian/vlc/usr/lib/vlc/gui/libwxwindows_plugin.so \
debian/wxvlc/usr/lib/vlc/gui/
ln -s vlc.1.gz debian/wxvlc/usr/share/man/man1/wxvlc.1.gz
diff --git a/debian/wxvlc.menu b/debian/wxvlc.menu
index 24da91d8457cdc965cfafcce92418934d04d1649..64fcb1ba55f4610d395f3e036930e01b86592730 100644
--- 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" \
- icon="/usr/share/vlc/vlc.xpm" hints="Video"
+ icon="/usr/share/vlc/wxvlc.xpm" hints="Video"