[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#689579: unblock: dvi2ps-fontdesc-morisawa5/0.5



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package dvi2ps-fontdesc-morisawa5

This version fixes the grave bug#688253 i.e. unistallable 
in sid.
Basically, it is a dependency problem and we need to change 
dependency from obsolete vfdata-morisawa5 to texlive-lang-cjk.

Also because of this change, the package should be modified to
use TFM and/or VF files of texlive-lang-cjk so I did it too.

So debdiff output:
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/debian/changelog dvi2ps-fontdesc-morisawa5-0.5/debian/changelog
--- dvi2ps-fontdesc-morisawa5-0.4/debian/changelog	2008-07-23 11:20:11.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/debian/changelog	2012-10-04 09:34:58.000000000 +0900
@@ -1,3 +1,15 @@
+dvi2ps-fontdesc-morisawa5 (0.5) unstable; urgency=low
+
+  * Modify to be compatible with new TeXLive2012 environment.
+    So we can't use the package with vfdata-morisawa5 anymore and we removed
+    vfdata-morisawa5 from Depends field.
+  * Fix a control file so that this is installable.  Thanks to Andreas Beckmann
+    <debian AT abeckmann.de> and Colin Watson <cjwatson AT ubuntu.com>.
+    (Closes: #688253)
+  * To erase lintian warnings, we refine debian/rules a bit.
+
+ -- Atsuhito KOHDA <kohda@debian.org>  Wed, 03 Oct 2012 14:29:25 +0900
+
 dvi2ps-fontdesc-morisawa5 (0.4) unstable; urgency=low
 
   * Renamed fontdesc file bikan-morisawa (to bikan-morisawa5) to avoid 
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/debian/compat dvi2ps-fontdesc-morisawa5-0.5/debian/compat
--- dvi2ps-fontdesc-morisawa5-0.4/debian/compat	2008-05-29 17:24:21.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/debian/compat	2012-10-03 14:47:06.000000000 +0900
@@ -1 +1 @@
-4
+6
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/debian/control dvi2ps-fontdesc-morisawa5-0.5/debian/control
--- dvi2ps-fontdesc-morisawa5-0.4/debian/control	2008-05-29 17:31:02.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/debian/control	2012-10-03 16:44:14.000000000 +0900
@@ -7,7 +7,7 @@
 
 Package: dvi2ps-fontdesc-morisawa5
 Architecture: all
-Depends: dvi2ps (>= 4.1j), vfdata-morisawa5 (> 0.0.20020122-12)
+Depends: ${misc:Depends}, dvi2ps (>= 5.1j), texlive-lang-cjk
 Recommends: ptex-bin, okumura-clsfiles
 Description: fontdesc files of dvi2ps for Morisawa Basic-5 type faces
  You can convert DVI file with Morisawa Basic-5 type faces of vfdata-morisawa5
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/debian/copyright dvi2ps-fontdesc-morisawa5-0.5/debian/copyright
--- dvi2ps-fontdesc-morisawa5-0.4/debian/copyright	2008-05-29 17:31:02.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/debian/copyright	2012-10-03 16:44:14.000000000 +0900
@@ -7,6 +7,3 @@
 ftp://ftp.math.s.chiba-u.ac.jp/tex
 
 and dvi2ps is in main (i.e. DFSG-compliant) so this package goes in main.
-
-Note vfdata-morisawa5, on which this package depends, changed license to 
-the modified BSD.
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/debian/dirs dvi2ps-fontdesc-morisawa5-0.5/debian/dirs
--- dvi2ps-fontdesc-morisawa5-0.4/debian/dirs	2003-02-14 12:00:17.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/debian/dirs	2012-10-03 14:55:48.000000000 +0900
@@ -1,2 +1,2 @@
-usr/share/texmf/dvi2ps
+usr/lib/dvi2ps
 etc/texmf/dvi2ps
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/debian/rules dvi2ps-fontdesc-morisawa5-0.5/debian/rules
--- dvi2ps-fontdesc-morisawa5-0.4/debian/rules	2008-07-23 11:23:50.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/debian/rules	2012-10-03 16:40:08.000000000 +0900
@@ -8,7 +8,7 @@
 # This is the debhelper compatability version to use.
 
 PACK=dvi2ps-fontdesc-morisawa5
-TXMF=/usr/share/texmf
+TXMF=/usr/lib
 INSTDIR=$(CURDIR)/debian/$(PACK)$(TXMF)/dvi2ps
 ETCDIR=$(CURDIR)/debian/$(PACK)/etc/texmf/dvi2ps
 
@@ -19,7 +19,9 @@
 
 	touch configure-stamp
 
-build: configure-stamp build-stamp
+build: build-arch build-indep
+build-arch: configure-stamp build-stamp
+build-indep: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/fontsk/asc-morisawa5 dvi2ps-fontdesc-morisawa5-0.5/fontsk/asc-morisawa5
--- dvi2ps-fontdesc-morisawa5-0.4/fontsk/asc-morisawa5	2008-07-23 11:31:59.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/fontsk/asc-morisawa5	2012-10-03 16:09:32.000000000 +0900
@@ -1,6 +1,6 @@
 # built-in morisawa fonts for pTeX / ASCII Nihongo TeX
 # First, convert pTeX dvi -> built-in kanji dvi by virtual font
-font	jvf	* 0	$tmf/vf/ascii-mor5/%f.vf
-#font	jvf	* 0	a2$bk-%f
+font	jvf	* 0	$texl/vf/ptex/morisawa/%f.vf
+#font	jvf	* 0	$texl/vf/morisawa/%f.vf
 # then, use built-in kanji
 fontdesc	bikan-$extra
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/fontsk/bikan-morisawa5 dvi2ps-fontdesc-morisawa5-0.5/fontsk/bikan-morisawa5
--- dvi2ps-fontdesc-morisawa5-0.4/fontsk/bikan-morisawa5	2008-05-29 14:25:37.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/fontsk/bikan-morisawa5	2012-10-03 16:32:07.000000000 +0900
@@ -1,6 +1,6 @@
-# built-in morisawa fonts (of vfdata-morisawa5)
-font	jfm	* 0	$tmf/tfm/morisawa//
-#font	jfm	* 0	%f
+# built-in morisawa fonts (of texlive-lang/cjk(former vfdata-morisawa5))
+#font	jfm	* 0	$texl/tfm/ptex/morisawa/
+font	jfm	* 0	$texl/tfm/ptex/dvips/
 # vfdata-morisawa5
 map	ryumin-l	JSNR	Ryumin-Light-H
 map	ryumin-l-v	JSNR	Ryumin-Light-V
diff -Nru dvi2ps-fontdesc-morisawa5-0.4/morisawa dvi2ps-fontdesc-morisawa5-0.5/morisawa
--- dvi2ps-fontdesc-morisawa5-0.4/morisawa	2008-07-23 12:09:08.000000000 +0900
+++ dvi2ps-fontdesc-morisawa5-0.5/morisawa	2012-10-04 09:26:41.000000000 +0900
@@ -6,15 +6,10 @@
 #
 # predefined fontdesc files for printers are
 # LW16, LWII, PS200, PS360, PS400, PS600, PS720, RichoSP10, SPARC.
-#fontdesc	printer/PS600
-#
-resolution	600
-define	mode	ljfour
-#define	bk	mor2
+# In Debian, LW16 is used by default.
+# TeXLive 2012 uses /usr/share/texlive/texmf-dist so defined "texl"
 define	extra	morisawa5
-
-fontdesc	config$kpse
-fontdesc	header
+define	texl	/usr/share/texlive/texmf-dist/fonts
 
 ##########################################################################
 #
@@ -24,8 +19,7 @@
 #
 #	pTeX / ASCII jtex
 #
-##fontdesc	fonts$kpse/a2n
-##fontdesc	fonts$kpse/asc-vflkanji
+#fontdesc	fonts$kpse/ntt-bikanji
 fontdesc	fonts$kpse/asc-bikanji
 
 ##########################################################################
@@ -33,9 +27,9 @@
 # font selection
 #
 # you need to install tetex-extra for the next two settings to work.
-# if you want to use BlueSky postscript cm fonts, uncomment the next line.
-#fontdesc	fonts$kpse/fonts-t1
-# if you want to use PSNFSS fonts, uncomment out the next line.
-#fontdesc	fonts$kpse/psfonts
+# if you don't want to use BlueSky postscript cm fonts, comment the next line.
+fontdesc	fonts$kpse/fonts-t1
+# use PSNFSS fonts
+fontdesc	fonts$kpse/psfonts
 fontdesc	fonts$kpse/fonts-bitmap
 fontdesc	fonts$kpse/generate


unblock dvi2ps-fontdesc-morisawa5/0.5

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


Reply to: