[subversion-commit] SVN tetex-bin commit + diffs: r1530 - in tetex-bin/trunk/debian: . patches

Frank Küster frank at costa.debian.org
Tue Jul 25 09:05:00 UTC 2006 

Author: frank
Date: 2006-07-25 09:04:59 +0000 (Tue, 25 Jul 2006)
New Revision: 1530

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/patches/patch-deb
Log:
  * Install documentation in /usr/share/doc/tetex-doc/tetex, not in
    TEXMFMAIN [frank]
  * Do not try to call install-info during package build [frank]


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-07-24 18:07:37 UTC (rev 1529)
+++ tetex-bin/trunk/debian/changelog	2006-07-25 09:04:59 UTC (rev 1530)
@@ -1,8 +1,11 @@
 tetex-bin (3.0-18.1) UNRELEASED; urgency=low
 
   * Fix typo in the changelog entry of 3.0-17, s/nonexitant/nonexistent/. [frank]
+  * Install documentation in /usr/share/doc/tetex-doc/tetex, not in
+    TEXMFMAIN [frank]
+  * Do not try to call install-info during package build [frank]
 
- -- Frank Küster <frank at debian.org>  Fri, 21 Jul 2006 12:09:35 +0200
+ -- Frank Küster <frank at debian.org>  Tue, 25 Jul 2006 11:04:47 +0200
 
 tetex-bin (3.0-18) unstable; urgency=low
 

Modified: tetex-bin/trunk/debian/patches/patch-deb
===================================================================
--- tetex-bin/trunk/debian/patches/patch-deb	2006-07-24 18:07:37 UTC (rev 1529)
+++ tetex-bin/trunk/debian/patches/patch-deb	2006-07-25 09:04:59 UTC (rev 1530)
@@ -1,7 +1,7 @@
  configure                  |   13 +++++----
  texk/kpathsea/mktexlsr     |   17 +++---------
  texk/make/paths.mk         |    2 -
- texk/tetex/Makefile.in     |    4 +-
+ texk/tetex/Makefile.in     |   10 +++----
  texk/tetex/fmtutil         |   53 +++++++++++++++++++++++++++++++++++---
  texk/tetex/fmtutil-sys     |   10 +++++--
  texk/tetex/fmtutil.man     |   19 +++++++++++++
@@ -14,12 +14,12 @@
  texk/web2c/cwebdir/cweb.1  |   10 +++----
  texk/web2c/fmtutil.in      |    2 -
  texk/web2c/man/Makefile.in |    1 
- 16 files changed, 227 insertions(+), 58 deletions(-)
+ 16 files changed, 230 insertions(+), 61 deletions(-)
 
 Index: tetex-bin-3.0/configure
 ===================================================================
---- tetex-bin-3.0.orig/configure	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/configure	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/configure	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/configure	2006-07-25 11:02:18.000000000 +0200
 @@ -4213,12 +4213,13 @@
  
  
@@ -42,8 +42,8 @@
  if test -z "$xdvik_standalone"; then
 Index: tetex-bin-3.0/texk/kpathsea/mktexlsr
 ===================================================================
---- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/kpathsea/mktexlsr	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/kpathsea/mktexlsr	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/kpathsea/mktexlsr	2006-07-25 11:02:18.000000000 +0200
 @@ -103,9 +103,9 @@
    db_dir=`echo "$db_file" | sed 's%/[^/][^/]*$%%'` # can't rely on dirname
  
@@ -86,8 +86,8 @@
  exit 0
 Index: tetex-bin-3.0/texk/make/paths.mk
 ===================================================================
---- tetex-bin-3.0.orig/texk/make/paths.mk	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/make/paths.mk	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/make/paths.mk	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/make/paths.mk	2006-07-25 11:02:18.000000000 +0200
 @@ -47,7 +47,7 @@
  texmf = @texmfmain@
  
@@ -99,30 +99,40 @@
  texinputdir = $(texmf)/tex
 Index: tetex-bin-3.0/texk/tetex/Makefile.in
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/Makefile.in	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/Makefile.in	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/Makefile.in	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/Makefile.in	2006-07-25 11:03:08.000000000 +0200
 @@ -35,7 +35,7 @@
  
  # Auxiliary files.
  install-data:: $(INFOFILES)
 -	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/../doc/texmf/tetex
++	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/../doc/tetex-doc/tetex
  	for p in $(manpgs); do \
  	  $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
  	done
-@@ -72,7 +72,7 @@
+@@ -65,14 +65,14 @@
+ 	ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext)
+ 	test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
+ 	  $(INSTALL_DATA) $$i $(infodir)/$$i; done
+-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+-	  install-info --info-dir=$(infodir) $(infodir)/latex.info; \
+-	else true; fi
++# 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
++# 	  install-info --info-dir=$(infodir) $(infodir)/latex.info; \
++# 	else true; fi
+ 	for p in $(POOLFILES); do \
  	  $(INSTALL_DATA) $(srcdir)/$$p $(texpooldir)/$$p; \
  	done
  	for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
 -	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
