build system

diff --git a/.gitignore b/.gitignore
index ba4dfe1cfffb3369fd00c990c7b7d3cff8a80049..c3cdc9bfbbe175f842e86be0acc552a454991a2e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,15 @@
 *~
 *~

+

 bad/*.bdf
 good/*.bdf
 rules/*.rules
 rules/foundries
 rules/foundries.new
 bad/*.bdf
 good/*.bdf
 rules/*.rules
 rules/foundries
 rules/foundries.new

+
+update-xfonts-traditional.sedded
+
+debian/files
+debian/debhelper.log
+debian/xfonts-traditional
+debian/xfonts-traditional.substvars
+debian/xfonts-traditional.debhelper.log

diff --git a/Makefile b/Makefile
index f447dfca5b4ae0c76d4676903b8dd61b1d9d59e3..2b9b1bfbbc08c167e0c6dba37f69227065a9cc9e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,23 @@
 SHELL=/bin/bash
 
 SHELL=/bin/bash
 

+prefix?=/usr/local
+
+package=xfonts-traditional
+utility=update-$(package)
+
+install=install -m 755 -o 0 -g 0
+
+default: all
+
+all:
+       ./mkrules <specs
+
+install:
+       perl -pe 's#^(our \$$prefix=").*("\;\s*)$$#$$1$(prefix)$$2#' \
+               <$(utility) >$(utility).sedded
+       $(install) -d $(DESTDIR)$(prefix)/{bin,share/$(package)/rules}
+       $(install) $(utility).sedded $(DESTDIR)$(prefix)/bin/$(utility)
+

 clean:
        rm -f rules/*.rules
        rm -f good/*.bdf bad/*.bdf
 clean:
        rm -f rules/*.rules
        rm -f good/*.bdf bad/*.bdf

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..2695464
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+xfonts-traditional (1.0) unstable; urgency=low
+
+  * Initial release.
+
+ -- Ian Jackson <ian@liberator.relativity.greenend.org.uk>  Sun, 08 Jan 2012 16:51:02 +0000
+

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8

diff --git a/debian/control b/debian/control
index 37e50bf51ae65d6dcac0540ada354c54c54eb8c8..77dc51ff3febb8e2b6cbb3bc457742c60fbf9c18 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,12 @@
+Source: xfonts-traditional
+Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Section: x11
+Priority: optional
+Standards-Version: 3.9.2.0
+Build-Depends: xfonts-utils, pcf2bdf
+

 Package: xfonts-traditional
 Package: xfonts-traditional

+Architecture: all

 Depends: xfonts-utils, pcf2bdf
 Description: Traditional fixed-with fonts for X
  Provides "traditional" versions of fixed-width fonts.
 Depends: xfonts-utils, pcf2bdf
 Description: Traditional fixed-with fonts for X
  Provides "traditional" versions of fixed-width fonts.

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..a8f4f0e
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+prefix=/usr
+export prefix
+
+%:
+       dh $@

diff --git a/utility b/update-xfonts-traditional
similarity index 97%
rename from utility
rename to update-xfonts-traditional
index f03b7715767ee2e0566fa274a578ae8d73c6cf72..1daa70c313fcab58f8e744c934ab11a1ac5531d2 100755 (executable)
--- a/utility
+++ b/update-xfonts-traditional
@@ -4,8 +4,10 @@ use POSIX;
 use IO::File;
 use Getopt::Long;
 
 use IO::File;
 use Getopt::Long;
 

+our $prefix="/usr/local";

 our $package='xfonts-traditional';
 our $package='xfonts-traditional';

-our $sharedir="/usr/share/$package";
+our $sharedir="$prefix/share/$package";
+our @fontsdirs=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);

 our @rulespath;
 our $mode;
 our %foundrymap;
 our @rulespath;
 our $mode;
 our %foundrymap;