[subversion-commit] SVN tetex commit + diffs: r127 -
tetex-base/trunk/debian
Frank Küster
frank at costa.debian.org
Tue Aug 16 11:36:15 UTC 2005
Author: frank
Date: 2005-08-16 11:36:15 +0000 (Tue, 16 Aug 2005)
New Revision: 127
Modified:
tetex-base/trunk/debian/common.variables
tetex-base/trunk/debian/control
tetex-base/trunk/debian/rules
tetex-base/trunk/debian/rules.in
Log:
- build-depending on tex-common is not a good idea, especially when testing. Therefore reverting that change in control and rules.in.
- take common.* from the right place in tex-common
- update common.variables
Modified: tetex-base/trunk/debian/common.variables
===================================================================
--- tetex-base/trunk/debian/common.variables 2005-08-16 11:30:23 UTC (rev 126)
+++ tetex-base/trunk/debian/common.variables 2005-08-16 11:36:15 UTC (rev 127)
@@ -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-base/trunk/debian/control
===================================================================
--- tetex-base/trunk/debian/control 2005-08-16 11:30:23 UTC (rev 126)
+++ tetex-base/trunk/debian/control 2005-08-16 11:36:15 UTC (rev 127)
@@ -1,7 +1,7 @@
Source: tetex-base
Section: tex
Priority: optional
-Build-Depends-Indep: debhelper (>= 4.1.16), po-debconf, eperl, sharutils, tex-common
+Build-Depends-Indep: debhelper (>= 4.1.16), eperl, sharutils
Maintainer: teTeX maintainers <debian-tetex-maint at lists.debian.org>
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
Modified: tetex-base/trunk/debian/rules
===================================================================
--- tetex-base/trunk/debian/rules 2005-08-16 11:30:23 UTC (rev 126)
+++ tetex-base/trunk/debian/rules 2005-08-16 11:36:15 UTC (rev 127)
@@ -23,8 +23,8 @@
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
debian/common.variables debian/common.functions
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
SHELL = /bin/bash
@@ -47,7 +47,7 @@
include /usr/share/dsfp/dsf-patch.mk
### variables from eperl that need to be passed to the static helper makefiles
-FONTMAP_MEMORY_DIR=
+FONTMAP_MEMORY_DIR=/var/lib/tex-common/fontmap-cfg
###############
# Main targets
@@ -89,15 +89,14 @@
##############################
# common.variables and common.functions are shared between the
-# tetex-base and tetex-bin source packages. On a normal build, they
-# are copied from /usr/share/tex-common/teTeX-build/. Developers can
-# always used the most recent version from tex-commons svn repository.
-# If you want to use this mechanism, check out the trunk of the
-# tetex-common tree and pass its location relative to the build dir to
-# make in the variable $(tex_common_dir). The default is
-# ../../tex-common/tex-common/.
+# tetex-base and tetex-bin source packages. On a normal build, the
+# versions included in the individual source packages are used.
+# Developers can use the most recent version from tex-commons svn
+# repository. If you want to use this mechanism, check out the trunk
+# of the tetex-common tree and pass the variable $(tex_common_dir) to
+# make, indicating its location relative to the build 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
@@ -214,7 +213,7 @@
debian/sarge-stamp:
cp debian/changelog debian/sarge/changelog.sid
- sed -e s/3.0-7/3.0-6.sarge/ debian/sarge/changelog.sid \
+ sed -e s/3.0-6.1/3.0-6.0.sarge1/ debian/sarge/changelog.sid \
> debian/changelog && rm debian/sid-stamp
# need to remake rules
touch debian/rules.in
Modified: tetex-base/trunk/debian/rules.in
===================================================================
--- tetex-base/trunk/debian/rules.in 2005-08-16 11:30:23 UTC (rev 126)
+++ tetex-base/trunk/debian/rules.in 2005-08-16 11:36:15 UTC (rev 127)
@@ -28,8 +28,8 @@
eperl_sourcefiles=debian/variables debian/COPYRIGHT.scripts \
debian/common.variables debian/common.functions
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
SHELL = /bin/bash
@@ -94,15 +94,14 @@
##############################
# common.variables and common.functions are shared between the
-# tetex-base and tetex-bin source packages. On a normal build, they
-# are copied from /usr/share/tex-common/teTeX-build/. Developers can
-# always used the most recent version from tex-commons svn repository.
-# If you want to use this mechanism, check out the trunk of the
-# tetex-common tree and pass its location relative to the build dir to
-# make in the variable $(tex_common_dir). The default is
-# ../../tex-common/tex-common/.
+# tetex-base and tetex-bin source packages. On a normal build, the
+# versions included in the individual source packages are used.
+# Developers can use the most recent version from tex-commons svn
+# repository. If you want to use this mechanism, check out the trunk
+# of the tetex-common tree and pass the variable $(tex_common_dir) to
+# make, indicating its location relative to the build 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
More information about the Pkg-tetex-commits
mailing list