-+	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/../doc/texmf/tetex; \
++	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/../doc/tetex-doc/tetex; \
  	done
  	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
  	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
 Index: tetex-bin-3.0/texk/tetex/texconfig
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig	2006-05-04 11:16:00.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/texconfig	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig	2006-07-25 11:02:18.000000000 +0200
 @@ -883,8 +883,8 @@
  
      faq)
@@ -153,8 +163,8 @@
              else
 Index: tetex-bin-3.0/texk/tetex/fmtutil
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil	2006-07-25 11:02:18.000000000 +0200
 @@ -25,7 +25,13 @@
  #  --cnffile file             set configfile for fmtutil
  #  --fmtdir directory         set destination directory for format files
@@ -246,8 +256,8 @@
  
 Index: tetex-bin-3.0/texk/tetex/fmtutil-sys
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil-sys	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil-sys	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil-sys	2006-07-25 11:02:18.000000000 +0200
 @@ -23,6 +23,12 @@
  
  TEXMFVAR="$v"
@@ -265,8 +275,8 @@
 +esac
 Index: tetex-bin-3.0/texk/tetex/fmtutil.man
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/fmtutil.man	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/fmtutil.man	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/fmtutil.man	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/fmtutil.man	2006-07-25 11:02:18.000000000 +0200
 @@ -1,4 +1,4 @@
 -.TH "fmtutil" "8" "February 2005" "teTeX" "teTeX" 
 +.TH "fmtutil" "1" "February 2005" "teTeX" "teTeX"
@@ -306,8 +316,8 @@
  .PP 
 Index: tetex-bin-3.0/texk/web2c/fmtutil.in
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/fmtutil.in	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/fmtutil.in	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/web2c/fmtutil.in	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/fmtutil.in	2006-07-25 11:02:18.000000000 +0200
 @@ -55,7 +55,7 @@
  
  # Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
@@ -319,8 +329,8 @@
  # if you want babel support in pdfamstex:
 Index: tetex-bin-3.0/texk/web2c/cwebdir/cweb.1
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/web2c/cwebdir/cweb.1	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/cwebdir/cweb.1	2006-07-25 11:02:18.000000000 +0200
 @@ -100,19 +100,19 @@
  .
  .SH FILES
@@ -348,8 +358,8 @@
  .SH "SEE ALSO"
 Index: tetex-bin-3.0/texk/tetex/updmap.man
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap.man	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap.man	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/updmap.man	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap.man	2006-07-25 11:02:18.000000000 +0200
 @@ -32,11 +32,18 @@
  line, \fBupdmap\fP will write generated map files to a directory of
  your choosing (via one of the \fB--*outputdir\fP options), or automatically
@@ -423,8 +433,8 @@
  .PP
 Index: tetex-bin-3.0/texk/tetex/updmap
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap	2006-05-04 11:08:03.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/updmap	2006-07-25 11:02:17.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap	2006-07-25 11:02:18.000000000 +0200
 @@ -15,6 +15,8 @@
  #   --nohash                   do not run texhash
  #   --nomkmap                  do not recreate map files
@@ -547,8 +557,8 @@
  
 Index: tetex-bin-3.0/texk/tetex/updmap-sys
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/updmap-sys	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/updmap-sys	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/updmap-sys	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/updmap-sys	2006-07-25 11:02:18.000000000 +0200
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -560,8 +570,8 @@
  exec updmap ${1+"$@"}
 Index: tetex-bin-3.0/texk/tetex/texconfig-sys
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig-sys	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig-sys	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/texconfig-sys	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig-sys	2006-07-25 11:02:18.000000000 +0200
 @@ -23,6 +23,7 @@
  
  TEXMFVAR="$v"
@@ -573,8 +583,8 @@
  exec texconfig ${1+"$@"}
 Index: tetex-bin-3.0/texk/web2c/man/Makefile.in
 ===================================================================
---- tetex-bin-3.0.orig/texk/web2c/man/Makefile.in	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/web2c/man/Makefile.in	2006-05-04 11:08:03.000000000 +0200
+--- tetex-bin-3.0.orig/texk/web2c/man/Makefile.in	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/web2c/man/Makefile.in	2006-07-25 11:02:18.000000000 +0200
 @@ -38,7 +38,6 @@
  	dvicopy.1	\
  	dvitomp.1	\
@@ -585,8 +595,8 @@
  	gftopk.1	\
 Index: tetex-bin-3.0/texk/tetex/texconfig.man
 ===================================================================
---- tetex-bin-3.0.orig/texk/tetex/texconfig.man	2006-05-04 11:07:55.000000000 +0200
-+++ tetex-bin-3.0/texk/tetex/texconfig.man	2006-05-04 11:20:57.000000000 +0200
+--- tetex-bin-3.0.orig/texk/tetex/texconfig.man	2006-07-25 11:01:49.000000000 +0200
++++ tetex-bin-3.0/texk/tetex/texconfig.man	2006-07-25 11:02:18.000000000 +0200
 @@ -6,22 +6,52 @@
  .SH SYNOPSIS
  .B texconfig

More information about the Pkg-tetex-commits mailing list