[Debian-tex-commits] SVN CJK commit + diffs: r5275 - in latex-cjk-japanese-wadalab/trunk/debian: . patches source
Norbert Preining
preining at alioth.debian.org
Fri Mar 23 18:04:24 UTC 2012
Author: preining
Date: 2012-03-23 18:04:23 +0000 (Fri, 23 Mar 2012)
New Revision: 5275
Added:
latex-cjk-japanese-wadalab/trunk/debian/patches/series
latex-cjk-japanese-wadalab/trunk/debian/source/
latex-cjk-japanese-wadalab/trunk/debian/source/format
Removed:
latex-cjk-japanese-wadalab/trunk/debian/patches/00list
Modified:
latex-cjk-japanese-wadalab/trunk/debian/changelog
latex-cjk-japanese-wadalab/trunk/debian/control
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
latex-cjk-japanese-wadalab/trunk/debian/rules
Log:
latex-cjk-japanese-wadalab
* convert to source format 3.0 (quilt):
. rename debian/patches/00list to debian/patches/series
. remove dpatch dep in debian/control
. add debian/source/format
. remove any appearance of *patch* in debian/rules
* debian/rules:
. add targets for build-arch and build-indep
. make a separate unpack target
. make sure that we break building if fonts cannot be build
(was shadowed by echo)
. some cleanup
Modified: latex-cjk-japanese-wadalab/trunk/debian/changelog
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/changelog 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/changelog 2012-03-23 18:04:23 UTC (rev 5275)
@@ -6,8 +6,19 @@
* fix broken maintainer field in debian/control
* fix other lintian warnings
* bump standards to 3.9.3, no changes necessary
+ * convert to source format 3.0 (quilt):
+ . rename debian/patches/00list to debian/patches/series
+ . remove dpatch dep in debian/control
+ . add debian/source/format
+ . remove any appearance of *patch* in debian/rules
+ * debian/rules:
+ . add targets for build-arch and build-indep
+ . make a separate unpack target
+ . make sure that we break building if fonts cannot be build
+ (was shadowed by echo)
+ . some cleanup
- -- Norbert Preining <preining at debian.org> Thu, 22 Mar 2012 18:34:02 +0900
+ -- Norbert Preining <preining at debian.org> Fri, 23 Mar 2012 17:54:48 +0900
latex-cjk-japanese-wadalab (0.20050817-15) unstable; urgency=low
Modified: latex-cjk-japanese-wadalab/trunk/debian/control
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/control 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/control 2012-03-23 18:04:23 UTC (rev 5275)
@@ -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~), dpatch (>= 2.0.14), tex-common (>= 3)
+Build-Depends: debhelper (>= 8.1.0~), 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
Deleted: latex-cjk-japanese-wadalab/trunk/debian/patches/00list
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/00list 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/00list 2012-03-23 18:04:23 UTC (rev 5275)
@@ -1,3 +0,0 @@
-01_fix_wftodm.dpatch
-#02_automate_makefont.dpatch
-#03_automate_fixwada.dpatch
Modified: latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/01_fix_wftodm.dpatch 2012-03-23 18:04:23 UTC (rev 5275)
@@ -1,19 +1,22 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_wftodm.dpatch by <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This fix is from Werner Lemberg (author of the CJK macro for LaTeX).
-## DP: It modifies wftodm to enable partial font downloading.
-## DP: It also contains a fix to set just one directory as argument instead
-## DP: of two, without exiting with a 0300 code.
-## DP: And last but not least it fixes a segfault on Debian AMD64:
-## DP: it needs <time.h> instead of <sys/time.h>.
+01_fix_wftodm.dpatch by <danai.sae-han at edpnet.be>
- at DPATCH@
+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-orig2.c Tue Sep 23 22:45:32 1997
-+++ ./wftodm.c Tue Aug 25 13:13:09 1998
-@@ -1,4 +1,6 @@
+
+---
+ 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>
@@ -21,12 +24,16 @@
-#include <sys/time.h>
+#include <time.h>
char *charstrs[34][256];
-@@ -158,4 +160,5 @@
+ 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");
Modified: latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/02_automate_makefont.dpatch 2012-03-23 18:04:23 UTC (rev 5275)
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_automate_makefont.dpatch by <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add -f to the mv and rm commands.
+02_automate_makefont.dpatch by <danai.sae-han at edpnet.be>
- at DPATCH@
+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
Modified: latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/03_automate_fixwada.dpatch 2012-03-23 18:04:23 UTC (rev 5275)
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_automate_fixwada.dpatch by <danai.sae-han at edpnet.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add -f to rm and mv.
+03_automate_fixwada.dpatch by <danai.sae-han at edpnet.be>
- at DPATCH@
+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
Copied: latex-cjk-japanese-wadalab/trunk/debian/patches/series (from rev 5218, latex-cjk-japanese-wadalab/trunk/debian/patches/00list)
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/patches/series (rev 0)
+++ latex-cjk-japanese-wadalab/trunk/debian/patches/series 2012-03-23 18:04:23 UTC (rev 5275)
@@ -0,0 +1,3 @@
+01_fix_wftodm.dpatch
+#02_automate_makefont.dpatch
+#03_automate_fixwada.dpatch
Modified: latex-cjk-japanese-wadalab/trunk/debian/rules
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/rules 2012-03-23 18:03:41 UTC (rev 5274)
+++ latex-cjk-japanese-wadalab/trunk/debian/rules 2012-03-23 18:04:23 UTC (rev 5275)
@@ -33,16 +33,24 @@
wftodm: $(wftodm_namestems)
$(wftodm_namestems): abbrev = $(patsubst wftodm.%,%,$@)
-$(wftodm_namestems):
+$(wftodm_namestems): unpack
@echo Create .afm and .pfa fonts from $(abbrev).
@cd build &&\
- $(wftodm) -FontBase $(abbrev) $(dirs) || \
- echo "$(wftodm) -FontBase $(abbrev) $(dirs)" failed miserably.
+ if ! $(wftodm) -FontBase $(abbrev) $(dirs) ; then \
+ echo "$(wftodm) -FontBase $(abbrev) $(dirs)" failed miserably. ; \
+ exit 1 ; fi
@echo
-build: build-stamp wftodm makefont fixwada makeuniwada
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp: wftodm makefont fixwada makeuniwada
touch build-stamp
-build-stamp: patch
+
+unpack: unpack-stamp
+
+unpack-stamp:
dh_testdir
mkdir build
@@ -57,22 +65,23 @@
cp debian/JIS02*.TXT build/
@echo
+ touch unpack-stamp
-makefont:
+makefont: unpack
@echo Converting PFA to PFB and AFM to TFM.
@cd build && sh makefont > log 2>&1 || ( $(ERR) )
@echo
fixwada: $(fixwada_namestems)
$(fixwada_namestems): abbrev = $(patsubst fixwada.%,%,$@)
-$(fixwada_namestems):
+$(fixwada_namestems): unpack
@echo "Correct the glyph names of $(abbrev)."
@cd build && \
perl fixwada2.pl $(abbrev)j $(jis) >> log 2>&1 || \
( $(ERR) )
@echo
-makeuniwada:
+makeuniwada: unpack
@echo "Create virtual fonts for Unicode input encoding."
@cd build && \
perl makeuniwada.pl dgj udgj >> log 2>&1 || \
@@ -85,18 +94,11 @@
( $(ERR) )
@echo
-clean: clean1 unpatch
-
-clean1:
+clean:
dh_testdir wadalab-sym.7.tar.gz wftodm.c debian/JIS0208.TXT
dh_testroot
-# rm -f build-stamp
-
- # Add here commands to clean up after the build process.
-# -$(MAKE) clean
-
rm -rf build
-
+ rm -f build-stamp unpack-stamp
dh_clean
install:
@@ -127,17 +129,5 @@
# "wftodm" doesn't need to be installed, so there's nothing to do here.
binary-arch: install
-# And now the simple things for dpatch. Here we only apply/unapply the patches.
-# You can do more things with dpatch, like having patches only applied on
-# a special architecture - see the non-dh version of the sample for this!
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
-
-unpatch:
- dpatch deapply-all
-# rm -f patch-stamp
- rm -rf debian/patched
-
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary install patch unpatch clean1 wftodm fixwada makefont
+.PHONY: build clean binary-indep binary install wftodm fixwada makefont
Added: latex-cjk-japanese-wadalab/trunk/debian/source/format
===================================================================
--- latex-cjk-japanese-wadalab/trunk/debian/source/format (rev 0)
+++ latex-cjk-japanese-wadalab/trunk/debian/source/format 2012-03-23 18:04:23 UTC (rev 5275)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Debian-tex-commits
mailing list