r1265 - in /unstable/vlc/debian: ./ .bzr-builddeb/ patches/
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Jun 24 08:54:13 UTC 2008
Author: siretart
Date: Tue Jun 24 08:54:13 2008
New Revision: 1265
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1265
Log:
upgrade to new upstream release 0.8.6.h
Added:
unstable/vlc/debian/.bzr-builddeb/
unstable/vlc/debian/.bzr-builddeb/default.conf
Removed:
unstable/vlc/debian/patches/400_oCERT-2008-004.patch
unstable/vlc/debian/patches/401_vlc_trac_1552.patch
unstable/vlc/debian/patches/402_mp4a-resampling.patch
Modified:
unstable/vlc/debian/ (props changed)
unstable/vlc/debian/changelog
unstable/vlc/debian/patches/001_am_maintainer_mode.diff
unstable/vlc/debian/patches/010_iceape.diff
unstable/vlc/debian/patches/050_bootstrap.diff
unstable/vlc/debian/patches/101_certificates_paths.diff
unstable/vlc/debian/patches/series
Propchange: unstable/vlc/debian/
------------------------------------------------------------------------------
--- bzr:ancestry:v3-single1-dW5zdGFibGUvdmxjL2RlYmlhbg.. (added)
+++ bzr:ancestry:v3-single1-dW5zdGFibGUvdmxjL2RlYmlhbg.. Tue Jun 24 08:54:13 2008
@@ -1,0 +1,1 @@
+siretart at tauware.de-20080624085208-4ew55roqofml24hu
Propchange: unstable/vlc/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (added)
+++ bzr:file-ids Tue Jun 24 08:54:13 2008
@@ -1,0 +1,2 @@
+.bzr-builddeb bzrbuilddeb-20080624075504-skgnm1kenok6znso-1
+.bzr-builddeb/default.conf default.conf-20080624075553-5sr4fvejh8gnd0hp-1
Propchange: unstable/vlc/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvdmxjL2RlYmlhbg.. (added)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvdmxjL2RlYmlhbg.. Tue Jun 24 08:54:13 2008
@@ -1,0 +1,1 @@
+114 siretart at tauware.de-20080624085341-z00cp00zf2r3ry4n
Propchange: unstable/vlc/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (added)
+++ bzr:revision-info Tue Jun 24 08:54:13 2008
@@ -1,0 +1,4 @@
+timestamp: 2008-06-24 10:53:41.703000069 +0200
+committer: Reinhard Tartler <siretart at tauware.de>
+properties:
+ branch-nick: unstable
Added: unstable/vlc/debian/.bzr-builddeb/default.conf
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/.bzr-builddeb/default.conf?rev=1265&op=file
==============================================================================
--- unstable/vlc/debian/.bzr-builddeb/default.conf (added)
+++ unstable/vlc/debian/.bzr-builddeb/default.conf Tue Jun 24 08:54:13 2008
@@ -1,0 +1,2 @@
+[BUILDDEB]
+merge = True
Modified: unstable/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/changelog?rev=1265&op=diff
==============================================================================
--- unstable/vlc/debian/changelog (original)
+++ unstable/vlc/debian/changelog Tue Jun 24 08:54:13 2008
@@ -1,30 +1,24 @@
-vlc (0.8.6.f-1) UNRELEASED; urgency=medium
+vlc (0.8.6.h-1) UNRELEASED; urgency=medium
[ Christophe Mutricy ]
* Acknowledge NMU by Nico Golde. Thanks.
* Acknowledge NMU by Mike Hommey. Thanks.
* New security upstrem release
- - Fix buffer overflow (CVE-2008-1881)
+ - Fix buffer overflow (CVE-2008-1881)
- Fix out of bound array access (CVE-2008-1769)
- Fix various integer overflow in MP4 demuxer, Cinepak, RTSP
- (CVE-2008-1489, CVE-2008-1768)
- - Remove 105_min_mkv.patch, 400-CVE-2008-1489.diff and
- 401-CVE-2008-0073.diff, 402-CVE-2008-1881, 403-CVE-2008-1768.diff
+ (CVE-2008-1489, CVE-2008-1768)
+ - Remove 105_min_mkv.patch, 400-CVE-2008-1489.diff and
+ 401-CVE-2008-0073.diff, 402-CVE-2008-1881, 403-CVE-2008-1768.diff
and 404-CVE-2008-1881 integrated upstream
-
- * Patches taken from upstream git
- - 400_oCERT-2008-004.patch: Fix insufficient boundary checking in speex
- code (oCERT-2008-004, CVE-2008-1686)
- - 401_vlc_trac_1552.patch: fix a bug introduced in 0.8.6f in the sap
- parser
- - 402_mp4a-resampling.patch: Fix mp4a resampiling
- * Remove old transitional packages: vlc-plugin-alsa and wxvlc
+ * Remove old transitional packages: vlc-plugin-alsa and wxvlc
(Closes: #477543, #477545)
* Add some magic for reportbug to ask people to remove their plugin cache
and get the info for vlc-nox and libvlc0 also.
[ Reinhard Tartler ]
* added a watch file
+ * new upstream release, refreshing patches
-- Reinhard Tartler <siretart at tauware.de> Tue, 24 Jun 2008 09:39:34 +0200
Modified: unstable/vlc/debian/patches/001_am_maintainer_mode.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/001_am_maintainer_mode.diff?rev=1265&op=diff
==============================================================================
--- unstable/vlc/debian/patches/001_am_maintainer_mode.diff (original)
+++ unstable/vlc/debian/patches/001_am_maintainer_mode.diff Tue Jun 24 08:54:13 2008
@@ -1,8 +1,6 @@
-Index: vlc-0.8.6.a.debian/configure.ac
-===================================================================
---- vlc-0.8.6.a.debian.orig/configure.ac 2007-03-17 00:09:31.000000000 +0100
-+++ vlc-0.8.6.a.debian/configure.ac 2007-03-17 00:09:45.000000000 +0100
-@@ -23,9 +23,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,9 +24,6 @@ dnl you can specify "--disable-maintaine
dnl automake behavior, you've likely never heard of maintainer mode, so we
dnl can't expect you to enable it manually.
Modified: unstable/vlc/debian/patches/010_iceape.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/010_iceape.diff?rev=1265&op=diff
==============================================================================
--- unstable/vlc/debian/patches/010_iceape.diff (original)
+++ unstable/vlc/debian/patches/010_iceape.diff Tue Jun 24 08:54:13 2008
@@ -1,8 +1,6 @@
-Index: vlc-0.8.6.e/configure.ac
-===================================================================
---- vlc-0.8.6.e.orig/configure.ac 2008-05-15 07:47:29.880615291 +0200
-+++ vlc-0.8.6.e/configure.ac 2008-05-15 07:47:41.796609662 +0200
-@@ -5119,9 +5119,9 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -5150,9 +5150,9 @@ then
if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"
then
dnl New firefox-1.5 SDK api
@@ -14,7 +12,7 @@
[],
[
PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr],
-@@ -5136,7 +5136,7 @@
+@@ -5167,7 +5167,7 @@ then
]
)
])
@@ -23,7 +21,7 @@
MOZILLA_REQUIRED_HEADERS=1
AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
-@@ -5150,7 +5150,7 @@
+@@ -5181,7 +5181,7 @@ then
fi
MOZILLA_REQUIRED_HEADERS=
mozilla=:
@@ -32,7 +30,7 @@
if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then
MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h"
elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then
-@@ -5162,7 +5162,7 @@
+@@ -5193,7 +5193,7 @@ then
VLC_ADD_LDFLAGS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt])
fi
VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
Modified: unstable/vlc/debian/patches/050_bootstrap.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/050_bootstrap.diff?rev=1265&op=diff
==============================================================================
--- unstable/vlc/debian/patches/050_bootstrap.diff (original)
+++ unstable/vlc/debian/patches/050_bootstrap.diff Tue Jun 24 08:54:13 2008
@@ -1,8 +1,6 @@
-Index: vlc-0.8.6.e/configure
-===================================================================
---- vlc-0.8.6.e.orig/configure 2008-02-24 20:07:09.000000000 +0100
-+++ vlc-0.8.6.e/configure 2008-05-15 07:52:39.532607714 +0200
-@@ -988,13 +988,13 @@
+--- a/configure
++++ b/configure
+@@ -988,13 +988,13 @@ HAS_WIDL_COMPILER_TRUE
HAS_WIDL_COMPILER_FALSE
BUILD_ACTIVEX_TRUE
BUILD_ACTIVEX_FALSE
@@ -20,7 +18,7 @@
MOZILLA_NSPR_CFLAGS
MOZILLA_NSPR_LIBS
NSPR_CFLAGS
-@@ -1091,10 +1091,10 @@
+@@ -1091,10 +1091,10 @@ GNUTLS_CFLAGS
GNUTLS_LIBS
MIDL
WIDL
@@ -35,7 +33,7 @@
MOZILLA_NSPR_CFLAGS
MOZILLA_NSPR_LIBS
NSPR_CFLAGS
-@@ -1972,14 +1972,13 @@
+@@ -1973,14 +1973,13 @@ Some influential environment variables:
GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
MIDL Microsoft IDL compiler (Win32 platform only)
WIDL Wine IDL compiler (requires Wine SDK)
@@ -57,7 +55,7 @@
MOZILLA_NSPR_CFLAGS
C compiler flags for MOZILLA_NSPR, overriding pkg-config
MOZILLA_NSPR_LIBS
-@@ -3022,11 +3021,6 @@
+@@ -3023,11 +3022,6 @@ ac_config_headers="$ac_config_headers co
@@ -69,174 +67,174 @@
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
# Check whether --enable-maintainer-mode was given.
-@@ -6576,7 +6570,7 @@
+@@ -6577,7 +6571,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6579 "configure"' > conftest.$ac_ext
-+ echo '#line 6573 "configure"' > conftest.$ac_ext
+- echo '#line 6580 "configure"' > conftest.$ac_ext
++ echo '#line 6574 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9215,11 +9209,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9218: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9212: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9222: \$? = $ac_status" >&5
-+ echo "$as_me:9216: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9505,11 +9499,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9508: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9502: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:9512: \$? = $ac_status" >&5
-+ echo "$as_me:9506: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -9609,11 +9603,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9612: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9606: $lt_compile\"" >&5)
+@@ -9216,11 +9210,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9219: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9213: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9223: \$? = $ac_status" >&5
++ echo "$as_me:9217: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9506,11 +9500,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9509: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9503: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9513: \$? = $ac_status" >&5
++ echo "$as_me:9507: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9610,11 +9604,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9613: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9607: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9616: \$? = $ac_status" >&5
-+ echo "$as_me:9610: \$? = $ac_status" >&5
+- echo "$as_me:9617: \$? = $ac_status" >&5
++ echo "$as_me:9611: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -11986,7 +11980,7 @@
+@@ -11987,7 +11981,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11989 "configure"
-+#line 11983 "configure"
+-#line 11990 "configure"
++#line 11984 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12086,7 +12080,7 @@
+@@ -12087,7 +12081,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 12089 "configure"
-+#line 12083 "configure"
+-#line 12090 "configure"
++#line 12084 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14487,11 +14481,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14490: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14484: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:14494: \$? = $ac_status" >&5
-+ echo "$as_me:14488: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -14591,11 +14585,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14594: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14588: $lt_compile\"" >&5)
+@@ -14488,11 +14482,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14491: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14485: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14495: \$? = $ac_status" >&5
++ echo "$as_me:14489: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -14592,11 +14586,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14595: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14589: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14598: \$? = $ac_status" >&5
-+ echo "$as_me:14592: \$? = $ac_status" >&5
+- echo "$as_me:14599: \$? = $ac_status" >&5
++ echo "$as_me:14593: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16189,11 +16183,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16192: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16186: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:16196: \$? = $ac_status" >&5
-+ echo "$as_me:16190: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -16293,11 +16287,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16296: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16290: $lt_compile\"" >&5)
+@@ -16190,11 +16184,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16187: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16197: \$? = $ac_status" >&5
++ echo "$as_me:16191: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16294,11 +16288,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16297: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16291: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16300: \$? = $ac_status" >&5
-+ echo "$as_me:16294: \$? = $ac_status" >&5
+- echo "$as_me:16301: \$? = $ac_status" >&5
++ echo "$as_me:16295: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18513,11 +18507,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18516: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18510: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18520: \$? = $ac_status" >&5
-+ echo "$as_me:18514: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -18803,11 +18797,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18806: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18800: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&5
-- echo "$as_me:18810: \$? = $ac_status" >&5
-+ echo "$as_me:18804: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-@@ -18907,11 +18901,11 @@
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18910: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18904: $lt_compile\"" >&5)
+@@ -18514,11 +18508,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18517: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18511: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18521: \$? = $ac_status" >&5
++ echo "$as_me:18515: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18804,11 +18798,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18807: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18801: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18811: \$? = $ac_status" >&5
++ echo "$as_me:18805: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18908,11 +18902,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18911: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18905: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18914: \$? = $ac_status" >&5
-+ echo "$as_me:18908: \$? = $ac_status" >&5
+- echo "$as_me:18915: \$? = $ac_status" >&5
++ echo "$as_me:18909: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -62202,20 +62196,20 @@
+@@ -62427,20 +62421,20 @@ then
then
pkg_failed=no
@@ -264,7 +262,7 @@
else
pkg_failed=yes
fi
-@@ -62224,16 +62218,16 @@
+@@ -62449,16 +62443,16 @@ else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
@@ -286,7 +284,7 @@
else
pkg_failed=yes
fi
-@@ -62252,12 +62246,12 @@
+@@ -62477,12 +62471,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -302,7 +300,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -62549,27 +62543,27 @@
+@@ -62774,27 +62768,27 @@ echo "$as_me: error: Please install the
else
@@ -339,7 +337,7 @@
else
pkg_failed=yes
fi
-@@ -62578,16 +62572,16 @@
+@@ -62803,16 +62797,16 @@ else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
@@ -361,7 +359,7 @@
else
pkg_failed=yes
fi
-@@ -62606,12 +62600,12 @@
+@@ -62831,12 +62825,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -377,7 +375,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -63095,13 +63089,13 @@
+@@ -63320,13 +63314,13 @@ echo "${ECHO_T}yes" >&6; }
fi
else
@@ -394,7 +392,7 @@
MOZILLA_REQUIRED_HEADERS=1
for ac_header in mozilla-config.h
-@@ -63457,7 +63451,7 @@
+@@ -63682,7 +63676,7 @@ echo "$as_me: error: Please install the
fi
MOZILLA_REQUIRED_HEADERS=
mozilla=:
@@ -403,7 +401,7 @@
if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then
MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h"
elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then
-@@ -63481,7 +63475,7 @@
+@@ -63706,7 +63700,7 @@ echo "$as_me: error: Please install the
for element in mozilla; do
@@ -412,43 +410,43 @@
am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
done
-@@ -64604,7 +64598,7 @@
+@@ -64829,7 +64823,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
--/* #line 64607 "configure" */
-+/* #line 64601 "configure" */
+-/* #line 64832 "configure" */
++/* #line 64826 "configure" */
public class Test {
}
EOF
-@@ -64780,7 +64774,7 @@
+@@ -65005,7 +64999,7 @@ EOF
if uudecode$EXEEXT Test.uue; then
ac_cv_prog_uudecode_base64=yes
else
-- echo "configure: 64783: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
-+ echo "configure: 64777: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+- echo "configure: 65008: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
++ echo "configure: 65002: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
echo "configure: failed file was:" >&5
cat Test.uue >&5
ac_cv_prog_uudecode_base64=no
-@@ -64902,7 +64896,7 @@
+@@ -65127,7 +65121,7 @@ else
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
--/* #line 64905 "configure" */
-+/* #line 64899 "configure" */
+-/* #line 65130 "configure" */
++/* #line 65124 "configure" */
public class Test {
}
EOF
-@@ -64939,7 +64933,7 @@
+@@ -65164,7 +65158,7 @@ JAVA_TEST=Test.java
CLASS_TEST=Test.class
TEST=Test
cat << \EOF > $JAVA_TEST
--/* [#]line 64942 "configure" */
-+/* [#]line 64936 "configure" */
+-/* [#]line 65167 "configure" */
++/* [#]line 65161 "configure" */
public class Test {
public static void main (String args[]) {
System.exit (0);
-@@ -66978,13 +66972,13 @@
+@@ -67203,13 +67197,13 @@ HAS_WIDL_COMPILER_TRUE!$HAS_WIDL_COMPILE
HAS_WIDL_COMPILER_FALSE!$HAS_WIDL_COMPILER_FALSE$ac_delim
BUILD_ACTIVEX_TRUE!$BUILD_ACTIVEX_TRUE$ac_delim
BUILD_ACTIVEX_FALSE!$BUILD_ACTIVEX_FALSE$ac_delim
Modified: unstable/vlc/debian/patches/101_certificates_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/101_certificates_paths.diff?rev=1265&op=diff
==============================================================================
--- unstable/vlc/debian/patches/101_certificates_paths.diff (original)
+++ unstable/vlc/debian/patches/101_certificates_paths.diff Tue Jun 24 08:54:13 2008
@@ -1,8 +1,6 @@
-Index: vlc-0.8.6-svn20061012.debian/modules/misc/gnutls.c
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/modules/misc/gnutls.c 2006-09-22 17:14:31.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/modules/misc/gnutls.c 2007-01-08 02:28:18.000000000 +0100
-@@ -681,6 +681,10 @@
+--- a/modules/misc/gnutls.c
++++ b/modules/misc/gnutls.c
+@@ -714,6 +714,10 @@ gnutls_ClientCreate( tls_t *p_tls )
p_sys->x509_cred, psz_path, VLC_FALSE );
free( psz_path );
}
Modified: unstable/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/debian/patches/series?rev=1265&op=diff
==============================================================================
--- unstable/vlc/debian/patches/series (original)
+++ unstable/vlc/debian/patches/series Tue Jun 24 08:54:13 2008
@@ -7,6 +7,3 @@
104_notify.diff
200_osdmenu_paths.diff
300_manpage_syntax.diff
-400_oCERT-2008-004.patch
-401_vlc_trac_1552.patch
-402_mp4a-resampling.patch
More information about the pkg-multimedia-commits
mailing list