r87 - in unstable/vlc/debian: . patches
Samuel Hocevar
sho at alioth.debian.org
Wed Mar 14 14:20:18 CET 2007
Author: sho
Date: 2006-09-18 11:52:17 +0000 (Mon, 18 Sep 2006)
New Revision: 87
Removed:
unstable/vlc/debian/patches/000_dup_builtins.diff
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/control
unstable/vlc/debian/patches/series
unstable/vlc/debian/rules
Log:
vlc (0.8.6-svn20060918.debian-1) unstable; urgency=low
* New upstream SVN snapshot, with a slightly saner version number.
* debian/rules:
+ Call dh_install with -si so that it does not try to install files that
are not for us (Closes: #387873).
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 18 Sep 2006 12:38:26 +0200
vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-5) unstable; urgency=low
* debian/control:
+ Added proper conflicts/replaces to the libvlc0 package because it
overwrites files from old vlc packages (Closes: #387844).
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 17 Sep 2006 01:38:24 +0200
vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-4) unstable; urgency=low
* debian/control:
+ Add libsdl-image1.2-dev to the build-dependencies.
+ Shorten short descriptions and add ?\226?\128?\156without X support?\226?\128?\157 to the vlc-nox
short description.
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 16 Sep 2006 20:08:53 +0200
Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog 2006-09-14 16:43:00 UTC (rev 86)
+++ unstable/vlc/debian/changelog 2006-09-18 11:52:17 UTC (rev 87)
@@ -1,3 +1,29 @@
+vlc (0.8.6-svn20060918.debian-1) unstable; urgency=low
+
+ * New upstream SVN snapshot, with a slightly saner version number.
+ * debian/rules:
+ + Call dh_install with -si so that it does not try to install files that
+ are not for us (Closes: #387873).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 18 Sep 2006 12:38:26 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-5) unstable; urgency=low
+
+ * debian/control:
+ + Added proper conflicts/replaces to the libvlc0 package because it
+ overwrites files from old vlc packages (Closes: #387844).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 17 Sep 2006 01:38:24 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-4) unstable; urgency=low
+
+ * debian/control:
+ + Add libsdl-image1.2-dev to the build-dependencies.
+ + Shorten short descriptions and add “without X support” to the vlc-nox
+ short description.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 16 Sep 2006 20:08:53 +0200
+
vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-3) unstable; urgency=low
* debian/control:
Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control 2006-09-14 16:43:00 UTC (rev 86)
+++ unstable/vlc/debian/control 2006-09-18 11:52:17 UTC (rev 87)
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev, libraw1394-dev, libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev
+Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev, libraw1394-dev, libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev
Standards-Version: 3.7.2
Package: vlc
@@ -14,7 +14,7 @@
Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Provides: mp3-decoder
-Description: multimedia player and streamer for all audio and video formats
+Description: multimedia player and streamer
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.
@@ -38,7 +38,7 @@
Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4), vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4), vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Provides: mp3-decoder
-Description: multimedia player and streamer for all audio and video formats
+Description: multimedia player and streamer (without X support)
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.
@@ -62,6 +62,8 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Conflicts: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Description: multimedia player and streamer library
This package contains the shared library required by applications using VLC
features.
Deleted: unstable/vlc/debian/patches/000_dup_builtins.diff
===================================================================
--- unstable/vlc/debian/patches/000_dup_builtins.diff 2006-09-14 16:43:00 UTC (rev 86)
+++ unstable/vlc/debian/patches/000_dup_builtins.diff 2006-09-18 11:52:17 UTC (rev 87)
@@ -1,30 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac.orig 2006-09-11 13:43:33.000000000 +0200
-+++ configure.ac 2006-09-11 18:30:36.000000000 +0200
-@@ -1291,7 +1291,9 @@
- VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}])
- VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
- VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
-- ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
-+ if test "${ac_cv_altivec_inline}" = "no"; then
-+ ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
-+ fi
- fi
-
- AC_CACHE_CHECK([if linker needs -framework vecLib],
-Index: configure
-===================================================================
---- configure.orig 2006-09-11 18:30:40.000000000 +0200
-+++ configure 2006-09-11 18:31:17.000000000 +0200
-@@ -39385,7 +39385,9 @@
- am_modules_with_cflags="${am_modules_with_cflags} ${element}"
- done
-
-- ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
-+ if test "${ac_cv_altivec_inline}" = "no"; then
-+ ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
-+ fi
- fi
-
- { echo "$as_me:$LINENO: checking if linker needs -framework vecLib" >&5
Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series 2006-09-14 16:43:00 UTC (rev 86)
+++ unstable/vlc/debian/patches/series 2006-09-18 11:52:17 UTC (rev 87)
@@ -1,5 +1,4 @@
000_ltmain.diff
-000_dup_builtins.diff -p0
010_no-wx-updates.diff
010_osdmenu-paths.diff
#020_xulrunner.diff
Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules 2006-09-14 16:43:00 UTC (rev 86)
+++ unstable/vlc/debian/rules 2006-09-18 11:52:17 UTC (rev 87)
@@ -201,7 +201,7 @@
-mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
# Install stuff
- dh_install --fail-missing --sourcedir=debian/tmp
+ dh_install -si --fail-missing --sourcedir=debian/tmp
# Check that we did not install a plugin linked with libX11 in vlc-nox
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
More information about the Pkg-multimedia-commits
mailing list