[Chinese-commits] [zhcon] 05/10: Move zhcon fonts and IME tables to /usr/share/zhcon

[Anthony Fok]

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

foka pushed a commit to branch master
in repository zhcon.

commit b85fc93db15fae92244c9c9a55c73af4f2b57912
Author: Anthony Fok <foka at debian.org>
Date:   Thu Nov 19 06:08:01 2015 -0700

    Move zhcon fonts and IME tables to /usr/share/zhcon
    
    So these platform-independent files don't end up in
    e.g. /usr/lib/x86_64-linux-gnu/zhcon
---
 ...install-fonts-and-ime-tables-to-usr-share.patch | 60 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 61 insertions(+)

diff --git a/debian/patches/0010-install-fonts-and-ime-tables-to-usr-share.patch b/debian/patches/0010-install-fonts-and-ime-tables-to-usr-share.patch
new file mode 100644
index 0000000..c9757db
--- /dev/null
+++ b/debian/patches/0010-install-fonts-and-ime-tables-to-usr-share.patch
@@ -0,0 +1,60 @@
+Description: Move zhcon fonts and IME tables to /usr/share/zhcon
+ The fonts and IME tables that come with zhcon are platform-independent,
+ and should not be in /usr/lib/zhcon.  Furthermore, with the new
+ multiarch support in place, these files would have been installed
+ in directories such as /usr/lib/x86_64-linux-gnu/zhcon, and
+ zhcon would not be able to find its fonts, hence the move.
+Author: Anthony Fok <foka at debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2015-11-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/font/Makefile.am
++++ b/font/Makefile.am
+@@ -1,8 +1,8 @@
+ EXTRA_DIST = *.bpsf
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
+-	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/font/
++	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(datadir)/zhcon/font/
+ 
+ uninstall-local:
+-	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
++	-rm -f $(DESTDIR)$(datadir)/zhcon/font/*.bpsf
+--- a/src/zhcon.cpp
++++ b/src/zhcon.cpp
+@@ -627,7 +627,7 @@
+     if (getenv("LC_ALL"))
+         mOldLocale = getenv("LC_ALL");
+ 
+-    string prefix = PREFIX"/lib/zhcon/";
++    string prefix = PREFIX"/share/zhcon/";
+     mASCIIFont = prefix + f.GetOption(string("ascfont"), string(ASCIIFONT));
+     mGB2312Font = prefix + f.GetOption(string("gbfont"), string(GB2312FONT));
+     mGBKFont = prefix + f.GetOption(string("gbkfont"), string(GBKFONT));
+@@ -758,7 +758,7 @@
+     InputManager::SetTty(mConFd, ttyno, mTtyFd);
+     
+     string s;
+-    s = f.GetOption(string("zhconpath"), string(PREFIX"/lib/zhcon/"));
++    s = f.GetOption(string("zhconpath"), string(PREFIX"/share/zhcon/"));
+     NativeInputServer::SetDataPath(s);
+ #ifdef HAVE_UNICON_LIB
+     s = f.GetOption(string("uniconpath"), string("/usr/lib/unicon/"));
+--- a/input/Makefile.am
++++ b/input/Makefile.am
+@@ -1,8 +1,8 @@
+ EXTRA_DIST = *.mb
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
+-	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/zhcon/input/
++	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(datadir)/zhcon/input/
+ 
+ uninstall-local:
+-	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
++	-rm -f $(DESTDIR)$(datadir)/zhcon/input/*.mb
diff --git a/debian/patches/series b/debian/patches/series
index 7960ca7..659c491 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0007-better-jp-and-ko-handling.patch
 # 0008-default-to-utf8.patch
 0009-remove-rpath-from-configure.patch
+0010-install-fonts-and-ime-tables-to-usr-share.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/zhcon.git