[SCM] VLC media player packaging branch, sid, updated. debian/1.1.2-1-3-g844f69c

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 844f69c3feb0e1e3967f3cbe32997014c4fdf415
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Aug 17 16:29:07 2010 +0200

    Drop 102_dejavu_font.diff and depend on ttf-freefont instead of ttf-dejavu-core. ttf-freefont is very likely to be present on a Debian box, because cups depends on it.

diff --git a/debian/control b/debian/control
index b351b48..63f2f44 100644
--- a/debian/control
+++ b/debian/control
@@ -205,7 +205,7 @@ Description: multimedia plugin for web browsers based on VLC
 
 Package: vlc
 Architecture: any
-Depends: ttf-dejavu-core,
+Depends: ttf-freefont,
          vlc-nox (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/patches/102_dejavu_font.diff b/debian/patches/102_dejavu_font.diff
deleted file mode 100644
index 2e3e4f3..0000000
--- a/debian/patches/102_dejavu_font.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Change the default font to one very likely to be present on a
- Debian box.
-
-Index: debian.git/modules/misc/freetype.c
-===================================================================
---- debian.git.orig/modules/misc/freetype.c	2010-06-16 01:58:09.000000000 +0200
-+++ debian.git/modules/misc/freetype.c	2010-06-23 00:46:55.485476112 +0200
-@@ -67,7 +67,7 @@
- #define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
- #define FC_DEFAULT_FONT "Nokia Sans Bold"
- #else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
- #define FC_DEFAULT_FONT "Serif Bold"
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index 458ba8d..32e53b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 052_as-needed.diff
-102_dejavu_font.diff
 104_notify.diff
 200_osdmenu_paths.diff
 501_decrease_alsa_buffer.diff

-- 
VLC media player packaging