r83 - tarballs unstable/vlc/debian unstable/vlc/debian/patches
Samuel Hocevar
sho at alioth.debian.org
Wed Mar 14 14:20:13 CET 2007
Author: sho
Date: 2006-09-10 19:26:02 +0000 (Sun, 10 Sep 2006)
New Revision: 83
Added:
tarballs/vlc_0.8.6-svn20060910.0.8.5-1-svn.debian.orig.tar.gz
Removed:
unstable/vlc/debian/patches/020_freetype_font.diff
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/control
unstable/vlc/debian/patches/series
unstable/vlc/debian/rules
Log:
vlc (0.8.6-svn20060910.0.8.5-1-svn.debian-1) unstable; urgency=low
* New upstream SVN snapshot, from the forthcoming 0.8.5-1 branch.
* This branch's playlist window does not crash like the 0.8.6 does
(Closes: #375213, #385036, #384869).
* Upstream fixed implicit pointer functions (Closes: #385192).
* Upstream's x264 build system now uses config.guess instead of uname to
detect system and CPU types (Closes: #385535).
* Upstream removed debug messages from the ts plugin (Closes: #385008,
Closes: #385323).
* Aspect ration in mkv files was fixed (Closes: #385876).
* debian/control:
+ Build-depend on libcaca-dev (>= 0.99.beta4-1) so that we no longer pull
useless build dependencies (Closes: #385536).
+ Have VLC depend on ttf-freefont again. It's used for subtitles and the
default skin.
* debian/rules:
+ No longer install old copyright files (Closes: #385200).
+ Re-activated the speex module (Closes: #386204).
+ Don't install TTF fonts, use the ones from ttf-freefont instead.
* debian/patches/020_freetype_font.diff:
+ Remove this patch, we now use ttf-freefont again.
Added: tarballs/vlc_0.8.6-svn20060910.0.8.5-1-svn.debian.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/vlc_0.8.6-svn20060910.0.8.5-1-svn.debian.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog 2006-09-10 16:21:33 UTC (rev 82)
+++ unstable/vlc/debian/changelog 2006-09-10 19:26:02 UTC (rev 83)
@@ -1,10 +1,33 @@
-vlc (0.8.6-svn20060823.debian-4) UNRELEASED; urgency=low
+vlc (0.8.6-svn20060910.0.8.5-1-svn.debian-1) unstable; urgency=low
+ * New upstream SVN snapshot, from the forthcoming 0.8.5-1 branch.
+ * This branch's playlist window does not crash like the 0.8.6 does
+ (Closes: #375213, #385036, #384869).
+
+ * Upstream fixed implicit pointer functions (Closes: #385192).
+ * Upstream's x264 build system now uses config.guess instead of uname to
+ detect system and CPU types (Closes: #385535).
+ * Upstream removed debug messages from the ts plugin (Closes: #385008,
+ Closes: #385323).
+ * Aspect ration in mkv files was fixed (Closes: #385876).
+
+ * debian/control:
+ + Build-depend on libcaca-dev (>= 0.99.beta4-1) so that we no longer pull
+ useless build dependencies (Closes: #385536).
+ + Have VLC depend on ttf-freefont again. It's used for subtitles and the
+ default skin.
* debian/copyright:
+ Full copyright holders and license audit (Closes: #324978).
+ * debian/rules:
+ + No longer install old copyright files (Closes: #385200).
+ + Re-activated the speex module (Closes: #386204).
+ + Don't install TTF fonts, use the ones from ttf-freefont instead.
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 10 Sep 2006 17:43:47 +0200
+ * debian/patches/020_freetype_font.diff:
+ + Remove this patch, we now use ttf-freefont again.
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 10 Sep 2006 19:02:17 +0200
+
vlc (0.8.6-svn20060823.debian-3) unstable; urgency=low
* debian/control:
Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control 2006-09-10 16:21:33 UTC (rev 82)
+++ unstable/vlc/debian/control 2006-09-10 19:26:02 UTC (rev 83)
@@ -2,14 +2,14 @@
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), 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)
+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
Standards-Version: 3.7.2
Package: vlc
Section: graphics
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ttf-freefont, videolan-doc
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-freefont
+Recommends: videolan-doc
Suggests: mozilla-plugin-vlc
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)
Deleted: unstable/vlc/debian/patches/020_freetype_font.diff
===================================================================
--- unstable/vlc/debian/patches/020_freetype_font.diff 2006-09-10 16:21:33 UTC (rev 82)
+++ unstable/vlc/debian/patches/020_freetype_font.diff 2006-09-10 19:26:02 UTC (rev 83)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
- #elif defined( WIN32 )
- #define DEFAULT_FONT "" /* Default font found at run-time */
- #else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT ""
- #endif
-
- #if defined(HAVE_FRIBIDI)
Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series 2006-09-10 16:21:33 UTC (rev 82)
+++ unstable/vlc/debian/patches/series 2006-09-10 19:26:02 UTC (rev 83)
@@ -2,5 +2,5 @@
010_no-wx-updates.diff
010_osdmenu-paths.diff
#020_xulrunner.diff
-020_freetype_font.diff
+#020_freetype_font.diff
#020_notify.diff
Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules 2006-09-10 16:21:33 UTC (rev 82)
+++ unstable/vlc/debian/rules 2006-09-10 19:26:02 UTC (rev 83)
@@ -52,7 +52,7 @@
--enable-mkv \
--enable-v4l \
--enable-pvr \
- --disable-speex \
+ --enable-speex \
--enable-caca \
--enable-live555 \
--enable-libmpeg2 \
@@ -194,6 +194,11 @@
#cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
#strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
+ rm -f debian/vlc/usr/share/vlc/skins2/fonts/FreeSans.ttf
+ rm -f debian/vlc/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+ ln -s /usr/share/fonts/truetype/freefont/FreeSans.ttf debian/vlc/usr/share/vlc/skins2/fonts/FreeSans.ttf
+ ln -s /usr/share/fonts/truetype/freefont/FreeSansBold.ttf debian/vlc/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+
rm -Rf debian/vlc/$(VIDDIR)/skins
ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
@@ -281,12 +286,11 @@
dh_installman doc/vlc.1 -p vlc
dh_installman doc/vlc-config.1 -p libvlc0-dev
dh_installchangelogs ChangeLog -p vlc
- for x in doc/ChangeLog-* ; do cp "doc/ChangeLog-$${x#*-}" "debian/vlc/usr/share/doc/vlc/changelog$${x#*-}" ; done
dh_link -s
dh_strip -s
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -pvlc -V 'vlc (>= 0.8.6-svn20060823.debian-1)'
+ dh_makeshlibs -pvlc -V 'vlc (>= 0.8.6-svn20060910.0.8.5-1-svn.debian-1)'
dh_installdeb -s
# dh_perl
dh_shlibdeps -s -ldebian/vlc/usr/lib
More information about the Pkg-multimedia-commits
mailing list