[Debian-tex-commits] SVN CJK commit + diffs: r5430 - in latex-cjk-japanese-wadalab/trunk/debian: . patches
Danai Sae-Han
danai at alioth.debian.org
Tue May 1 22:29:37 UTC 2012
Author: danai
Date: 2012-05-01 22:29:37 +0000 (Tue, 01 May 2012)
New Revision: 5430
Added:
latex-cjk-japanese-wadalab/trunk/debian/patches/01-fix-wftodm.patch
latex-cjk-japanese-wadalab/trunk/debian/patches/02-automate-makefont.patch
latex-cjk-japanese-wadalab/trunk/debian/patches/03-automate-fixwada.patch
Removed:
latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch
latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch
latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch
Modified:
latex-cjk-japanese-wadalab/trunk/debian/changelog
latex-cjk-japanese-wadalab/trunk/debian/compat
latex-cjk-japanese-wadalab/trunk/debian/control
latex-cjk-japanese-wadalab/trunk/debian/copyright
latex-cjk-japanese-wadalab/trunk/debian/patches/series
latex-cjk-japanese-wadalab/trunk/debian/rules
Log:
Apply patch by Jari Aalto.
Modified: latex-cjk-japanese-wadalab/trunk/debian/changelog
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/changelog 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/changelog 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1,3 +1,26 @@
+latex-cjk-japanese-wadalab (0.20050817-17) UNRELEASED; urgency=low
+
+ * The "Thank you" release.
+ * Kudos to Norbert to get this package working with TL2012.
+ * Bug fix: "[PATCH] latex-cjk-japanese-wadalab: Helping to update to
+ Copyright format 1.0", thanks to Jari Aalto <jari.aalto at cante.net>
+ (Closes: #670800).
+ - [copyright]
+ - migrate to Copyright Format 1.0;
+ - [compat]
+ - bump up the Debian compatibility to v9;
+ - [patches/]
+ - add DEP-3 headers;
+ - change to standard *.patch suffix and (-) in file names;
+ - [rules]
+ - replace deprecated dh_prep and use dh_prep.
+
+ * Bug fix: "misuses dpkg --compare-versions", thanks to Jonathan Nieder
+ (Closes: #624726). [TODO]
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624726
+
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org> Tue, 01 May 2012 23:12:26 +0200
+
latex-cjk-japanese-wadalab (0.20050817-16) unstable; urgency=low
* debian/control: add Danai and myself to uploaders
Modified: latex-cjk-japanese-wadalab/trunk/debian/compat
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/compat 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/compat 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1 +1 @@
-7
+9
Modified: latex-cjk-japanese-wadalab/trunk/debian/control
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/control 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/control 2012-05-01 22:29:37 UTC (rev 5430)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian TeX maintainers <debian-tex-maint at lists.debian.org>
Uploaders: Danai SAE-HAN (韓達耐) <danai at debian.org>, Norbert Preining <preining at debian.org>
-Build-Depends: debhelper (>= 8.1.0~), tex-common (>= 3)
+Build-Depends: debhelper (>= 9), tex-common (>= 3)
Build-Depends-Indep: t1utils, texlive-font-utils, perl-base (>= 5.8.0)
Standards-Version: 3.9.3
Vcs-Svn: svn://svn.debian.org/svn/debian-tex/latex-cjk-japanese-wadalab/trunk
Modified: latex-cjk-japanese-wadalab/trunk/debian/copyright
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/copyright 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/copyright 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1,40 +1,67 @@
-This package was debianized by Danai Sae-Han (韓達耐) <danai.sae-han at edpnet.be> on
-Sun, 14 Aug 2005 15:42:30 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Name: latex-cjk-japanese-wadalab
+Upstream-Contact: Tetsuro TANAKA <ktanaka at tanaka.ecc.u-tokyo.ac.jp>
+Source: None
+X-Upstream-Comment:
+ 2012-04-29 Upstream URL no longer exists at
+ ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/
+
+Files: *
+Copyright: 1994, Tetsuro TANAKA <ktanaka at tanaka.ecc.u-tokyo.ac.jp>
+License: Custom
-It was downloaded from <ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/>
-The debian/ package is released under the GNU General Public
-License version 2 or higher.
+Files: build/*.pl
+Copyright: 1994-2008, Werner Lemberg <wl at gnu.org>
+License: GPL-2+
-Upstream Author: Tetsuro TANAKA <ktanaka at tanaka.ecc.u-tokyo.ac.jp>
+Files: debian/*
+Copyright: 2012, Norbert Preining <preining at debian.org>
+ 2012, Jari Aalto <jari.aalto at cante.net>
+ 2005-2012, Danai Sae-Han (韓達耐) <danai at debian.org>
+License: GPL-2+
-Copyright:
-
- Copyright (1994) Tetsuro TANAKA <ktanaka at tanaka.ecc.u-tokyo.ac.jp>
-
-(copied from Taketoshi Sano <sano at debian.org>'s gsfonts-wadalab-mincho
-Debian package)
-
- (official text is written in Japanese. This is a rough
- translation by me. For detail evaluation, please read
- <ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/README.nihongo>.
- I've contacted the upstream maintainer and he replied that
- the License in Japanese is applicable world-wide.)
-
- ---
-
-You can use/modify/distribute this font as long as:
-
- 1) add a note which explains that the distributed fonts
- are derived from wadalab fonts which is distributed
- at ftp.ipl.t.u-tokyo.ac.jp
-
- 2) if the redistribution is the modified one from the original
- font archives, then provide some documentations which explain
- the changes/modifications from the original font archives.
-
-These conditions are to inform users about where they
-can get the most updated font from, because we plan
-to update it.
-
-If you find the badly designed glyphs, or wrong kanji
-characters, please contact at tanaka at ipl.t.u-tokyo.ac.jp
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in "/usr/share/common-licenses/GPL-2".
+
+License: Custom
+ [copied from Taketoshi Sano <sano at debian.org>'s gsfonts-wadalab-minchoa
+ Debian package]
+ .
+ (official text is written in Japanese. This is a rough
+ translation by Danai Sae-Han. For detail evaluation, please read
+ <ftp://ftp.dante.de/pub/tex/support/ghostscript/3rdparty/fonts/kanji/README.nihongo>.
+ I've contacted the upstream maintainer and he replied that
+ the License in Japanese is applicable world-wide.)
+ .
+ ---
+ .
+ You can use/modify/distribute this font as long as:
+ .
+ 1) add a note which explains that the distributed fonts
+ are derived from wadalab fonts which is distributed
+ at ftp.ipl.t.u-tokyo.ac.jp
+ .
+ 2) if the redistribution is the modified one from the original
+ font archives, then provide some documentations which explain
+ the changes/modifications from the original font archives.
+ .
+ These conditions are to inform users about where they
+ can get the most updated font from, because we plan
+ to update it.
+ .
+ If you find the badly designed glyphs, or wrong kanji
+ characters, please contact at tanaka at ipl.t.u-tokyo.ac.jp
Copied: latex-cjk-japanese-wadalab/trunk/debian/patches/01-fix-wftodm.patch (from rev 5429, latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch)
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/01-fix-wftodm.patch (rev 0)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/01-fix-wftodm.patch 2012-05-01 22:29:37 UTC (rev 5430)
@@ -0,0 +1,46 @@
+From: Werner Lemberg (author of the CJK macro for LaTeX)
+Subject: enable partial font downloading
+ - It also contains a fix to set just one directory as argument instead
+ of two, without exiting with a 0300 code.
+ - And last but not least it fixes a segfault on Debian AMD64:
+ it needs <time.h> instead of <sys/time.h>.
+
+--- latex-cjk-japanese-wadalab-0.20050817.orig/wftodm.c 2005-08-14 22:33:23.000000000 +0900
++++ latex-cjk-japanese-wadalab-0.20050817/wftodm.c 2012-03-23 18:21:26.000000000 +0900
+@@ -1,6 +1,8 @@
+ #include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+-#include <sys/time.h>
++#include <time.h>
+ char *charstrs[34][256];
+ int charlens[34][256];
+ char *version_str="001.001";
+@@ -157,6 +159,7 @@
+ output_afm(i);
+ }
+ }
++return 0;
+ }
+ output_afm(file)
+ {
+@@ -209,14 +212,13 @@
+ fprintf(ofp,"/UnderlineThickness 0 def\n");
+ fprintf(ofp,"end readonly def\n");
+ fprintf(ofp,"/FontName /%s def\n",fontname);
+- fprintf(ofp,"/DmEncoding [\n");
++ fprintf(ofp,"/Encoding 256 array\n");
++ fprintf(ofp,"0 1 255 {1 index exch /.notdef put} for\n");
+ for(i=0;i<16;i++){
+ for(j=0;j<16;j++)
+- fprintf(ofp," /c%02X",i*16+j);
+- putc('\n',ofp);
++ fprintf(ofp,"dup %d /c%02X put\n",i*16+j,i*16+j);
+ }
+- fprintf(ofp,"] readonly def\n");
+- fprintf(ofp,"/Encoding DmEncoding def\n");
++ fprintf(ofp,"readonly def\n");
+ fprintf(ofp,"/PaintType 0 def\n");
+ fprintf(ofp,"/FontType 1 def\n");
+ fprintf(ofp,"/FontMatrix [.001 0 0 .001 0 -0.16] readonly def\n");
Deleted: latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1,55 +0,0 @@
-01_fix_wftodm.dpatch by <danai.sae-han at edpnet.be>
-
-This fix is from Werner Lemberg (author of the CJK macro for LaTeX).
-It modifies wftodm to enable partial font downloading.
-It also contains a fix to set just one directory as argument instead
-of two, without exiting with a 0300 code.
-And last but not least it fixes a segfault on Debian AMD64:
-it needs <time.h> instead of <sys/time.h>.
-
-
----
- wftodm.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-Index: latex-cjk-japanese-wadalab-0.20050817/wftodm.c
-===================================================================
---- latex-cjk-japanese-wadalab-0.20050817.orig/wftodm.c 2005-08-14 22:33:23.000000000 +0900
-+++ latex-cjk-japanese-wadalab-0.20050817/wftodm.c 2012-03-23 18:21:26.000000000 +0900
-@@ -1,6 +1,8 @@
- #include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
- #include <sys/types.h>
--#include <sys/time.h>
-+#include <time.h>
- char *charstrs[34][256];
- int charlens[34][256];
- char *version_str="001.001";
-@@ -157,6 +159,7 @@
- output_afm(i);
- }
- }
-+return 0;
- }
- output_afm(file)
- {
-@@ -209,14 +212,13 @@
- fprintf(ofp,"/UnderlineThickness 0 def\n");
- fprintf(ofp,"end readonly def\n");
- fprintf(ofp,"/FontName /%s def\n",fontname);
-- fprintf(ofp,"/DmEncoding [\n");
-+ fprintf(ofp,"/Encoding 256 array\n");
-+ fprintf(ofp,"0 1 255 {1 index exch /.notdef put} for\n");
- for(i=0;i<16;i++){
- for(j=0;j<16;j++)
-- fprintf(ofp," /c%02X",i*16+j);
-- putc('\n',ofp);
-+ fprintf(ofp,"dup %d /c%02X put\n",i*16+j,i*16+j);
- }
-- fprintf(ofp,"] readonly def\n");
-- fprintf(ofp,"/Encoding DmEncoding def\n");
-+ fprintf(ofp,"readonly def\n");
- fprintf(ofp,"/PaintType 0 def\n");
- fprintf(ofp,"/FontType 1 def\n");
- fprintf(ofp,"/FontMatrix [.001 0 0 .001 0 -0.16] readonly def\n");
Copied: latex-cjk-japanese-wadalab/trunk/debian/patches/02-automate-makefont.patch (from rev 5429, latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch)
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/02-automate-makefont.patch (rev 0)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/02-automate-makefont.patch 2012-05-01 22:29:37 UTC (rev 5430)
@@ -0,0 +1,34 @@
+From: <danai.sae-han at edpnet.be>
+Subject: Add -f to the mv and rm commands
+
+--- ./debian/makefont.orig 2005-08-14 23:49:34.000000000 +0200
++++ ./debian/makefont 2005-08-14 23:50:23.000000000 +0200
+@@ -66,16 +66,16 @@
+ print
+ }
+ ' > $name.asm
+- rm $name.old
++ rm -f $name.old
+
+ t1asm < $name.asm > $name.pfb
+- rm $name.asm
++ rm -f $name.asm
+ done
+
+ for f in `find . -name '*.afm' -print`; do
+ echo processing $f
+ name=`basename $f .afm`
+- mv $name.afm $name.old
++ mv -f $name.afm $name.old
+
+ cat $name.old | \
+ sed -e "
+@@ -83,7 +83,7 @@
+ s/B 0 0 1000 1000/B 0 -160 1000 840/
+ " > $name.afm
+
+- rm $name.old
++ rm -f $name.old
+
+ afm2tfm $name.afm &> /dev/null
+ done
Deleted: latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1,35 +0,0 @@
-02_automate_makefont.dpatch by <danai.sae-han at edpnet.be>
-
-Add -f to the mv and rm commands.
-
---- ./debian/makefont.orig 2005-08-14 23:49:34.000000000 +0200
-+++ ./debian/makefont 2005-08-14 23:50:23.000000000 +0200
-@@ -66,16 +66,16 @@
- print
- }
- ' > $name.asm
-- rm $name.old
-+ rm -f $name.old
-
- t1asm < $name.asm > $name.pfb
-- rm $name.asm
-+ rm -f $name.asm
- done
-
- for f in `find . -name '*.afm' -print`; do
- echo processing $f
- name=`basename $f .afm`
-- mv $name.afm $name.old
-+ mv -f $name.afm $name.old
-
- cat $name.old | \
- sed -e "
-@@ -83,7 +83,7 @@
- s/B 0 0 1000 1000/B 0 -160 1000 840/
- " > $name.afm
-
-- rm $name.old
-+ rm -f $name.old
-
- afm2tfm $name.afm &> /dev/null
- done
Copied: latex-cjk-japanese-wadalab/trunk/debian/patches/03-automate-fixwada.patch (from rev 5429, latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch)
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/03-automate-fixwada.patch (rev 0)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/03-automate-fixwada.patch 2012-05-01 22:29:37 UTC (rev 5430)
@@ -0,0 +1,21 @@
+From: <danai.sae-han at edpnet.be>
+Subject: Add -f to rm and mv
+
+--- ./debian/fixwada.orig 2005-08-14 23:57:29.000000000 +0200
++++ ./debian/fixwada 2005-08-14 23:57:43.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ for i in *.pfb; do
+ echo $i
+- mv $i $i.old
++ mv -f $i $i.old
+ cat $i.old | \
+ t1disasm | \
+ awk '
+@@ -59,5 +59,5 @@
+ }
+ ' | \
+ t1asm > $i
+- rm $i.old
++ rm -f $i.old
+ done
Deleted: latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1,22 +0,0 @@
-03_automate_fixwada.dpatch by <danai.sae-han at edpnet.be>
-
-Add -f to rm and mv.
-
---- ./debian/fixwada.orig 2005-08-14 23:57:29.000000000 +0200
-+++ ./debian/fixwada 2005-08-14 23:57:43.000000000 +0200
-@@ -5,7 +5,7 @@
-
- for i in *.pfb; do
- echo $i
-- mv $i $i.old
-+ mv -f $i $i.old
- cat $i.old | \
- t1disasm | \
- awk '
-@@ -59,5 +59,5 @@
- }
- ' | \
- t1asm > $i
-- rm $i.old
-+ rm -f $i.old
- done
Modified: latex-cjk-japanese-wadalab/trunk/debian/patches/series
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/series 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/series 2012-05-01 22:29:37 UTC (rev 5430)
@@ -1,3 +1,4 @@
-01_fix_wftodm.dpatch
-#02_automate_makefont.dpatch
-#03_automate_fixwada.dpatch
+01-fix-wftodm.patch
+#02-automate-makefont.patch
+#03-automate-fixwada.patch
+
Modified: latex-cjk-japanese-wadalab/trunk/debian/rules
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/rules 2012-05-01 20:52:50 UTC (rev 5429)
+++ latex-cjk-japanese-wadalab/trunk/debian/rules 2012-05-01 22:29:37 UTC (rev 5430)
@@ -104,7 +104,7 @@
install:
dh_testdir
dh_testroot
-# dh_clean -k
+# dh_prep
dh_installdirs
More information about the Debian-tex-commits
mailing list