r84 - tarballs unstable/vlc/debian unstable/vlc/debian/patches

[Samuel Hocevar]

Author: sho
Date: 2006-09-10 20:58:20 +0000 (Sun, 10 Sep 2006)
New Revision: 84

Added:
   unstable/vlc/debian/patches/020_dejavu_font.diff
Modified:
   tarballs/vlc_0.8.6-svn20060910.0.8.5-1-svn.debian.orig.tar.gz
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
   unstable/vlc/debian/patches/series
   unstable/vlc/debian/rules
Log:
  * Updated the VLC tarball.

  * debian/patches/020_freetype_font.diff:
    + Renamed this patch into 020_dejavu_font.diff and made it use dejavu
      fonts.


Modified: tarballs/vlc_0.8.6-svn20060910.0.8.5-1-svn.debian.orig.tar.gz
===================================================================
(Binary files differ)

Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2006-09-10 19:26:02 UTC (rev 83)
+++ unstable/vlc/debian/changelog	2006-09-10 20:58:20 UTC (rev 84)
@@ -14,17 +14,18 @@
   * 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
+    + Have VLC depend on ttf-dejavu 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.
+    + Don't install TTF fonts, use the ones from ttf-dejavu instead.
 
   * debian/patches/020_freetype_font.diff:
-    + Remove this patch, we now use ttf-freefont again.
+    + Renamed this patch into 020_dejavu_font.diff and made it use dejavu
+      fonts.
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 10 Sep 2006 19:02:17 +0200
 

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2006-09-10 19:26:02 UTC (rev 83)
+++ unstable/vlc/debian/control	2006-09-10 20:58:20 UTC (rev 84)
@@ -8,7 +8,7 @@
 Package: vlc
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-freefont
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
 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)

Added: unstable/vlc/debian/patches/020_dejavu_font.diff
===================================================================
--- unstable/vlc/debian/patches/020_dejavu_font.diff	2006-09-10 19:26:02 UTC (rev 83)
+++ unstable/vlc/debian/patches/020_dejavu_font.diff	2006-09-10 20:58:20 UTC (rev 84)
@@ -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 "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
+ #endif
+ 
+ #if defined(HAVE_FRIBIDI)

Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series	2006-09-10 19:26:02 UTC (rev 83)
+++ unstable/vlc/debian/patches/series	2006-09-10 20:58:20 UTC (rev 84)
@@ -2,5 +2,5 @@
 010_no-wx-updates.diff 
 010_osdmenu-paths.diff 
 #020_xulrunner.diff
-#020_freetype_font.diff
+020_dejavu_font.diff
 #020_notify.diff

Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules	2006-09-10 19:26:02 UTC (rev 83)
+++ unstable/vlc/debian/rules	2006-09-10 20:58:20 UTC (rev 84)
@@ -196,8 +196,8 @@
 
 	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
+	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/vlc/usr/share/vlc/skins2/fonts/FreeSans.ttf
+	ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.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