Package: tv-fonts Version: 1.1-7 Followup-For: Bug #641156 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * Revert build-dependency addition from previous upload upon advice from Julien Cristau; instead, patch the upstream Makefile not to execute the xset commands in the first place. (Closes: #641156) - Use simple-patchsys.mk and add dont-run-xset.diff. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric-proposed'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -u tv-fonts-1.1/debian/rules tv-fonts-1.1/debian/rules --- tv-fonts-1.1/debian/rules +++ tv-fonts-1.1/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_TAR_SRCDIR := tv-fonts-$(DEB_UPSTREAM_VERSION) DEB_TARBALL := tv-fonts-$(DEB_UPSTREAM_VERSION).tar.bz2 --- tv-fonts-1.1.orig/debian/patches/dont-run-xset.diff +++ tv-fonts-1.1/debian/patches/dont-run-xset.diff @@ -0,0 +1,15 @@ +diff -uNr tv-fonts-1.1.orig//Makefile tv-fonts-1.1//Makefile +--- tv-fonts-1.1.orig//Makefile 2003-04-15 04:16:09.000000000 -0400 ++++ tv-fonts-1.1//Makefile 2011-10-16 10:07:03.000000000 -0400 +@@ -24,11 +24,6 @@ + + all: $(LED_PCF) $(TT_PCF) $(LED_BDF) $(TT_BDF) + mkfontdir +-ifneq ($(DISPLAY),) +- -xset fp- "`pwd`:unscaled" +- xset +fp "`pwd`:unscaled" +- xset fp rehash +-endif + + clean distclean: + rm -f $(LED_PCF) $(TT_PCF) $(TT_BDF)