[SCM] VLC media player packaging branch, sid, updated. debian/0.8.6.h-5-21-g559a165
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Sun Feb 22 22:20:01 UTC 2009
The following commit has been merged in the sid branch:
commit 7afe45d18bd762ae1d5dacaf35adc37cc24a14ea
Merge: 2eededf0f9b29d8af8cbd15ae2d317a0bee1a61c df4bed0a9a8f5f9c0460a5f69ee1e411f7bc7555
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Sun Feb 22 19:57:58 2009 +0000
Merge branch 'experimental' into sid
Conflicts:
debian/README.Debian
debian/changelog
debian/patches/series
diff --combined debian/changelog
index 942e351,40b3af8..702843a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,143 +1,164 @@@
+ vlc (0.9.8a-1) experimental; urgency=low
+
+ * New upstream release
+ + Fix integer overflow in Real demux (VideoLAN SA-2008-11, CVE-2008-5276)
+ * Enable RealRTSP access module
+ * Depends on libv4l-dev to add support of some webcam
+ * Don't rebootstrap. The packages causing troubles previously have been fixed
+
+ -- Christophe Mutricy <xtophe at videolan.org> Wed, 03 Dec 2008 20:20:52 +0100
+
+ vlc (0.9.6-1) experimental; urgency=low
+
+ [ Reinhard Tartler ]
+ * Build against libass. Closes: #499063, LP: #210354, #199870
+ * Explicitly build against libdca in debian/rules
+ * Tighten build depends on a libass-dev version that ships without .la file
+
+ [ Christophe Mutricy ]
+ * New bugfix upstream releases
+ + Remove 402_tivo_overflow.diff
+ + Fix buffer overflow in CUE demuxer (Closes: #504639)
+ + Fix buffer overflow in Realtext decoder
+ * Honor DEB_BUILD_OPTIONS
+ * Rebootstrap in order to avoid problem with .la
+
+ -- Christophe Mutricy <xtophe at videolan.org> Sat, 08 Nov 2008 03:14:29 +0100
+
+ vlc (0.9.4-2) experimental; urgency=low
+
+ * Fix buffer overflow in Tivo demuxer
+ + Closes: #502726, VideoLAN SA-0809
+ + 402_tivo_overflow.diff taken from upstream
+ * Better xinerama fullscreen behaviour
+ + 401_detect_xinerama_fullscreen.diff taken from upstream
+ * Builddepends on libcursesw5-dev rather than libcurses5-dev
+ for proper wide char handling
+
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 20 Oct 2008 23:23:46 +0200
+
+ vlc (0.9.4-1) experimental; urgency=low
+
+ * New upstream bugfix version
+ * rules: Pass the debian version in configure.ac so that the cache
+ is invalidated between binary version
+ * control: Don't forget commas in builddep list
+
+ -- Christophe Mutricy <xtophe at videolan.org> Tue, 07 Oct 2008 00:17:30 +0200
+
+ vlc (0.9.3-1) experimental; urgency=low
+
+ [ Christophe Mutricy ]
+ * New upstream release
+ * Build-depends on libdca-dev
+ * vlc-nox.install
+ + Be more general for the memcopy modules.
+ Fix a FTBFS on non-intel arch (Closes: #499860).
+ * Sort builddep list
+
+ [ Reinhard Tartler ]
+ * remove spurious conflicts on libvlc2. LP: #274614
+
+ -- Christophe Mutricy <xtophe at videolan.org> Fri, 26 Sep 2008 23:49:48 +0200
+
+ vlc (0.9.2-1) experimental; urgency=low
+
+ [ Christophe Mutricy ]
+ * New upstream release
+ + Soname changed
+ + Bugs fixed upstream: Closes: #487646, #298150, #325069, #392292,
+ #458004, #470903, #458004, #423121
+ + new upstream fixes various crasher bugs reported in ubuntu:
+ LP: #189575, #113927, #103741, #111615, #107899, #112076, #198916, 221428,
+ #91679, #96978, #123589, #133528, #231621, #259025
+ + plays files with '+' in its name, LP: #239431, #217305
+ + New packages: libvlccore0, libvlccore-dev, vlc-plugin-pulse
+ (Closes: #471069)
+ + Build-depends on libswsale-dev, libshout3-dev, libxpm-dev,
+ zlib1g-dev, liblua5.1-0-dev, libschroedinger-dev, libtag1-dev,
+ libqt4-dev, libqt4-dev-tools and pkg-config. (Closes: #461324)
+ + time display no longer incomplete, LP: #193445
+ + fixed volume bar behavior, LP: #250041
+ + shout support closes LP: #127594, #84098,
+ + Install new modules:
+ - vlc-nox: alphamask, blendbench, bluescreen, canvas, cc, cdg, chain,
+ colorthres, croppadd, dynamicoverlay, erase, faad, gaussianblur, grain,
+ inhibit, lua, memcpy*, mmap, osd_parser, puzzle, remoteosd, rtmp,
+ schroedinger, sharpen, stats, subusf, t140, telepathy, v4l2, vmem
+ - vlc: qt4
+ - vlc-plugin-jack: access_jack
+ + Distribute the .pc for libvlc and vlc-plugin (Closes: #289507)
+ + Remove wx interface and glide plugin as they've been dropped by upstream
+ LP: #205325, #88487, #90603,
+ + The Python and java bindings are no longer part of the upstream tarballs
+ (Closes: #469011)
+ + Temporarly disable libdca module until a pkg with the new
+ API get in unstable
+ + Delete or refresh patches
+ + New patches:
+ - 052_as-needed taken from bug #347650 to teach libtool about
+ -Wl,--as-needed
+ * Install the skins DTD and the default skins it's only 113kB
+ * Improve watch file
+ * Add a vlc-data package for /usr/share (13 MB)
+ * Add a vlc-dbg package (Closes: #491564)
+ * Sort vlc.install and vlc-nox.install
+
+ [ Mohammed Adnène Trojette ]
+ * Add myself to Uploaders.
+ * debian/control:
+ + Add proper conflicts/replaces to vlc-data with mozilla-plugin-vlc.
+ + Add proper conflicts/replaces to vlc with vlc-nox.
+
+
+ -- Christophe Mutricy <xtophe at videolan.org> Wed, 17 Sep 2008 00:49:48 +0200
+
+ vlc (0.8.6.i-2) experimental; urgency=high
+
+ [ Loic Minier ]
+ * Fix changelog entries for 0.8.6.h-2 and 0.8.6.h-3.
+ * Bump up Standards-Version to 3.8.0.
+
+ [ Christophe Mutricy ]
+ * Security: Fix integer overflow in mms module (CVE-2008-3794)
+ (Closes: #496265)(407-mms-overflow.diff taken from upstream)
+
+ [ Sam Hocevar ]
+ * debian/patches/300_manpage_syntax.diff: fix vlc-config.1 syntax.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 26 Aug 2008 23:25:13 +0000
+
+ vlc (0.8.6.i-1) experimental; urgency=low
+
+ * New upstream release.
+ - Refresh patch 010_iceape and change it to only patch the name of the .pc
+ files, keep using FIREFOX_CFLAGS and _LIBS etc. as to allow us to only
+ run autoconf, not automake.
+ - Drop patch 401-CVE-2008-2430, merged upstream.
+ - Update and rename patch 050_bootstrap to 900_autoconf.
+
+ -- Loic Minier <lool at dooz.org> Fri, 22 Aug 2008 19:13:30 +0200
+vlc (0.8.6.h-5) unstable; urgency=high
+
+ * Acknowledge NMU by Nico Golde. Thanks.
+ * Fix buffer overflow in CUE demuxer (Closes: #504639)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Wed, 05 Nov 2008 22:02:06 +0100
+
+vlc (0.8.6.h-4.1) unstable; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Fix integer overflows that could possibly lead to arbitrary
+ code execution (CVE-2008-4686.diff; Closes: #503118).
+
+ -- Nico Golde <nion at debian.org> Mon, 03 Nov 2008 14:41:58 +0100
+
+vlc (0.8.6.h-4) unstable; urgency=high
+
+ * Security: Fix integer overflow in mms module
+ (Closes: #496265)(407-mms-overflow.diff taken from upstream)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 25 Aug 2008 01:07:27 +0100
vlc (0.8.6.h-3) unstable; urgency=low
diff --combined debian/rules
index 81494d1,c6683d7..c6683d7
mode 100644,100755..100644
--- a/debian/rules
+++ b/debian/rules
@@@ -1,9 -1,13 +1,13 @@@
#!/usr/bin/make -f
+ #DH_VERBOSE=1
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
- DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ VERSION = $(shell dpkg-parsechangelog|sed -n 's/^Version: //p')
+ DEBIAN_VERSION = $(shell echo $(VERSION)|sed -nr 's/[^:]+://; s/.*-([^-]+$$)/\1/p')
ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
confflags := --build=$(DEB_BUILD_GNU_TYPE)
@@@ -11,13 -15,27 +15,27 @@@ els
confflags := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
endif
- # how to call quilt
- QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+ confflags += --disable-optimizations
+ endif
+ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+ endif
+
+
+
+ include /usr/share/quilt/quilt.make
+
+ LDFLAGS = -Wl,--as-needed
# configure flags
- confflags += --enable-release --prefix=/usr
+ confflags += --enable-maintaner-mode --enable-release --prefix=/usr
confflags += \
--enable-libtool \
+ --enable-fast-install \
+ --with-binary-version=$(DEBIAN_VERSION) \
+ --disable-update-check \
--disable-gnome \
--disable-gtk \
--disable-familiar \
@@@ -25,23 -43,25 +43,25 @@@
--enable-ggi \
--enable-sdl \
--enable-esd \
- --disable-qt \
--enable-mad \
--enable-arts \
+ --enable-alsa \
--enable-jack \
- --enable-lirc \
+ --enable-pulse \
+ --enable-lirc \
--enable-a52 \
--enable-aa \
--enable-dvbpsi \
--enable-mozilla \
+ --with-mozilla-pkg=iceape-plugin \
--disable-kde \
--enable-mp4 \
--enable-dvb \
--disable-satellite \
--enable-ogg \
--enable-vorbis \
- --enable-wxwidgets \
- --with-wx-config=wx-config \
+ --enable-shout \
+ --enable-qt4 \
--disable-slp \
--enable-flac \
--disable-skins \
@@@ -53,7 -73,6 +73,6 @@@
--enable-caca \
--enable-live555 \
--enable-libmpeg2 \
- --enable-dts \
--enable-fribidi \
--enable-cdio \
--enable-mod \
@@@ -69,26 -88,29 +88,29 @@@
--enable-mpc \
--enable-vcd \
--enable-vcdx \
- --enable-xosd \
- --enable-twolame \
--enable-notify \
+ --enable-twolame \
--enable-faad \
+ --disable-zvbi \
+ --enable-telx \
--enable-mediacontrol-bindings \
--disable-x264 \
+ --disable-atmo \
+ --enable-taglib \
+ --enable-libass \
+ --enable-libdca \
+ --enable-realrtsp \
$(NULL)
+ # --enable-dts \
+
# Linux specific flags
ifeq ($(DEB_HOST_ARCH_OS),linux)
- confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
- endif
-
- # Glide is only for x86 on Linux
- ifeq ($(DEB_HOST_ARCH),i386)
- confflags += --enable-glide
+ confflags += --enable-alsa --enable-dv --enable-v4l --enable-v4l2 --enable-pvr
endif
# svgalib is only for x86 and x86-64 on Linux
- ifneq ($(filter $(DEB_HOST_ARCH), amd64 i386),)
+ ifneq ($(filter $(DEB_BUILD_ARCH), amd64 i386),)
confflags += --enable-svgalib
endif
@@@ -100,33 -122,31 +122,31 @@@ VIDDIR := usr/share/vl
PIXDIR := usr/share/pixmaps
build: build-stamp
- build-stamp:
+ build-stamp: $(QUILT_STAMPFN)
dh_testdir
- $(QUILT) push -a || test $$? = 2
- ./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
- $(MAKE) src/libvlc.la
- cp src/.libs/libvlc.a src/libvlc.a
- ./configure --mandir=$${prefix}/share/man $(confflags)
+ ./configure --enable-static $(confflags)
+ $(MAKE) -C src libvlccore.la libvlc.la
+ mkdir -p tmp
+ cp src/.libs/libvlccore.a tmp/libvlccore.a
+ cp src/.libs/libvlc.a tmp/libvlc.a
+ ./configure $(confflags)
$(MAKE)
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
# Check which plugins were built and whether they load properly.
- ./vlc --reset-plugins-cache -l -I rc vlc:quit
+ ./vlc -vvv --reset-plugins-cache --list --no-color
endif
endif
touch $@
- clean:
+ clean: clean-real unpatch
+ clean-real:
dh_testdir
dh_testroot
rm -f build-stamp
# Clean VLC
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f src/libvlc.a
+ rm -rf tmp/
# Clean zsh completion stuff
rm -f extras/zsh
# Removed ugly cruft
@@@ -135,31 -155,34 +155,34 @@@
# Remove spurious autotools stuff
rm -f config.log confdefs.h
# Unpatch package
- $(QUILT) pop -a -R || test $$? = 2
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
+ sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
+ >debian/vlc-nox.install.kfreebsd-i386
+ cp debian/vlc-nox.install.kfreebsd-i386 \
+ debian/vlc-nox.install.kfreebsd-amd64
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
- cp src/libvlc.a debian/tmp/usr/lib
+ cp tmp/libvlc.a debian/tmp/usr/lib
+ cp tmp/libvlccore.a debian/tmp/usr/lib
# Clean up libtool crap
find debian/tmp -name '*.la' -exec rm '{}' ';'
# Remove useless stuff
- rm -Rf debian/tmp/$(VIDDIR)/skins
rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
# Move stuff around
mkdir -p debian/tmp/$(PIXDIR)
- -mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
- -mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
+ mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
+ mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
# Install stuff
dh_install -si --fail-missing --sourcedir=debian/tmp
- # install BTS stuff
+ #install BTS stuff
mkdir -p debian/vlc-nox/usr/share/bug/vlc-nox
cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox
# Clean up
@@@ -181,6 -204,8 +204,8 @@@ binary-indep: build instal
dh_testdir
dh_testroot
dh_link -i
+ dh_installdocs -p vlc-data
+ dh_installchangelogs ChangeLog -p vlc-data
dh_compress -i
dh_fixperms -i
dh_installdeb -i
@@@ -192,23 -217,24 +217,24 @@@
binary-arch: build install
dh_testdir
dh_testroot
- dh_link -s
+ dh_installdocs -p vlc
dh_installdocs -p vlc-nox
- dh_installdocs -p libvlc0
+ dh_link -s
dh_buildinfo -p vlc-nox
dh_installmenu -s
dh_installmime -s
dh_installman doc/vlc.1 -p vlc-nox
- dh_installman doc/vlc-config.1 -p libvlc0-dev
+ dh_installman debian/vlc-wrapper.1 -p vlc-nox
+ dh_installchangelogs ChangeLog -p vlc
dh_installchangelogs ChangeLog -p vlc-nox
- dh_installchangelogs ChangeLog -p libvlc0
dh_desktop
- dh_strip -s
+ dh_strip -s --dbg-package=vlc-dbg
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -plibvlc0 -V # -V is nasty, but I mean it
+ dh_makeshlibs -plibvlc2 -V # -V is nasty, but I mean it
+ dh_makeshlibs -plibvlccore0 -V # -V is nasty, but I mean it
dh_installdeb -s
- dh_shlibdeps -s -ldebian/libvlc0/usr/lib
+ dh_shlibdeps -s -ldebian/libvlc2/usr/lib:debian/libvlccore0/usr/lib
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list