Group :: Publishing
RPM: xmbdfed
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: xmbdfed-4.7patch1-debian-3.patch
Download
Download
--- xmbdfed-4.7patch1.orig/bdfpkgf.c
+++ xmbdfed-4.7patch1/bdfpkgf.c
@@ -223,6 +223,7 @@
* for the comments encountered.
*/
comment_size = 0;
+ comment = 0;
while ((c = getc(in)) >= PK_xxx1 && c != GF_char_loc) {/*
--- xmbdfed-4.7patch1.orig/Makefile
+++ xmbdfed-4.7patch1/Makefile
@@ -46,17 +46,17 @@
# Uncomment these if you have the FreeType library and want to use it to
# import OpenType fonts.
#
-FTYPE_INCS = -I/usr/include/freetype2
-FTYPE_LIBS = -lfreetype
-FTYPE_DEFS = -DHAVE_FREETYPE
+FTYPE_INCS = $(shell freetype-config --cflags)
+FTYPE_LIBS = $(shell freetype-config --libs)
+FTYPE_DEFS = -DHAVE_FREETYPE
#
# Uncomment these if you have the hbf.h and hbf.c files in the current
# directory and the patch has been applied.
#
-#HBF_HDRS = hbf.h
-#HBF_OBJS = hbf.o
-#HBF_DEFS = -DHAVE_HBF
+HBF_HDRS = hbf.h
+HBF_OBJS = hbf.o
+HBF_DEFS = -DHAVE_HBF
#
# Specify the various defines needed for HBF fonts. If you do not have GNU
@@ -82,15 +82,15 @@
#
# Uncomment these for Solaris.
#
-INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
-LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
- -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
+#INCS = -I/usr/openwin/include -I/usr/dt/include $(FTYPE_INCS)
+#LIBS = -R/usr/openwin/lib -R/usr/dt/lib -L/usr/dt/lib -lXm \
+# -L/usr/openwin/lib -lXmu -lXt -lXext -lX11 $(FTYPE_LIBS)
#
# Uncomment these for Linux.
#
-INCS = $(FTYPE_INCS)
-LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
+INCS = -I/usr/include $(FTYPE_INCS)
+LIBS = -lXm -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
#
# Uncomment these for HPUX.
--- xmbdfed-4.7patch1.orig/hbf.h
+++ xmbdfed-4.7patch1/hbf.h
@@ -14,6 +14,14 @@
extern "C" {#endif
+/*
+ * $Id: HBF.PATCH,v 1.1 1998/07/24 16:12:11 mleisher Exp $
+ */
+
+#ifdef __cplusplus
+extern "C" {+#endif
+
#ifndef __STDC__
# ifndef const
# define const
@@ -176,4 +184,8 @@
}
#endif
+#ifdef __cplusplus
+}
+#endif
+
#endif /* ! _HBF_ */
--- xmbdfed-4.7patch1.orig/bdfpsf.c
+++ xmbdfed-4.7patch1/bdfpsf.c
@@ -216,7 +216,7 @@
{int seq;
unsigned long i, nglyphs, n;
- long code;
+ long code = 0;
unsigned char *map, *map_end;
bdf_glyph_t *gp;
@@ -331,7 +331,7 @@
#endif
{int ns, nc, sum, c;
- long code;
+ long code = 0;
unsigned char *mp, *ep;
char **list, *lp;
--- xmbdfed-4.7patch1.orig/setup.c
+++ xmbdfed-4.7patch1/setup.c
@@ -92,7 +92,6 @@
Boolean saved;
} MXFEditorSetup;
-unsigned long active_editor;
static MXFEditorSetup setup;
static MXFEditorOtherOptions other;
--- xmbdfed-4.7patch1.orig/GEdit.c
+++ xmbdfed-4.7patch1/GEdit.c
@@ -2048,6 +2048,7 @@
unsigned char *masks;
char *np, *ep, name[256];
+ masks = onebpp;
_XmuttGlyphEditCheckClass(w);
if (filename == 0 || *filename == 0)
--- xmbdfed-4.7patch1.orig/debian/menu
+++ xmbdfed-4.7patch1/debian/menu
@@ -0,0 +1,2 @@
+?package(xmbdfed): needs="X11" section="Apps/Graphics" title="XmBDFEditor" \
+ command="/usr/bin/xmbdfed"
--- xmbdfed-4.7patch1.orig/debian/control
+++ xmbdfed-4.7patch1/debian/control
@@ -0,0 +1,35 @@
+Source: xmbdfed
+Section: x11
+Priority: optional
+Maintainer: Baruch Even <baruch@debian.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 3), libfreetype6-dev, lesstif2-dev, libxpm-dev, libxmu-dev
+
+Package: xmbdfed
+Architecture: any
+Depends: ${shlibs:Depends}+Description: X11 font editor
+ XmBDFEditor is a Motif-based BDF font editor with the following features:
+ .
+ o Multiple fonts can be loaded from the command line.
+ o Multiple fonts can be open at the same time.
+ o Cutting and pasting glyphs between fonts.
+ o Multiple glyph bitmap editors can be open at the same time.
+ o Cutting and pasting between glyph bitmap editors.
+ o Automatic correction of certain metrics when a font is loaded.
+ o Generation of XLFD font names for fonts without XLFD names.
+ o Update an XLFD font name from the font properties.
+ o Update the font properties from an XLFD font name.
+ o Font property editor.
+ o Font comment editor.
+ o Supports unencoded glyphs (ENCODING of -1).
+ o Display of glyph encodings in octal, decimal, or hex.
+ o Builtin on-line help.
+ o Imports PK/GF fonts.
+ o Imports Linux console fonts (PSF, CP, and FNT).
+ o Imports Sun console fonts (vfont format).
+ o Imports fonts from the X server.
+ o Imports Windows FON/FNT fonts.
+ o Imports TrueType fonts and collections.
+ .
+ Homepage: http://crl.nmsu.edu/~mleisher/xmbdfed.html
--- xmbdfed-4.7patch1.orig/debian/rules
+++ xmbdfed-4.7patch1/debian/rules
@@ -0,0 +1,46 @@
+#! /usr/bin/make -f
+
+export DH_COMPAT := 3
+
+CFLAGS := -O2 -Wall
+ifneq ($(findstring debug,$(DEB_BUILD_OPTIONS)),)
+CFLAGS += -g
+endif
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_clean build.stamp
+ $(MAKE) realclean
+
+build: build.stamp
+build.stamp:
+ dh_testdir
+ $(MAKE) CFLAGS="$(CFLAGS)"
+ > $@
+
+binary: binary-arch binary-indep
+
+binary-arch: build
+ dh_testdir
+ dh_testroot
+ dh_clean
+ dh_installdirs usr/bin
+ install xmbdfed debian/xmbdfed/usr/bin
+ dh_installdocs README
+ dh_installexamples xmbdfedrc
+ dh_installmenu
+ dh_installman xmbdfed.man
+ dh_installchangelogs CHANGES
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-indep: build
+
+.PHONY: clean build binary binary-arch binary-indep
--- xmbdfed-4.7patch1.orig/debian/watch
+++ xmbdfed-4.7patch1/debian/watch
@@ -0,0 +1,5 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# Site Directory Pattern Version Script
+ftp://crl.nmsu.edu /CLR/multiling/General/ xmbdfed-(\\d+\\.\\d+\\.?\\d*)\\.tar\\.gz debian
--- xmbdfed-4.7patch1.orig/debian/changelog
+++ xmbdfed-4.7patch1/debian/changelog
@@ -0,0 +1,157 @@
+xmbdfed (4.7patch1-3) unstable; urgency=low
+
+ * Fix compilation problem with a prerelease of gcc 4.0 (Closes: #297875)
+
+ -- Baruch Even <baruch@debian.org> Sat, 12 Mar 2005 16:44:23 +0000
+
+xmbdfed (4.7patch1-2) unstable; urgency=low
+
+ * Add build-dependency on libxmu-dev (Closes: bug#256425)
+
+ -- Baruch Even <baruch@debian.org> Sun, 27 Jun 2004 09:54:56 +0300
+
+xmbdfed (4.7patch1-1) unstable; urgency=low
+
+ * New upstream version (Closes: bug#239965)
+
+ -- Debian User <baruch@debian.org> Wed, 31 Mar 2004 09:24:47 +0200
+
+xmbdfed (4.5patch1-1) unstable; urgency=low
+
+ * New upstream patch for v4.5 (Closes: bug#141188)
+
+ -- Baruch Even <baruch@debian.org> Sun, 7 Apr 2002 04:53:20 +0300
+
+xmbdfed (4.5-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Baruch Even <baruch@debian.org> Fri, 4 Jan 2002 19:38:18 +0200
+
+xmbdfed (4.4-4) unstable; urgency=low
+
+ * Taking over maintainership. (Closes: Bug#90056)
+ * Uploading to fix a version mismatch, version in sid was called 4.3
+ even though it was 4.4
+ * Fixed a small bug that had a warning, there are many more warnings
+ and it will take time to squash them and verify that they are not bugs.
+
+ -- Baruch Even <baruch@debian.org> Fri, 7 Sep 2001 19:52:17 +0300
+
+xmbdfed (4.4-3) unstable; urgency=low
+
+ * Updated build dependency on freetype2-dev to libttf-dev.
+ * Conforms to Standards version 3.5.5.
+
+ -- Matej Vela <vela@debian.org> Wed, 13 Jun 2001 04:01:26 +0200
+
+xmbdfed (4.4-2) unstable; urgency=low
+
+ * Changed priority to optional, correcting the override disparity.
+
+ -- Matej Vela <vela@debian.org> Tue, 17 Apr 2001 13:44:09 +0200
+
+xmbdfed (4.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * Package is orphaned (see #90056); maintainer set to Debian QA Group.
+ * Converted to debhelper.
+ * Conforms to Standards version 3.5.2:
+ * Added build dependencies.
+ * Install into /usr rather than /usr/X11R6.
+ * debian/rules: Support the `debug' build option.
+ * bdf.h: No extend subdirectory in freetype2-dev; include <ftxsbit.h>.
+ * debian/README.debian: Obsolete; removed. Closes: #65230.
+ * xmbdfed.c: Fixed for Alpha. (Thanks to Falk Hueffner for the
+ patch.) Closes: #66312.
+ * No need to depend on gzip as it's marked essential.
+ * debian/copyright: Updated.
+
+ -- Matej Vela <vela@debian.org> Sun, 1 Apr 2001 12:57:22 +0200
+
+xmbdfed (4.3-3) unstable; urgency=low
+
+ * add -I/usr/include/freetype to really close bug 52345. I have probably
+ an old version of freetype which puts its headers in /usr/include...
+
+ -- Frederic Lepied <Lepied@debian.org> Wed, 15 Dec 1999 06:10:05 +0100
+
+xmbdfed (4.3-2) unstable; urgency=low
+
+ * changed the Makefile to compile cleanly.
+
+ -- Frederic Lepied <Lepied@debian.org> Sat, 11 Dec 1999 20:54:33 +0100
+
+xmbdfed (4.3-1) unstable; urgency=low
+
+ * new upstream version. Applied patches 1 to 3. Closes Bug#51356.
+
+ -- Frederic Lepied <Lepied@debian.org> Sun, 5 Dec 1999 20:04:39 +0100
+
+xmbdfed (4.1-1) unstable; urgency=low
+
+ * new upstream version.
+
+ -- Frederic Lepied <Lepied@debian.org> Thu, 21 Oct 1999 18:01:04 +0200
+
+xmbdfed (3.9-2) unstable; urgency=low
+
+ * applied patch 1 and 2 from upstream author.
+
+ -- Frederic Lepied <Lepied@debian.org> Tue, 20 Jul 1999 21:47:54 +0200
+
+xmbdfed (3.9-1) unstable; urgency=low
+
+ * new upstream version
+ * applied patch from J.H.M. Dassen (Ray) to fix Bug#40441.
+
+ -- Frederic Lepied <Lepied@debian.org> Tue, 29 Jun 1999 20:57:48 +0200
+
+xmbdfed (3.7-1) unstable; urgency=low
+
+ * new upstream version.
+ * applied patch 1 to 3.
+
+ -- Frederic Lepied <Lepied@debian.org> Mon, 15 Feb 1999 13:03:22 +0100
+
+xmbdfed (3.3-1) unstable; urgency=low
+
+ * new upstream version.
+
+ -- Frederic Lepied <Lepied@debian.org> Thu, 15 Oct 1998 07:50:41 +0200
+
+xmbdfed (3.2-1) unstable; urgency=low
+
+ * new upstream version.
+ * compiled with freetype2.
+
+ -- Frederic Lepied <Lepied@debian.org> Sun, 13 Sep 1998 20:38:16 +0200
+
+xmbdfed (3.0.1-2) unstable frozen; urgency=low
+
+ * (copyright): suppressed HBF statement already removed by upstream author.
+ Fixes Bug#21939.
+
+ -- Frederic Lepied <Lepied@debian.org> Mon, 4 May 1998 05:33:34 +0200
+
+xmbdfed (3.0.1-1) unstable; urgency=low
+
+ * new upstream version.
+
+ -- Frederic Lepied <Lepied@debian.org> Thu, 19 Feb 1998 05:03:16 +0100
+
+xmbdfed (2.9-2) unstable; urgency=low
+
+ * updated Imakefile to use new freetype0-dev package.
+
+ -- Frederic Lepied <Lepied@debian.org> Fri, 9 Jan 1998 22:35:34 +0100
+
+xmbdfed (2.9-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Frederic Lepied <Lepied@debian.org> Wed, 24 Dec 1997 17:31:22 +0100
+
+Local variables:
+mode: debian-changelog
+End:
--- xmbdfed-4.7patch1.orig/debian/copyright
+++ xmbdfed-4.7patch1/debian/copyright
@@ -0,0 +1,72 @@
+This package was debianized by Frederic Lepied <Lepied@debian.org> on
+Wed, 24 Dec 1997 17:31:22 +0100.
+
+It was downloaded from ftp://crl.nmsu.edu/CLR/multiling/General/
+Homepage for it is at: http://crl.nmsu.edu/~mleisher/xmbdfed.html
+
+Upstream Author: Mark Leisher <mleisher@crl.nmsu.edu>
+
+Copyright:
+
+#
+# $Id: COPYRIGHTS,v 1.2 1999/05/03 17:17:46 mleisher Exp $
+#
+
+#
+# This file contains copyright notices from all the packages that provided
+# the sources.
+#
+
+==============================================================================
+
+From the XmBDFEditor code:
+
+#
+# Copyright 1996, 1997, 1998, 1999 Computing Research Labs,
+# New Mexico State University
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE COMPUTING RESEARCH LAB OR NEW MEXICO STATE UNIVERSITY BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
+# OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+# THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+==============================================================================
+
+From the getbdf code:
+
+/*
+ * getbdf - generate a BDF file from a font as accessed by an X
+ * connection.
+ *
+ * As its author, I explicitly place this program in the public domain;
+ * you may use it in any way for any purpose. (I would appreciate
+ * credit where it's due....)
+ *
+ * I have tried to make sure that it does what it's supposed to, but I
+ * make no promises; if it causes something unpleasant to happen, it's
+ * your problem, not mine. It's free, and you get what you pay for.
+ *
+ * Of course, I say that for legal reasons; I'd *am* interested in
+ * hearing what you think of getbdf. In particular, if you think
+ * you've found something wrong with it, I definitely want to hear
+ * about it.
+ *
+ * der Mouse
+ *
+ * old: mcgill-vision!mouse
+ * new: mouse@larry.mcrcim.mcgill.edu
+ */