[subversion-commit] SVN tetex commit + diffs: r131 -
tetex-bin/trunk/debian
Frank Küster
frank at costa.debian.org
Tue Aug 16 14:58:39 UTC 2005
Author: frank
Date: 2005-08-16 14:58:37 +0000 (Tue, 16 Aug 2005)
New Revision: 131
Modified:
tetex-bin/trunk/debian/TODO
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/common.functions.in
tetex-bin/trunk/debian/common.variables
tetex-bin/trunk/debian/control
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
tetex-bin/trunk/debian/variables
Log:
- [rules.in] use the right (and now the only, in fact) incarnations of common.* from the tex-common source tree
- [common.*] update from tex-common
- [control] provide libxaw8-dev as the first build-dep alternative (closes: #241090)
- [variables] move LSRS to common.variables
- [TODO] added some items
Modified: tetex-bin/trunk/debian/TODO
===================================================================
--- tetex-bin/trunk/debian/TODO 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/TODO 2005-08-16 14:58:37 UTC (rev 131)
@@ -11,4 +11,7 @@
- does upstream really install the etex manpage, but no etex binary?
Where is our error?
-- add patch-mandash
+- add patch-mandash, forward upstream
+
+- document the dropping of debconf questions about update-foo in
+ NEWS.Debian
\ No newline at end of file
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/changelog 2005-08-16 14:58:37 UTC (rev 131)
@@ -1,8 +1,8 @@
-tetex-bin (3.0-6) UNRELEASED; urgency=low
+tetex-bin (3.0-5.1) UNRELEASED; urgency=low
- * Now Build-Depends on tex-common, and uses common.variables and
- common.functions from there if possible. We still need the files in
- the diff.gz. though, I'm not a Makefile guru. [frank]
+ * Now Build-Depends on tex-common for dfs-patch.mk. Common.variables
+ and common.functions.in are used only from a tex-common source tree,
+ if available. Also moved the LSRS variable to tex-common [frank]
* Apply patch by Matthias Klose to allow building with xorg (closes:
#310434). [frank]
* Re-libtoolize with newer libtool to allow building for GNU/KFreeBSD,
@@ -11,7 +11,8 @@
* Update the section in debian/README.Debian that deals with manual
system-wide font installation by administrators (closes: #304294).
[frn]
- * Removed build-dependency on obsolete libxaw-dev (closes: #241090)
+ * Removed build-dependency on obsolete libxaw-dev, instead provide
+ libxaw8-dev as the first alternative (closes: #241090)
* Make fmtutil recognize if it was called by fmtutil-sys (closes:
#320812).
* Add Suggests: rubber, as has been done in 2.0.2
Modified: tetex-bin/trunk/debian/common.functions.in
===================================================================
--- tetex-bin/trunk/debian/common.functions.in 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/common.functions.in 2005-08-16 14:58:37 UTC (rev 131)
@@ -197,7 +197,4 @@
## End of function definitions from file common.functions
#################################################################
-# local variables:
-# mode: shell-script
-# skeleton-pair: t
-# end:
+
Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/common.variables 2005-08-16 14:58:37 UTC (rev 131)
@@ -1,11 +1,20 @@
<:# Copyright (C) 1999, 2000, 01, 02 by Davide Giovanni Maria Salvetti <salve at debian.org>.:>//
<:# Copyright (C) 2004, 05 by Frank Küster <frank at debian.org>.:>//
<:# $Id$:>//
+<:# this list is from dpkg-1.10.9/include/dpkg.h.in: :>//
+<:$DPKG_EXTENSIONS="'~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist":>//
+<:$PREINST_MOVE_EXT="preinst-bak":>//
+<:$POSTINST_MOVE_EXT="postinst-bak":>//
+<:$PURGE_EXTENSIONS="$DPKG_EXTENSIONS $PREINST_MOVE_EXT $POSTINST_MOVE_EXT":>//
<:# package specific:>//
<:$ETC="/etc/":>//
<:$etc="/etc/texmf/":>//
<:$doc="/usr/share/doc/$PACKAGE/":>//
+<:$TEXMFSYSVAR="/var/lib/texmf":>//
<:$MKTMPDIR="/tmp":>//
+<:$FONTMAP_MEMORY_DIR="/var/lib/tex-common/fontmap-cfg":>//
+<:$LANGUAGE_MEMORY_DIR="/var/lib/tex-common/language-cnf":>//
+<:$LANGUAGE_DIR="$etc/language.d":>//
<:$LDAT_PATTERNS="inhyph.tex bahyph.tex cahyph.tex hrhyph.tex czhyph.tex \\
dehypht.tex dehyphn.tex dkhyphen.tex nehyph.tex fi8hyph.tex frhyph.tex \\
gahyph.tex grhyph.tex icehyph.tex ithyph.tex lahyph.tex huhyph.tex nohyph.tex \\
@@ -13,21 +22,28 @@
sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex ukrhyph.tex \\
ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2":>//
<:$TEXMF_CNF="/etc/texmf/texmf.cnf":>//
+<:$TEXMF_PARTS="05TeXMF 15Plain 45TeXinputs 55Fonts 65BibTeX 75DviPS 85Misc 90TeXDoc 95NonPath":>//
+<:for (@TEXMF_PARTS_FULLNAME=split(/ /,$TEXMF_PARTS)){s{(.*)}{texmf.d/$1.cnf}}:>//
+<:$TEX_COMMON_UCF_FILES="@TEXMF_PARTS_FULLNAME updmap.d/00updmap.cfg":>//
<:$confstatedir="/var/lib/tetex":>//
<:$no_config_prefix="admin-wants-no":>//
-<:# get the package version:>//
-<:open(CHANGELOG,"changelog");
+<:$LSRS="/var/lib/texmf/ls-R /var/lib/texmf/ls-R-TEXMFMAIN /var/lib/texmf/ls-R-LOCAL /var/cache/fonts/ls-R":>//
+<:# get the package version - must be usable in subdirectories, too:>//)
+<:if(-f "changelog"){open(CHANGELOG,"changelog")} else {open(CHANGELOG, "../changelog")};
# get the version even if the first line is blank
while($VERSION=<CHANGELOG>){last if('' ne $VERSION=~s/$PACKAGE \((.*)\).*\n/$1/)}:>//
-<:# compute the corresponding version vor a sarge backport:>//
+<:# compute the corresponding version for a sarge backport:>//
<:if ( ($rev=$VERSION)=~ s/.*-([[:digit:]]*).*/$1/, $rev == 0)
# if the debian revision is 0 or 0.x, don't make a backport
{$SARGEVERSION = ''}
else {
- $sarge_rev=$rev-1;
- ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$sarge_rev.sarge$2/;
+ # currently, we only need to recompile: binary-only-NMU version number
+ # $sarge_rev=$rev-1;
+ # ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$sarge_rev.sarge$2/;
+ ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$rev.0.sarge1/;
}:>//
-<:$README_sarge=''; $README_sarge='sarge/README.sarge' if -e 'sarge-stamp':>//
+<:$FIRST_BASE_VERSION_WITH_COMMON="3.0-4":>//
+<:$README_sarge=''; $README_sarge='debian/sarge/README.sarge' if -e 'sarge-stamp':>//
<:# upgrading stuff:>//
<:$SYMLINK_MOVE_EXT="moved-by-preinst":>//
<:# debconf:>//
Modified: tetex-bin/trunk/debian/control
===================================================================
--- tetex-bin/trunk/debian/control 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/control 2005-08-16 14:58:37 UTC (rev 131)
@@ -5,7 +5,7 @@
Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>
Standards-Version: 3.5.6.0
Build-Depends-Indep: tex-common
-Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw7-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml
+Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw8-dev | libxaw7-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml
Package: tetex-bin
Priority: optional
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/rules 2005-08-16 14:58:37 UTC (rev 131)
@@ -19,8 +19,8 @@
setup_scripts=debian/tetex-bin_install debian/checkmd5sums
timepattern=.*[[:alpha:]]*[[:space:]]*[[:digit:]] \([[:digit:].]*\) \.\./.*
tex_common_dir = ../../tex-common/tex-common
-real_common_variables=$(tex_common_dir)/teTeX-build/common.variables
-real_common_functions_in=$(tex_common_dir)/teTeX-build/common.functions.in
+real_common_variables=$(tex_common_dir)/debian/common.variables
+real_common_functions_in=$(tex_common_dir)/debian/common.functions.in
# use the Debian single file patch system
export DSF-PATCHLIST=debian/patches/patchlist.mk
@@ -104,7 +104,6 @@
# make in the variable $(tex_common_dir). The default is
# ../../tex-common/tex-common/.
define update_commonstuff
-cp -p /usr/share/tex-common/teTeX-build/{common.variables,common.functions.in} debian/
test -e $(real_common_variables) && \
test $(real_common_variables) -nt debian/common.variables && \
cp $(real_common_variables) debian/ || true
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/rules.in 2005-08-16 14:58:37 UTC (rev 131)
@@ -24,8 +24,8 @@
setup_scripts=debian/tetex-bin_install debian/checkmd5sums
timepattern=.*[[:alpha:]]*[[:space:]]*[[:digit:]] \([[:digit:].]*\) \.\./.*
tex_common_dir = ../../tex-common/tex-common
-real_common_variables=$(tex_common_dir)/teTeX-build/common.variables
-real_common_functions_in=$(tex_common_dir)/teTeX-build/common.functions.in
+real_common_variables=$(tex_common_dir)/debian/common.variables
+real_common_functions_in=$(tex_common_dir)/debian/common.functions.in
# use the Debian single file patch system
export DSF-PATCHLIST=debian/patches/patchlist.mk
@@ -109,7 +109,6 @@
# make in the variable $(tex_common_dir). The default is
# ../../tex-common/tex-common/.
define update_commonstuff
-cp -p /usr/share/tex-common/teTeX-build/{common.variables,common.functions.in} debian/
test -e $(real_common_variables) && \
test $(real_common_variables) -nt debian/common.variables && \
cp $(real_common_variables) debian/ || true
Modified: tetex-bin/trunk/debian/variables
===================================================================
--- tetex-bin/trunk/debian/variables 2005-08-16 11:52:31 UTC (rev 130)
+++ tetex-bin/trunk/debian/variables 2005-08-16 14:58:37 UTC (rev 131)
@@ -1,10 +1,9 @@
<:# Copyright (C) 1999, 2000, 01, 02, 03, 04 by Davide Giovanni Maria Salvetti.:>//
<:# Copyright (C) 2004 by Frank Küster <frank at kuesterei.ch>.:>//
-<:# $Id: variables,v 1.1.2.6 2005/07/20 10:10:50 frank Exp $:>//
+<:# $Id$:>//
<:use File::Basename:>//
<:$PACKAGE="tetex-bin":>//
<:$PKG_SHAREDIR="/usr/share/tetex-bin":>//
-<:$LSRS="/var/lib/texmf/ls-R /var/lib/texmf/ls-R-TEXMFMAIN /var/lib/texmf/ls-R.local /var/cache/fonts/ls-R":>//
<:$VARTOP_GENERATED="helpindex.html ls-R ls-R-TEXMFMAIN":>//
<:$STANDARD_INFO_TEXT="This file is no longer needed. You may safely delete it.":>//
<:### Variables needed for upgrades from pre-woody:>//
More information about the Pkg-tetex-commits
mailing list