[mupen64plus-core] 230/310: Replace dependency to ttf-dejavu-core with ttf-bitstream-vera

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 5f963d9bddfd3b8bbac649864354bcdabb934641
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Jul 2 10:25:55 2013 +0200

    Replace dependency to ttf-dejavu-core with ttf-bitstream-vera
---
 debian/changelog                                           | 5 +++++
 debian/control                                             | 2 +-
 debian/patches/{dejavu-font.patch => bitstream-font.patch} | 6 +++---
 debian/patches/series                                      | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7c94e2..9decbf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,14 @@ mupen64plus-core (2.0~rc3+3+5d46baa3dd76-3) UNRELEASED; urgency=low
     - Add multiple_main.patch, Fix multiple definitions of main in same
       namespace
     - Add disable_si_dma_busy.patch, Revert implementation of DMA busy bit
+    - Remove dejavu-font.patch, Don't use Dejavu fonts because upstream
+      uses other font
+    - Add bitstream-font.patch, Use font from ttf-bitstream-vera instead
+      of installing own copy with libmupen64plus2
   * debian/control:
     - Build-Depend on debhelper 9.20130604 for support of parameters when
       detecting targets in dh_auto_*
+    - Replace dependency to ttf-dejavu-core with ttf-bitstream-vera
   * debian/rules:
     - Work around new debhelper 9.20130624 dh_auto_{clean,test} behavior
       which is causing a FTBFS by adding an explicit
diff --git a/debian/control b/debian/control
index fd81443..26a898f 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  mupen64plus-data,
- ttf-dejavu-core,
+ ttf-bitstream-vera,
 Provides:
  mupen64plus-audio-abi-2,
  mupen64plus-config-abi-2.2,
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/bitstream-font.patch
similarity index 85%
rename from debian/patches/dejavu-font.patch
rename to debian/patches/bitstream-font.patch
index e21711c..8748288 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/bitstream-font.patch
@@ -1,4 +1,4 @@
-Description: Use font from ttf-dejavu-core
+Description: Use font from ttf-bitstream-vera
 Forwarded: not-needed
 Author: Sven Eckelmann <sven at narfation.org>
 
@@ -16,7 +16,7 @@ index 038e836c64e7d4fee17236e88e465417304ef0c8..08d0eb49c9f38fe15451ab20d1a6ebf2
  	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
  	-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
 diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index c06b9bbea43d8a878c0e66bfa6829a75bd4377af..f428dc98fc57752a1cd626f5217ab070e787f8ab 100644
+index c06b9bbea43d8a878c0e66bfa6829a75bd4377af..bbb2b1b2cb01c9bf032b62edacaa21e5e1f96390 100644
 --- a/src/osd/osd.cpp
 +++ b/src/osd/osd.cpp
 @@ -40,7 +40,7 @@ extern "C" {
@@ -24,7 +24,7 @@ index c06b9bbea43d8a878c0e66bfa6829a75bd4377af..f428dc98fc57752a1cd626f5217ab070
  }
  
 -#define FONT_FILENAME "font.ttf"
-+#define FONT_FILENAME "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
++#define FONT_FILENAME "/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf"
  
  typedef void (APIENTRYP PTRGLACTIVETEXTURE)(GLenum texture);
  static PTRGLACTIVETEXTURE pglActiveTexture = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index 6257513..8f647c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-dejavu-font.patch
+bitstream-font.patch
 printf_fixup.patch
 disable_recompiler_disassembler.patch
 sdl2_resize.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git