--- dvi2dvi-2.0alpha.orig/funcfont.c +++ dvi2dvi-2.0alpha/funcfont.c @@ -6,6 +6,8 @@ #include "global.h" #include "funcfont.h" #ifdef KPATHSEA +extern struct str_llist_elt *value; /* Forward declaration */ +#include #include #include #endif --- dvi2dvi-2.0alpha.orig/defs.h +++ dvi2dvi-2.0alpha/defs.h @@ -47,11 +47,7 @@ char *realloc(); char *calloc(); int free(); -#ifdef ANSI char *sprintf(char *, const char *, ...); -#else -char *sprintf(); -#endif #else /* POSIX */ void *malloc(); void *realloc(); --- dvi2dvi-2.0alpha.orig/decompfont.c +++ dvi2dvi-2.0alpha/decompfont.c @@ -93,8 +93,8 @@ ntail = fe->n+strlen(ffdcmp->dcmp_name); fontidx = NULL; for (i = 1; i <= NJSUBS; i++) { - (void)sprintf(n, "%s%s%s", ffdcmp->dcmp_name, jsubfontname(i), ntail); - readfontdef(i, 0, fe->s, fe->d, 0, strlen(n), (char *)n, &fontidx); + (void)sprintf((char *)n, "%s%s%s", ffdcmp->dcmp_name, jsubfontname(i), ntail); + readfontdef(i, 0, fe->s, fe->d, 0, strlen((char *)n), (char *)n, &fontidx); ffdcmp->dcmp_fetab[i] = fontidx->fent; } fe->fnt_markchar = dcmpntt_markchar; @@ -191,9 +191,9 @@ ntail = fe->n+strlen(ffdcmp->dcmp_name); fontidx = NULL; for (i = 1; i <= NCSUBS; i++) { - (void)sprintf(n, "%s%c%02x%c%s", + (void)sprintf((char *)n, "%s%c%02x%c%s", ffdcmp->dcmp_name, CSUB_SEP, 31+i*2, CSUB_SEP, ntail); - readfontdef(i, 0, fe->s, fe->d, 0, strlen(n), (char *)n, &fontidx); + readfontdef(i, 0, fe->s, fe->d, 0, strlen((char *)n), (char *)n, &fontidx); ffdcmp->dcmp_fetab[i] = fontidx->fent; } fe->fnt_markchar = dcmpdcd_markchar; --- dvi2dvi-2.0alpha.orig/kpse.c +++ dvi2dvi-2.0alpha/kpse.c @@ -1,6 +1,8 @@ #ifdef KPATHSEA #include "defs.h" +extern struct str_llist_elt *value; /* Forward declaration */ +#include #include #include #include --- dvi2dvi-2.0alpha.orig/virfont.c +++ dvi2dvi-2.0alpha/virfont.c @@ -8,6 +8,7 @@ #include "global.h" #include "virfont.h" #ifdef KPATHSEA +#include #include #endif --- dvi2dvi-2.0alpha.orig/Makefile +++ dvi2dvi-2.0alpha/Makefile @@ -2,17 +2,17 @@ # your site: # # BINAREA and DVI2LIB are relative to PREFIX -PREFIX=/usr/local +PREFIX=$(DESTDIR)/usr # where dvi2dvi is installed BINAREA=${PREFIX}/bin # # directory for dvi2dvi: where the auxiliary files are installed -DVI2LIB=${PREFIX}/lib/dvi2dvi +DVI2LIB=$(DESTDIR)/etc/texmf/dvi2dvi # # name of default fontdesc file in your site FONTDESC=fontdesc # -DVI2PATH=. +DVI2PATH=.:/etc/texmf/dvi2dvi # kpathsea KPSELIB = -L${PREFIX}/lib -lkpathsea @@ -21,10 +21,10 @@ # CC=gcc # -CCFLAGS = -g -DPOSIX +#CCFLAGS = -g -DPOSIX #CCFLAGS = -O # SUN etc ... #CCFLAGS = -O -traditional -DPOSIX # 386bsd (gcc 1.X) -#CCFLAGS = -O -DPOSIX # Netbsd (gcc 2.X), Linux +CCFLAGS = -O -DPOSIX # Netbsd (gcc 2.X), Linux #CCFLAGS = -O -bsd # NeXT #CCFLAGS = -O -DMSDOS -DPOSIX # DJGCC (gcc 2.X) #CCFLAGS = -O -DSYSV # SysV @@ -81,7 +81,7 @@ install: install-dvi2dvi install-dvi2dvi: dvi2dvi - install -s -m 755 dvi2dvi ${BINAREA}/dvi2dvi + install -m 755 dvi2dvi ${BINAREA}/dvi2dvi install-lib: -mkdir ${DVI2LIB} --- dvi2dvi-2.0alpha.orig/bifont.c +++ dvi2dvi-2.0alpha/bifont.c @@ -7,6 +7,8 @@ #include "bifont.h" #include "jsub.h" #ifdef KPATHSEA +extern struct str_llist_elt *value; /* Forward declaration */ +#include #include #include #endif --- dvi2dvi-2.0alpha.orig/dvi2.c +++ dvi2dvi-2.0alpha/dvi2.c @@ -114,7 +114,7 @@ #endif G_progname = argv[0]; #ifdef KPATHSEA - kpse_set_progname(G_progname); + kpse_set_program_name(G_progname, NULL); #endif if ((dvi2path = getenv(DVI2PATHENV)) == NULL) #ifdef KPATHSEA --- dvi2dvi-2.0alpha.orig/fontdesc.c +++ dvi2dvi-2.0alpha/fontdesc.c @@ -800,7 +800,7 @@ n = inttob(k, len); \ off -= n+1; \ ds_buf[off] = XXX1+len/256; \ - strncpy(ds_buf+off+1, k, n); \ + strncpy(ds_buf+off+1, (char *) k, n); \ ds_p = ds_buf+off; \ ds_len = 1+n+len; --- dvi2dvi-2.0alpha.orig/lib-dist/configk +++ dvi2dvi-2.0alpha/lib-dist/configk @@ -1 +1 @@ -define tmf /usr/local/share/{texmf.local,texmf}/fonts +define tmf /usr/share/texmf/fonts --- dvi2dvi-2.0alpha.orig/lib-dist/fontsk/n2a +++ dvi2dvi-2.0alpha/lib-dist/fontsk/n2a @@ -4,4 +4,22 @@ # virtual font font jvf * 0 $tmf/vf//n2a/ # tfm used in the above vf (ASCII jfm, i.e. min10.tfm ...) -font jfm * 0 $tmf/tfm//ptex/ +font jfm * 0 $tmf/tfm//dvips/ + +# I know it's workaround, but it works for me... +replfont dm5 min5 10,f968307 +replfont dm6 min6 10,f968307 +replfont dm7 min7 10,f974321 +replfont dm8 min8 10,f947257 +replfont dm9 min9 10,f954274 +replfont dm10 min10 10,f959887 +replfont dm12 min10 10,f968307 +replfont dm20 min10 10,f959887 +replfont dg5 goth5 10,f959887 +replfont dg6 goth6 10,f968307 +replfont dg7 goth7 10,f974321 +replfont dg8 goth8 10,f947257 +replfont dg9 goth9 10,f954274 +replfont dg10 goth10 10,f959887 +replfont dg12 goth10 10,f968307 +replfont dg20 goth10 10,f959887 --- dvi2dvi-2.0alpha.orig/debian/copyright.ja +++ dvi2dvi-2.0alpha/debian/copyright.ja @@ -0,0 +1,7 @@ +桜井がcopyrightを持つ部分については、基本的にはソース +コードを付ければ改変自由になっていますが、改変したpackageの +配布については以下の条件を付けています。 + version名はまぎらわしくないものにする + (<数>だけからなるversion番号は使わない) +また、条件とはしませんが、改変内容を知らせて下さることを期待します。 +(特にbug fixの場合はぜひとも。) --- dvi2dvi-2.0alpha.orig/debian/compat +++ dvi2dvi-2.0alpha/debian/compat @@ -0,0 +1 @@ +4 --- dvi2dvi-2.0alpha.orig/debian/control +++ dvi2dvi-2.0alpha/debian/control @@ -0,0 +1,18 @@ +Source: dvi2dvi +Section: tex +Priority: optional +Maintainer: Masayuki Hatta (mhatta) +Build-Depends: debhelper (>> 4.0.0), libkpathsea-dev +Standards-Version: 3.7.3 + +Package: dvi2dvi +Architecture: any +Depends: ${shlibs:Depends} +Recommends: dvi2ps-fontdata-ja, dvi2ps-fontdata-n2a +Description: Tweak DVI files + dvi2dvi can: + - expand virtual fonts in given DVI files, + - change font names in given DVI files, + - decompose 2-byte fonts into 1-byte subfonts. + With dvi2dvi, you can convert DVI files generated by NTT jTeX to + those of ASCII pTeX, and vice versa. --- dvi2dvi-2.0alpha.orig/debian/copyright +++ dvi2dvi-2.0alpha/debian/copyright @@ -0,0 +1,42 @@ +This package was debianized by Masayuki Hatta on +Fri, 6 Jul 2001 16:44:37 +0900. + +It was downloaded from ftp://ftp.math.s.chiba-u.ac.jp/tex/ + +Upstream Author: Takafumi Sakurai + +Copyright: + +The following is the English translation of dvi2dvi license(based on +dvi2ps license provided by the same upstream author): + +All of the files included in this dvi2dvi release, with the exception +of files that include copyright notice in them, are covered by the +following copyright: + +Copyright (c) 1989-2001 Takafumi Sakurai. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must include source code, or + there must be a well-publicized means of obtaining the source + code for no more than a reasonable reproduction cost. +3. The package name of the modified software must not be ``dvi2dvi'' + or ``dvi2dvi-'' where is the version number. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +See also copyright.ja. --- dvi2dvi-2.0alpha.orig/debian/dirs +++ dvi2dvi-2.0alpha/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +etc/texmf/dvi2dvi + --- dvi2dvi-2.0alpha.orig/debian/dvi2dvi.1 +++ dvi2dvi-2.0alpha/debian/dvi2dvi.1 @@ -0,0 +1,89 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH DVI2DVI 1 "July 8, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +dvi2dvi \- Tweaks DVI files +.SH SYNOPSIS +.B dvi2dvi +.RI [ options ] " files" ... +.SH DESCRIPTION +This manual page documents briefly the +.B dvi2dvi +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +\fBdvi2dvi\fP is a program that can tweak DVI files - e.g. expands virtual fonts in given DVI files, changes font names in given DVI files, decomposes 2-byte fonts into 1-byte subfonts, and so on. The most common use of this program would be to translate DVI files generated by NTT jTeX to those of ASCII pTeX. +.SH OPTIONS +A summary of options is included below. +.TP +.B \-d +Enable debug output. +.TP +.B \-f num +Specify starting page number. +.TP +.B \-i file +Specify a PostScript prologue file. +.TP +.B \-l +Prohibit error logging. +.TP +.B \-m{0|h|1|2|3|4|5} or -m mag +Specify magnification. +.TP +.B \-n num +Specify how many copies to print. +.TP +.B \-o \fIcommand\fP +Specify a PostScript command to send. +.TP +.B \-q +Quiet operation. +.TP +.B \-r +Do not process pages in reverse order. +.TP +.B \-s file +Specify a PostScript setup file. +.TP +.B \-t num +Specify ending page number. +.TP +.B \-w +Do not show warnings. +.TP +.B \-D var=val +Define a variable. +.TP +.B \-F fontdesc +Specify fontdesc file you want to use. +.TP +.B \-K +Remove comments from included PS files. +.TP +.B \-L +Truncate file name to 8 characters. +.TP +.B \-R resolution +Specify different resolution. +.TP +.B \-S +Show some statistics. +.br +.SH AUTHOR +This manual page was written by Masayuki Hatta , +for the Debian GNU/Linux system (but may be used by others). --- dvi2dvi-2.0alpha.orig/debian/links +++ dvi2dvi-2.0alpha/debian/links @@ -0,0 +1 @@ +/etc/texmf/dvi2dvi/n2a etc/texmf/dvi2dvi/fontdesc --- dvi2dvi-2.0alpha.orig/debian/docs +++ dvi2dvi-2.0alpha/debian/docs @@ -0,0 +1,5 @@ +README +doc/bugs.doc +doc/dvi2dvi.doc +doc/install.doc +doc/lib.doc --- dvi2dvi-2.0alpha.orig/debian/changelog +++ dvi2dvi-2.0alpha/debian/changelog @@ -0,0 +1,112 @@ +dvi2dvi (2.0alpha-9.2) unstable; urgency=low + + * Non-maintainer upload. + * Use kpse_set_progname instead of kpse_set_program_name (closes: #666172). + Thanks to Adam D. Barratt for the bug report. + + -- Jakub Wilk Thu, 26 Apr 2012 01:23:34 +0200 + +dvi2dvi (2.0alpha-9.1) unstable; urgency=low + + [Jari Aalto] + * Non-maintainer upload. + * bifont.c, funcfont.c, kpse.c + - Fix include error: expected specifier-qualifier-list + before str_llist_type (RC bug FTBFS serious; Closes: #562291). + + -- Jari Aalto Fri, 26 Mar 2010 20:40:59 +0200 + +dvi2dvi (2.0alpha-9) unstable; urgency=low + + * Bumped to Standards-Version: 3.7.3. + * Fixed various lintian warnings. + + -- Masayuki Hatta (mhatta) Thu, 06 Dec 2007 20:37:26 +0900 + +dvi2dvi (2.0alpha-8) unstable; urgency=low + + * Do not invoke install -s in Makefile, now DEB_BUILD_OPTIONS=nostrip works - closes: #436777 + + -- Masayuki Hatta (mhatta) Tue, 04 Dec 2007 21:12:05 +0900 + +dvi2dvi (2.0alpha-7) unstable; urgency=low + + * Bumped to Standards-Version: 3.7.2. + + -- Masayuki Hatta (mhatta) Fri, 13 Oct 2006 22:43:32 +0900 + +dvi2dvi (2.0alpha-6) unstable; urgency=low + + * Maintainer upload. + * Bumped Standards-Version: 3.6.2.1 (no physical changes). + * Acknowledged NMU, thanks Roger - closes: #285646 + + -- Masayuki Hatta (mhatta) Thu, 18 Aug 2005 04:22:53 +0900 + +dvi2dvi (2.0alpha-5.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/rules: Add "-DSYSV -DANSI" to CCFLAGS when building, to fix + GCC 4.0 build errors due to old K&R C syntax (Closes: #285646). + * decompfont.c, fontdesc.c: Cast "unsigned char *" to "char *" to + eliminate a number of compiler warnings when performing string + operations on the "byte" data type. + + -- Roger Leigh Wed, 20 Jul 2005 19:40:53 +0100 + +dvi2dvi (2.0alpha-5) unstable; urgency=low + + * Fixed a build problem with gcc-3.4, thanks Andreas - closes: #258629 + * Now uses dh_link to make the fontdesc symlink. + + -- Masayuki Hatta (mhatta) Fri, 20 Aug 2004 12:12:48 +0900 + +dvi2dvi (2.0alpha-4) unstable; urgency=low + + * [control] changed Maintainer field. + * Bumped to Standards-Version: 3.6.1. + + -- Masayuki Hatta (mhatta) Sat, 14 Feb 2004 17:06:17 +0900 + +dvi2dvi (2.0alpha-3) unstable; urgency=low + + * kpathsea/c-auto.h should be included before kpathsea/tex-file.h, thanks Matt - closes: #208661 + + -- Masayuki Hatta Sun, 14 Sep 2003 21:23:39 +0900 + +dvi2dvi (2.0alpha-2) unstable; urgency=low + + * Rebuilt with the latest libkpathsea - closes: #134671 + + -- Masayuki Hatta Tue, 19 Feb 2002 13:36:20 +0900 + +dvi2dvi (2.0alpha-1) unstable; urgency=low + + * Initial relase for Debian Project - Closes: #103882 + * Re-packaged. + * New upstream release. + * Moved /usr/share/texmf/dvi2dvi to /etc/texmf/dvi2dvi. + + -- Masayuki Hatta Fri, 6 Jul 2001 16:44:37 +0900 + +dvi2dvi (1.01-3) unstable-jp; urgency=low + + * moved /usr/lib/texmf to /usr/share/texmf. + + -- Hayao Nakahara Wed, 7 Apr 1999 19:51:34 +0900 + +dvi2dvi (1.01-2) frozen-jp unstable-jp; urgency=low + + * added copyright.ujis (fixed bug #JP/320) + + -- Hayao Nakahara Tue, 9 Jun 1998 18:43:29 +0900 + +dvi2dvi (1.01-1) unstable; urgency=low + + * Initial Release. + + -- Hayao Nakahara Tue, 2 Jun 1998 11:51:08 +0900 + +Local variables: +mode: debian-changelog +End: --- dvi2dvi-2.0alpha.orig/debian/README.Debian +++ dvi2dvi-2.0alpha/debian/README.Debian @@ -0,0 +1,8 @@ +dvi2dvi for Debian +------------------ + +o fontdesc files are now placed in /etc/texmf/dvi2dvi/. +o Default fontdesc (/etc/texmf/dvi2dvi/fontdesc) is symlinked to n2a. +o Only tested on n2a. + + -- Masayuki Hatta , Fri, 6 Jul 2001 16:44:37 +0900 --- dvi2dvi-2.0alpha.orig/debian/rules +++ dvi2dvi-2.0alpha/debian/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) CCFLAGS='-O -DPOSIX -DSYSV -DANSI' + $(MAKE) newlib + #/usr/bin/docbook-to-man debian/dvi2dvi.sgml > dvi2dvi.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) clean + rm -rf lib + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/dvi2dvi. + $(MAKE) install DESTDIR=$(CURDIR)/debian/dvi2dvi + $(MAKE) install-lib DESTDIR=$(CURDIR)/debian/dvi2dvi + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs +# dh_installexamples +# dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron + dh_installman debian/dvi2dvi.1 +# dh_installinfo +# dh_undocumented dvi2dvi.1 + dh_installchangelogs doc/changes.doc + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure