[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.1-1-27-g291cc50
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Tue Aug 3 23:47:38 UTC 2010
The following commit has been merged in the experimental branch:
commit 86254166c05270eb1f11f800ad9c3885165a29c3
Merge: 6140b58ce320b490890c7972e43bb6a982b0a2ce 151d59468061c4434c926898590d663b9355f27b
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Tue Aug 3 02:16:34 2010 +0200
Merge branch 'sid' into experimental
Conflicts:
debian/changelog
debian/rules
Git-Dch: Ignore
diff --combined debian/changelog
index 0927891,ae1a8f0..2f9fbee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,22 +1,29 @@@
- vlc (1.1.1-1+exp1) experimental; urgency=low
++vlc (1.1.2-1+exp1) UNRELEASED; urgency=low
+
+ * Depends on xulrunner-dev >= 1.9.2
+ * Activate VA-API (Closes: #587792, LP: #539406)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Thu, 22 Jul 2010 01:31:04 +0200
+
+ vlc (1.1.2-1) unstable; urgency=low
+
+ [ Christophe Mutricy ]
+ * New upstream release
+ * Also check for libxcb
+ * Move xcb_apps SD to vlc
+ * Re-enable the modplug module and require the fixed version
+ (Closes: #589890, #590787)
+ * Fix location of icons in vlc.menu (Closes: #590294)
+ thanks to Juhapekka Tolvanen
+ * Split the notify plugin to not depend on GTK+ (Closes: #590504)
+ thanks to Viktar Vauchkevich
+
+ [ Benjamin Drung ]
+ * Add proper Breaks and Replaces to vlc and vlc-plugin-notify.
+ * Bump Standards-Version to 3.9.1 (no changes required).
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Tue, 03 Aug 2010 01:38:17 +0200
+
vlc (1.1.1-1) unstable; urgency=low
* New upstream release
diff --combined debian/control
index aeaaf97,9fe4b57..36547d6
--- 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,
@@@ -44,6 -44,7 +44,7 @@@
liblua5.1-0-dev,
libmad0-dev,
libmatroska-dev (>= 0.8.0),
+ libmodplug-dev (>= 1:0.8.8.1),
libmpcdec-dev,
libmpeg2-4-dev,
libmtp-dev,
@@@ -51,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,
@@@ -64,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,
@@@ -72,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,
@@@ -90,10 -90,10 +91,10 @@@
lua5.1,
nasm,
pkg-config,
- xulrunner-dev,
+ xulrunner-dev (>= 1.9.2),
yasm [amd64 kfreebsd-amd64],
zlib1g-dev
- Standards-Version: 3.9.0
+ Standards-Version: 3.9.1
Homepage: http://www.videolan.org/vlc/
Vcs-Git: git://git.debian.org/git/pkg-multimedia/vlc.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=summary
@@@ -178,10 -178,12 +179,12 @@@ Depends: ttf-dejavu-core
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
- Recommends: vlc-plugin-pulse (= ${binary:Version})
+ Recommends: vlc-plugin-notify (= ${binary:Version}),
+ vlc-plugin-pulse (= ${binary:Version})
Suggests: mozilla-plugin-vlc,
videolan-doc
- Replaces: vlc-nox (<< 1.0.4-2)
+ Breaks: vlc-nox (<< 1.1.2)
+ Replaces: vlc-nox (<< 1.1.2)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@@ -289,6 -291,21 +292,21 @@@ Description: Jack audio plugins for VL
select the `jack' audio output plugin from the preferences menu.
For the jack input, use `vlc jack://channels=...:ports=...'
.
+ 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.
+
+ Package: vlc-plugin-notify
+ Architecture: any
+ Depends: vlc-nox (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+ Breaks: vlc-nox (<< 1.1.2)
+ Replaces: vlc-nox (<< 1.1.2)
+ Description: LibNotify plugin for VLC
+ This plugin adds support for libnotify track change notification to the
+ VLC media player.
+ .
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.
diff --combined debian/gbp.conf
index 7dde883,f917628..a005699
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,7 +1,7 @@@
[DEFAULT]
-debian-branch = sid
+debian-branch = experimental
pristine-tar = True
compression = bzip2
+
+ [git-dch]
+ meta = True
diff --combined debian/rules
index 4e4ea5d,6a30450..ee5ee6d
--- a/debian/rules
+++ b/debian/rules
@@@ -101,7 -101,7 +101,6 @@@ confflags +=
# dxva2 -> Windows only
# gnomevfs -> poorly maintained
# goom -> not in Debian
- # modplug -> http://bugs.debian.org/588465
-# libva -> needs a vaapi enabled avcodec
# osso_screensaver -> not targetting maemo
# portaudio -> not needed
# projectm -> broken
@@@ -112,7 -112,7 +111,6 @@@ confflags +=
--disable-dxva2 \
--disable-gnomevfs \
--disable-goom \
- --disable-mod \
- --disable-libva \
--disable-osso_screensaver \
--disable-portaudio \
--disable-projectm \
@@@ -128,7 -128,6 +126,7 @@@ confflags +=
--enable-atmo \
--enable-dc1394 \
--enable-dv \
+ --enable-libva \
--enable-pvr \
--enable-udev \
--enable-v4l \
@@@ -201,7 -200,7 +199,7 @@@ install: buil
fi ; \
done
# Remove some modules on non-linux arch
- sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\)_/d' \
+ sed -e '/\(lib\|libaccess_\)\(alsa\|atmo\|dc1394\|dv\|dvb\|fb\|v4l\|v4l2\|pvr\|udev\)_/d' \
debian/vlc-nox.install > debian/vlc-nox.install.kfreebsd
sed -e '/\(lib\|libaccess_\)\(probe_hal\)_/d' \
debian/vlc-nox.install.kfreebsd > debian/vlc-nox.install.hurd
@@@ -225,12 -224,14 +223,14 @@@
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- # Check that we did not install a plugin linked with libX11 in vlc-nox
+ # Check that we did not install a plugin linked with libX11 or
+ # libxcb in vlc-nox
BORKED=no; \
for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
- if objdump -x $$file | egrep -q '^ +NEEDED +libX11\.so'; then \
+ if objdump -x $$file | egrep -q -e '^ +NEEDED +libX11\.so' \
+ -e '^ +NEEDED +libxcb\.so'; then \
BORKED=yes; \
- echo $$file depends on libX11; \
+ echo $$file depends on libX11 or libxcb; \
fi; \
done; \
if test "$$BORKED" = yes; then exit 1; fi
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list