- merged DESTDIR patch into FHS,

- moved font to system-wide dir.

Changed files:
    vice-DESTDIR.patch -> 1.4
    vice-FHS.patch -> 1.2

diff --git a/vice-DESTDIR.patch b/vice-DESTDIR.patch
deleted file mode 100644 (file)
index 917f8fe..0000000
--- a/vice-DESTDIR.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vice-1.12/data/fonts/Makefile.am.orig      2002-08-03 16:09:51.000000000 +0200
-+++ vice-1.12/data/fonts/Makefile.am   2003-07-20 21:52:30.000000000 +0200
-@@ -1,14 +1,13 @@
- fontsdir = $(prefix)/lib/vice/fonts
- 
- fonts_DATA = \
--      cbm-directory-charset.fon \
-       vice-cbm.bdf
- 
--EXTRA_DIST = $(fonts_DATA)
-+EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon
- 
--install: 
-+install-data-hook: 
-       @echo "Preparing fontdir..." ; \
--      cd $(prefix)/lib/vice/fonts ; \
-+      cd $(DESTDIR)$(prefix)/lib/vice/fonts ; \
-       bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
-       rm vice-cbm.bdf ; \
-       mkfontdir .

diff --git a/vice-FHS.patch b/vice-FHS.patch
index 09050f5bce669ec76cc8199ff81578ad02e20918..eea1ff49e067f5ebc1a343c024319d64c6072828 100644 (file)
--- a/vice-FHS.patch
+++ b/vice-FHS.patch
@@ -73,22 +73,25 @@ diff -urN vice-1.16.orig/data/DRIVES/Makefile.am vice-1.16/data/DRIVES/Makefile.
 diff -urN vice-1.16.orig/data/fonts/Makefile.am vice-1.16/data/fonts/Makefile.am
 --- vice-1.16.orig/data/fonts/Makefile.am      2003-11-08 14:34:41.000000000 +0100
 +++ vice-1.16/data/fonts/Makefile.am   2005-02-06 12:08:27.000000000 +0100
-@@ -1,4 +1,4 @@
+@@ -1,14 +1,12 @@
 -fontsdir = $(prefix)/lib/vice/fonts
-+fontsdir = $(datadir)/vice/fonts
++fontsdir = $(datadir)/fonts/misc
  
  fonts_DATA = \
-       cbm-directory-charset.fon \
-@@ -8,7 +8,7 @@
+-      cbm-directory-charset.fon \
+       vice-cbm.bdf
+ 
+-EXTRA_DIST = $(fonts_DATA)
++EXTRA_DIST = $(fonts_DATA) cbm-directory-charset.fon
  
  install: install-data-am
        @echo "Preparing fontdir..." ; \
 -      cd $(DESTDIR)$(prefix)/lib/vice/fonts ; \
-+      cd $(DESTDIR)$(datadir)/vice/fonts ; \
++      cd $(DESTDIR)$(datadir)/fonts/misc ; \
        bdftopcf -o vice-cbm.pcf vice-cbm.bdf ; \
-       rm vice-cbm.bdf ; \
-       mkfontdir .
-Files vice-1.16.orig/data/fonts/vice-cbm.pcf and vice-1.16/data/fonts/vice-cbm.pcf differ
+-      rm vice-cbm.bdf ; \
+-      mkfontdir .
++      rm vice-cbm.bdf
 diff -urN vice-1.16.orig/data/PET/Makefile.am vice-1.16/data/PET/Makefile.am
 --- vice-1.16.orig/data/PET/Makefile.am        2004-12-19 19:46:18.000000000 +0100
 +++ vice-1.16/data/PET/Makefile.am     2005-02-06 12:08:40.000000000 +0100