r25 - in unstable/vlc/debian: . patches

[Sam Hocevar]

Author: sho
Date: 2006-04-24 17:07:50 +0000 (Mon, 24 Apr 2006)
New Revision: 25

Added:
   unstable/vlc/debian/patches/020_freetype_font
Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
   unstable/vlc/debian/patches/series
Log:
vlc (0.8.5-test3.debian-1) unstable; urgency=low

  * debian/control:
    + Build-depend on newer live555 libraries.
    + Depend on vlc-plugin-alsa.
    + Removed the ttf-freefont dependency (Closes: #353459, #362071).

  * debian/patches/020_freetype_font:
    + Do not hardcode the default font, let VLC find one itself.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 24 Apr 2006 18:10:10 +0200


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2006-04-24 15:55:23 UTC (rev 24)
+++ unstable/vlc/debian/changelog	2006-04-24 17:07:50 UTC (rev 25)
@@ -1,4 +1,4 @@
-vlc (0.8.5-test3.debian-1) UNRELEASED; urgency=low
+vlc (0.8.5-test3.debian-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -12,6 +12,7 @@
     + HTTP streaming no longer fails (Closes: #352599).
     + Memory leak fixed (Closes: #359655).
     + x264 build system supports ppc64 and mips64 (Closes: #361452, #358233).
+    + OGG muxing was fixed (Closes: #364321).
 
   * debian/control:
     + Removed legacy dummy packages.
@@ -23,7 +24,13 @@
     + Build-depend on newer Matroska libraries to fix .mkv support
       (Closes: #348404).
     + Build-depend on libxul-dev and xulrunner instead of mozilla-dev.
+    + Build-depend on newer live555 libraries.
+    + Depend on vlc-plugin-alsa.
+    + Removed the ttf-freefont dependency (Closes: #353459, #362071).
 
+  * debian/vlc.mime:
+    + Fixed broken templates (Closes: #354101).
+
   * debian/patches/010_no-wx-updates.diff:
     + Created from old dpatch. Disables broken "check for updates" button.
 
@@ -33,8 +40,11 @@
   * debian/patches/020_xulrunner.diff:
     + Build using XULrunner (Closes: #364381).
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 24 Apr 2006 12:18:36 +0200
+  * debian/patches/020_freetype_font:
+    + Do not hardcode the default font, let VLC find one itself.
 
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 24 Apr 2006 18:10:10 +0200
+
 vlc (0.8.4.debian-2) unstable; urgency=low
 
   * debian/rules:

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2006-04-24 15:55:23 UTC (rev 24)
+++ unstable/vlc/debian/control	2006-04-24 17:07:50 UTC (rev 25)
@@ -2,15 +2,15 @@
 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.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread3-dev, 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 (>= 2004.11.11a-1), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060329-4), 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
+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.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libcaca-dev (>= 0.9), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread3-dev, 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.cvs20060329-4), 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
 Standards-Version: 3.6.2
 
 Package: vlc
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wxvlc, ttf-freefont
-Recommends: ttf-thryomanes, videolan-doc
-Suggests: vlc-plugin-alsa, mozilla-plugin-vlc
+Depends: ${shlibs:Depends}, ${misc:Depends}, wxvlc, vlc-plugin-alsa
+Recommends: ttf-freefont, 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)
 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)
 Provides: mp3-decoder

Added: unstable/vlc/debian/patches/020_freetype_font
===================================================================
--- unstable/vlc/debian/patches/020_freetype_font	2006-04-24 15:55:23 UTC (rev 24)
+++ unstable/vlc/debian/patches/020_freetype_font	2006-04-24 17:07:50 UTC (rev 25)
@@ -0,0 +1,13 @@
+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-04-24 15:55:23 UTC (rev 24)
+++ unstable/vlc/debian/patches/series	2006-04-24 17:07:50 UTC (rev 25)
@@ -1,3 +1,4 @@
 010_no-wx-updates.diff 
 010_osdmenu-paths.diff 
 020_xulrunner.diff
+020_freetype_font