From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 23/28] font-alias: clean up patches
Date: Sun, 30 Oct 2011 23:00:54 +0100 [thread overview]
Message-ID: <1320012059-24971-23-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
...-variable-to-100dpi-and-75dpi-fonts.alias.patch | 53 ++++++++++++++++++++
.../font-alias-1.0.3/alias_variable_font_dir.diff | 48 ------------------
patches/font-alias-1.0.3/series | 1 -
3 files changed, 53 insertions(+), 49 deletions(-)
create mode 100644 patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
delete mode 100644 patches/font-alias-1.0.3/alias_variable_font_dir.diff
delete mode 100644 patches/font-alias-1.0.3/series
diff --git a/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
new file mode 100644
index 0000000..488ec02
--- /dev/null
+++ b/patches/font-alias-1.0.3/0001-add-variable-to-100dpi-and-75dpi-fonts.alias.patch
@@ -0,0 +1,53 @@
+From d2d0e26f3e6e84db4527d35ca53cfbb0781d1333 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Sun, 30 Oct 2011 22:24:59 +0100
+Subject: [PATCH] add 'variable' to 100dpi and 75dpi fonts.alias
+
+The "variable" font point to helvectica, which only exists in 75dpi and
+100dpi directories. Hence if an application queries for that variable it
+may fail.
+
+The font package mechanism is complicated, since directory structure on
+the installation target is often not synchronic with the order of the font
+packages. Various distributions solve this problem differently. Question
+to mainline has yet received no answer.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+---
+ 100dpi/fonts.alias | 1 +
+ 75dpi/fonts.alias | 1 +
+ misc/fonts.alias | 1 -
+ 3 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/100dpi/fonts.alias b/100dpi/fonts.alias
+index 9a4c461..9c5aa7b 100644
+--- a/100dpi/fonts.alias
++++ b/100dpi/fonts.alias
+@@ -1,3 +1,4 @@
++variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+ lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-11-80-100-100-p-69-iso8859-1
+ lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
+ lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
+diff --git a/75dpi/fonts.alias b/75dpi/fonts.alias
+index a3d464f..c3f9dd1 100644
+--- a/75dpi/fonts.alias
++++ b/75dpi/fonts.alias
+@@ -1,3 +1,4 @@
++variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+ lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-8-80-75-75-p-49-iso8859-1
+ lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1
+ lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1
+diff --git a/misc/fonts.alias b/misc/fonts.alias
+index 0398476..d4c49f2 100644
+--- a/misc/fonts.alias
++++ b/misc/fonts.alias
+@@ -1,6 +1,5 @@
+ ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
+ fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
+-variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
+ 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
+ 5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
+ 6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
+--
+1.7.7
+
diff --git a/patches/font-alias-1.0.3/alias_variable_font_dir.diff b/patches/font-alias-1.0.3/alias_variable_font_dir.diff
deleted file mode 100644
index f78811c..0000000
--- a/patches/font-alias-1.0.3/alias_variable_font_dir.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Luotao Fu <l.fu@pengutronix.de>
-Subject: [patch] add 'variable' to 100dpi and 75dpi fonts.alias
-
-The "variable" font point to helvectica, which only exists in 75dpi and
-100dpi directories. Hence if an application queries for that variable it
-may fail.
-
-The font package mechanism is complicated, since directory structure on
-the installation target is often not synchronic with the order of the font
-packages. Various distributions solve this problem differently. Question
-to mainline has yet received no answer.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
- 100dpi/fonts.alias | 1 +
- 75dpi/fonts.alias | 1 +
- misc/fonts.alias | 1 -
- 3 files changed, 2 insertions(+), 1 deletion(-)
-
-Index: font-alias-X11R7.0-1.0.1/100dpi/fonts.alias
-===================================================================
---- font-alias-X11R7.0-1.0.1.orig/100dpi/fonts.alias
-+++ font-alias-X11R7.0-1.0.1/100dpi/fonts.alias
-@@ -1,3 +1,4 @@
-+variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-11-80-100-100-p-69-iso8859-1
- lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-14-100-100-100-p-90-iso8859-1
- lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-17-120-100-100-p-108-iso8859-1
-Index: font-alias-X11R7.0-1.0.1/75dpi/fonts.alias
-===================================================================
---- font-alias-X11R7.0-1.0.1.orig/75dpi/fonts.alias
-+++ font-alias-X11R7.0-1.0.1/75dpi/fonts.alias
-@@ -1,3 +1,4 @@
-+variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- lucidasans-bolditalic-8 -b&h-lucida-bold-i-normal-sans-8-80-75-75-p-49-iso8859-1
- lucidasans-bolditalic-10 -b&h-lucida-bold-i-normal-sans-10-100-75-75-p-67-iso8859-1
- lucidasans-bolditalic-12 -b&h-lucida-bold-i-normal-sans-12-120-75-75-p-79-iso8859-1
-Index: font-alias-X11R7.0-1.0.1/misc/fonts.alias
-===================================================================
---- font-alias-X11R7.0-1.0.1.orig/misc/fonts.alias
-+++ font-alias-X11R7.0-1.0.1/misc/fonts.alias
-@@ -1,6 +1,5 @@
- ! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $
- fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1
--variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1
- 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1
- 5x8 -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1
- 6x9 -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1
diff --git a/patches/font-alias-1.0.3/series b/patches/font-alias-1.0.3/series
deleted file mode 100644
index 23239fd..0000000
--- a/patches/font-alias-1.0.3/series
+++ /dev/null
@@ -1 +0,0 @@
-alias_variable_font_dir.diff
--
1.7.7
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2011-10-30 22:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 10/28] bzip2: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00 ` Robert Schwebel [this message]
2011-10-30 22:00 ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320012059-24971-23-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox