[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.2-1+exp1-18-g968f005

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0d7cd7de244915fa8a608e10f649756d562a54e2
Merge: ee9532473c0724c3396b183e8d4a709d01be7c93 4370b9deb386000afc3910f94e6f68796b0c1378
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Aug 19 21:46:14 2010 +0200

    Merge branch 'sid' into experimental

diff --combined debian/changelog
index 6ad4237,d4fe88c..ea74d35
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,19 +1,31 @@@
- vlc (1.1.2-1+exp1) experimental; urgency=low
++vlc (1.1.3-1+exp1) UNRELEASED; urgency=low
 +
 +  [ Christophe Mutricy ]
 +  * Depends on xulrunner-dev >= 1.9.2
 +  * Activate VA-API (Closes: #587792, LP: #539406)
 +
 +  [ Benjamin Drung ]
 +  * Switch to dh7.
 +  * Move libavcodec plugin from vlc-nox to vlc.
 +
 + -- Benjamin Drung <bdrung at ubuntu.com>  Thu, 05 Aug 2010 01:42:50 +0200
 +
+ vlc (1.1.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     + Fix insufficient input validation in TagLib plugin.
+       (VideoLAN-SA-1004, CVE-2010-2937) (Closes: #592669, LP: #616510)
+     + Set urgency to medium
+   * 502_xulrunner_191.diff: Shorten, split into two parts, and refresh it.
+   * Drop 102_dejavu_font.diff and depend on ttf-freefont instead of ttf-
+     dejavu-core. ttf-freefont is very likely to be present on a Debian
+     box, because cups depends on it.
+   * Drop 501_decrease_alsa_buffer.diff. The pulseaudio output module has
+     a higher priority than the ALSA output plugin and should be used on
+     pulseaudio systems.
+ 
+  -- Benjamin Drung <bdrung at ubuntu.com>  Thu, 19 Aug 2010 13:33:09 +0200
+ 
  vlc (1.1.2-1) unstable; urgency=low
  
    [ Christophe Mutricy ]
diff --combined debian/control
index 1b9c438,a63bdd1..6c4e40b
--- a/debian/control
+++ b/debian/control
@@@ -17,8 -17,8 +17,8 @@@ Build-Depends: debhelper (>= 7.2.3~)
                 libass-dev (>= 0.9.5-2),
                 libavahi-client-dev,
                 libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 -               libavcodec-dev (>= 0.cvs20060823),
 -               libavformat-dev (>= 0.cvs20060823),
 +               libavcodec-dev (>= 4:0.6),
 +               libavformat-dev (>= 4:0.6),
                 libcaca-dev (>= 0.99.beta4),
                 libcddb2-dev,
                 libcdio-dev,
@@@ -52,7 -52,7 +52,7 @@@
                 libnotify-dev,
                 libogg-dev,
                 libpng12-dev,
 -               libpostproc-dev (>= 0.cvs20060823),
 +               libpostproc-dev (>= 4:0.6),
                 libproxy-dev,
                 libpulse-dev,
                 libqt4-dev,
@@@ -65,7 -65,7 +65,7 @@@
                 libsmbclient-dev,
                 libspeex-dev,
                 libsvga1-dev [amd64 i386],
 -               libswscale-dev,
 +               libswscale-dev (>= 4:0.6),
                 libtag1-dev,
                 libtar-dev,
                 libtheora-dev,
@@@ -73,7 -73,6 +73,7 @@@
                 libudev-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libupnp3-dev,
                 libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 +               libva-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libvcdinfo-dev,
                 libvorbis-dev,
                 libx11-dev,
@@@ -91,7 -90,7 +91,7 @@@
                 lua5.1,
                 nasm,
                 pkg-config,
 -               xulrunner-dev,
 +               xulrunner-dev (>= 1.9.2),
                 yasm [amd64 kfreebsd-amd64],
                 zlib1g-dev
  Standards-Version: 3.9.1
@@@ -175,7 -174,7 +175,7 @@@ Description: multimedia plugin for web 
  
  Package: vlc
  Architecture: any
- Depends: ttf-dejavu-core,
+ Depends: ttf-freefont,
           vlc-nox (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
@@@ -183,8 -182,8 +183,8 @@@ Recommends: vlc-plugin-notify (= ${bina
              vlc-plugin-pulse (= ${binary:Version})
  Suggests: mozilla-plugin-vlc,
            videolan-doc
 -Breaks: vlc-nox (<< 1.1.2)
 -Replaces: vlc-nox (<< 1.1.2)
 +Breaks: vlc-nox (<< 1.1.2-1+exp1)
 +Replaces: vlc-nox (<< 1.1.2-1+exp1)
  Provides: mp3-decoder
  Description: multimedia player and streamer
   VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
diff --combined debian/patches/series
index bae69ca,5ac589b..5f7d0a7
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,5 +1,3 @@@
  052_as-needed.diff
- 102_dejavu_font.diff
  104_notify.diff
  200_osdmenu_paths.diff
- 501_decrease_alsa_buffer.diff
 -502_xulrunner_191.diff
 -503_autoreconf.diff

-- 
VLC media player packaging