--- xfonts-jmk-3.0.orig/jmk-x11-fonts.spec.sed +++ xfonts-jmk-3.0/jmk-x11-fonts.spec.sed @@ -101,10 +101,9 @@ for i in \ "" \ %{Prefix} \ - %{Prefix}/X11R6 \ - %{Prefix}/X11R6/lib \ - %{Prefix}/X11R6/lib/X11 \ - %{Prefix}/X11R6/lib/X11/fonts \ + %{Prefix}/share \ + %{Prefix}/share/X11 \ + %{Prefix}/share/X11/fonts \ ; do mkdir -p "${RPM_BUILD_ROOT}${i}" done @@ -137,6 +136,6 @@ %files %attr(- ,root,root) %doc ChangeLog NEWS README %{Name}-%{Version}.lsm -%attr(0755,root,root) %dir %{Prefix}/X11R6/lib/X11/fonts/%{FoundryDir} -%attr(0444,root,root) %{Prefix}/X11R6/lib/X11/fonts/%{FoundryDir}/* +%attr(0755,root,root) %dir %{Prefix}/share/X11/fonts/%{FoundryDir} +%attr(0444,root,root) %{Prefix}/share/X11/fonts/%{FoundryDir}/* --- xfonts-jmk-3.0.orig/debian/control +++ xfonts-jmk-3.0/debian/control @@ -0,0 +1,25 @@ +Source: xfonts-jmk +Section: x11 +Priority: optional +Maintainer: Russ Allbery +Standards-Version: 3.6.2 +Build-Depends-Indep: debhelper (>= 4.0.2), xutils (>= 4.0.3), bdftopcf, xfonts-utils + +Package: xfonts-jmk +Architecture: all +Depends: ${misc:Depends} +Description: James M. Knoble's character-cell fonts for X + These are character-cell fonts for use with the X Window System, created + by Jim Knoble. The fonts currently included in this package are: + . + Neep (formerly known as NouveauGothic): A pleasantly legible variation on + the standard fixed fonts that accompany most distributions of the X + Window System. Comes in both normal and bold weights in small, medium, + large, extra-large, and huge sizes, as well as an extra-small size that + only comes in normal weight. ISO-8859-1, ISO-8859-2, ISO-8859-9, and + ISO-8859-15 encodings are available. + . + Modd: A fixed-width font with sleek, contemporary styling. Normal and + bold weights in a 12-point (6x13) size. ISO-8859-1 encoding only. + . + Homepage: http://www.jmknoble.net/fonts/ --- xfonts-jmk-3.0.orig/debian/dirs +++ xfonts-jmk-3.0/debian/dirs @@ -0,0 +1,2 @@ +usr/share/X11/fonts +etc/X11/fonts/misc --- xfonts-jmk-3.0.orig/debian/compat +++ xfonts-jmk-3.0/debian/compat @@ -0,0 +1 @@ +4 --- xfonts-jmk-3.0.orig/debian/watch +++ xfonts-jmk-3.0/debian/watch @@ -0,0 +1,4 @@ +# watch -- Rules for uscan to find new upstream versions. + +version=3 +http://www.jmknoble.net/fonts/jmk-x11-fonts-(.*)\.tar\.gz --- xfonts-jmk-3.0.orig/debian/changelog +++ xfonts-jmk-3.0/debian/changelog @@ -0,0 +1,73 @@ +xfonts-jmk (3.0-6ubuntu1) dapper; urgency=low + + * Resynchronise with Debian (Closes: #4080): + - Don't install lintian override since we don't install to + /usr/X11R6/ . + + -- Daniel T Chen Tue, 08 Nov 2005 10:57:01 +0000 + +xfonts-jmk (3.0-6) unstable; urgency=low + + * Rework the long description so that it will wrap more smoothly and add + a homepage link. + * Install a lintian override for the X font location. + * Add watch file. + * Update standards version to 3.6.2 (no changes required). + + -- Russ Allbery Tue, 19 Jul 2005 11:06:45 -0700 + +xfonts-jmk (3.0-5ubuntu1) breezy; urgency=low + + * Install fonts in /usr/share/X11/fonts/misc (Closes Malone #2572) + * Add build-dep for bdftopcf and xfonts-utils + + -- Barry deFreese Sun, 2 Oct 2005 22:12:53 -0400 + +xfonts-jmk (3.0-5) unstable; urgency=low + + * New maintainer. (Closes: #201390) + * Update standards version to 3.6.1. + - Depend on xutils (>= 4.0.3) instead of 4.0.2. + * Updated description, included additional available encodings. + * Clean up and reformat debian/rules. + - Merge file removals into dh_clean invocations. + - Use make distclean intead of manually removing Makefile. + + -- Russ Allbery Fri, 6 Aug 2004 16:04:30 -0700 + +xfonts-jmk (3.0-4) unstable; urgency=low + + * Uploading with maintainer set to QA group + * debian/copyright: refer to common licence file + * debian/control: change Build-Depends to Build-Depends-Indep + + -- Andrew Pollock Wed, 12 Nov 2003 23:23:49 +1100 + +xfonts-jmk (3.0-3) unstable; urgency=low + + * Updated standards version (Closes: #95694) + * Uses new debhelper + * Added build depends + + -- Joseph Carter Sat, 19 May 2001 17:41:43 -0700 + +xfonts-jmk (3.0-2) unstable; urgency=low + + * Fix postrm (Closes: #49771) + + -- Joseph Carter Wed, 10 Nov 1999 06:43:47 -0800 + +xfonts-jmk (3.0-1) unstable; urgency=low + + * New upstream version + * Read the NEWS file! + * Oooh, this package isn't policy 3 or debhelper 2 yet--we'll fix that! + + -- Joseph Carter Sun, 19 Sep 1999 23:38:45 -0700 + +xfonts-jmk (2.0-1) unstable; urgency=low + + * Initial Release. + + -- Joseph Carter Thu, 20 May 1999 03:04:11 -0700 + --- xfonts-jmk-3.0.orig/debian/copyright +++ xfonts-jmk-3.0/debian/copyright @@ -0,0 +1,44 @@ +Package created for Debian by Joseph Carter and +currently maintained by Russ Allbery . + +The source was downloaded from: + + + +Upstream author: + + Jim Knoble + +Copyright (excerpted from upstream README): + + These fonts are all copyright © 1998 Jim Knoble . I + have chosen to release them under the terms of the GNU General Public + License (GPL) version 2.0, or, at your option, any later version. This + means that you may freely modify and distribute these fonts, as long as + you distribute the source code for the fonts as well. + + NOTE: I am considering changing the licensing terms of these fonts to + be more liberal, using either a Perl-style Artistic License or an + MIT/X-Consortium/Open-Group-style license. If you have something + you'd like to say regarding the licensing terms, please contact + me at the email address at the bottom of this file. + + This form of `free software' is known as Open Source software. See + for more information. + + Some few parts of these fonts are derived from the 6x13 fixed font + accompanying the XFree86-3.3.2 distribution of the X Window System. + That font bears the notice `Public domain font; share and enjoy'. + + The vast majority of this set of fonts is original work. Besides the + derivations noted above, any resemblance to other fonts, copyrighted or + not, may be accounted for by standard letter shapes and the relatively + coarse resolution (75dpi) for which the fonts were created. + + No warranty of any kind, either express or implied, including that of + merchantibility or fitness for a particular purpose. If anything + breaks, you get to keep both pieces. Your mileage may vary. Eat your + vegetables. + +The full text of the GPL is available on Debian systems in +/usr/share/common-licenses/GPL. --- xfonts-jmk-3.0.orig/debian/docs +++ xfonts-jmk-3.0/debian/docs @@ -0,0 +1,4 @@ +README +NEWS +descriptions.iso8859-1.tbl +descriptions.iso8859-2.tbl --- xfonts-jmk-3.0.orig/debian/rules +++ xfonts-jmk-3.0/debian/rules @@ -0,0 +1,55 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE = $(shell dh_listpackages) +TMP = $(CURDIR)/debian/$(PACKAGE) + +build: build-stamp +build-stamp: + dh_testdir + xmkmf + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + -$(MAKE) distclean + dh_clean -Xneep-post-ampersand build-stamp install-stamp + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -Xneep-post-ampersand + dh_installdirs + $(MAKE) DESTDIR=$(TMP) \ + INSTALL_DIR=/usr/share/X11/fonts/misc install + mv $(TMP)/usr/share/X11/fonts/misc/fonts.alias \ + $(TMP)/etc/X11/fonts/misc/xfonts-jmk.alias + rm $(TMP)/usr/share/X11/fonts/misc/fonts.dir +# install -d $(TMP)/usr/share/lintian/overrides +# install -m 644 -c debian/lintian \ +# $(TMP)/usr/share/lintian/overrides/xfonts-jmk + touch install-stamp + +binary-arch: +# We have nothing to do here. + +binary-indep: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installchangelogs ChangeLog + dh_installxfonts + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xfonts-jmk-3.0.orig/debian/lintian +++ xfonts-jmk-3.0/debian/lintian @@ -0,0 +1 @@ +xfonts-jmk: packages-installs-file-to-usr-x11r6