[subversion-commit] SVN tetex-bin commit + diffs: r1136 -
tetex-bin/trunk/debian
Julian Gilbey
jdg at costa.debian.org
Wed Mar 29 11:10:41 UTC 2006
Author: jdg
Date: 2006-03-29 11:10:40 +0000 (Wed, 29 Mar 2006)
New Revision: 1136
Modified:
tetex-bin/trunk/debian/changelog
tetex-bin/trunk/debian/common.variables
tetex-bin/trunk/debian/rules
tetex-bin/trunk/debian/rules.in
tetex-bin/trunk/debian/variables
Log:
* Made debian/{common.,}variables a lot more Perl-like and readable
* Remove _all_ generated *.info and dir, dir.old files during
debian/rules clean
Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog 2006-03-29 09:01:24 UTC (rev 1135)
+++ tetex-bin/trunk/debian/changelog 2006-03-29 11:10:40 UTC (rev 1136)
@@ -26,8 +26,11 @@
* Use -t switch on mktemp in maintainer scripts [jdg]
* Make tetex-bin Depend on dialog | whiptail rather than Recommend it;
texconfig requires this for interactive mode [jdg]
+ * Made debian/{common.,}variables a lot more Perl-like and readable
+ * Remove _all_ generated *.info and dir, dir.old files during
+ debian/rules clean
- -- Julian Gilbey <jdg at debian.org> Wed, 29 Mar 2006 10:01:09 +0100
+ -- Julian Gilbey <jdg at debian.org> Wed, 29 Mar 2006 12:10:08 +0100
tetex-bin (3.0-15) unstable; urgency=medium
Modified: tetex-bin/trunk/debian/common.variables
===================================================================
--- tetex-bin/trunk/debian/common.variables 2006-03-29 09:01:24 UTC (rev 1135)
+++ tetex-bin/trunk/debian/common.variables 2006-03-29 11:10:40 UTC (rev 1136)
@@ -1,67 +1,75 @@
-<:# 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/":>//
-<:$TEXMFSYSVARDIR="/var/lib/texmf":>//
-<:$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 \\
- nohyphb.tex nohyphbc.tex plhyph.tex pt8hyph.tex rohyphen.tex ruhyphen.tex \\
- 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":>//
-<:$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")};
+<:
+# 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/";
+$TEXMFSYSVARDIR="/var/lib/texmf";
+$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=<<EOL;
+ 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 nohyphb.tex nohyphbc.tex plhyph.tex pt8hyph.tex rohyphen.tex \\
+ ruhyphen.tex sehyph.tex skhyph.tex sihyph23.tex sphyph.tex trhyph.tex \\
+ ukrhyph.tex ukrhyph.t2a ukrhyph.lcy ukrhyph.ot2
+EOL
+$TEXMF_CNF="/etc/texmf/texmf.cnf";
+ at TEXMF_PARTS=qw(05TeXMF 15Plain 45TeXinputs 55Fonts 65BibTeX 75DviPS
+ 85Misc 90TeXDoc 95NonPath);
+ at TEXMF_PARTS_FULLNAME = map { "texmf.d/$_.cnf"; } @TEXMF_PARTS;
+$TEX_COMMON_UCF_FILES="@TEXMF_PARTS_FULLNAME updmap.d/00updmap.cfg";
+#$confstatedir="/var/lib/tetex";
+#$no_config_prefix="admin-wants-no";
+$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)
+open CHANGELOG, "debian/changelog" or die "Can't open debian/changelog: $!\n";
# 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 for a sarge backport:>//
-<:if ( ($rev=$VERSION)=~ s/.*-([[:digit:]]*).*/$1/, $rev == 0)
+while ($VERSION=<CHANGELOG>) {
+ last if $VERSION=~s/^$PACKAGE \((.*)\).*\n$/$1/;
+}
+# compute the corresponding version for a sarge backport
+($rev=$VERSION) =~ s/^.*-(\d+)[^\-]*$/$1/;
+if ($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}bpo1/;
+ $SARGEVERSION = '';
+} else {
+ $sarge_rev = $rev-1;
+ ($SARGEVERSION=$VERSION) =~ s/^(.*-)$rev([^\-]*)$/$1${sarge_rev}${2}bpo1/;
# ($SARGEVERSION=$VERSION)=~s/(.*-)$rev(.*)/$1$rev.0.sarge1/;
-}:>//
-<:$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:>//
-<:$CONFMODULE="/usr/share/debconf/confmodule":>//
-<:# docbase:>//
-<:$DINSTALL="test -x /usr/sbin/install-docs && install-docs --install":>//
-<:$DREMOVE="test -x /usr/sbin/install-docs && install-docs --remove":>//
-<:$docbase="/usr/share/doc-base/":>//
-<:# info:>//
-<:$IINSTALL="install-info --section \"$INFOSEC\" \"$INFOSEC\""
- . " --menuentry=\"$INFOMENU\""
- . " --description=\"$INFODESC\""
- . " --quiet":>//
-<:$IREMOVE="install-info --quiet --remove":>//
-<:$info="/usr/share/info/":>//
-<:# misc:>//
-<:$GPL="/usr/share/common-licenses/GPL":>//
-<:open(COPYRIGHT,'COPYRIGHT.scripts');@COPYRIGHT=<COPYRIGHT>;close(COPYRIGHT):>//
-<:
+}
+$FIRST_BASE_VERSION_WITH_COMMON="3.0-4";
+$README_sarge = (-e 'sarge-stamp') ? 'debian/sarge/README.sarge' : '';
+# upgrading stuff
+$SYMLINK_MOVE_EXT="moved-by-preinst";
+# debconf
+$CONFMODULE="/usr/share/debconf/confmodule";
+# docbase
+$DINSTALL="test -x /usr/sbin/install-docs && install-docs --install";
+$DREMOVE="test -x /usr/sbin/install-docs && install-docs --remove";
+$docbase="/usr/share/doc-base/";
+# info
+$IINSTALL=qq[install-info --section "$INFOSEC" "$INFOSEC"] .
+ qq[ --menuentry="$INFOMENU" --description="$INFODESC" --quiet];
+$IREMOVE="install-info --quiet --remove";
+$info="/usr/share/info/";
+# misc
+$GPL="/usr/share/common-licenses/GPL";
+open COPYRIGHT, 'debian/COPYRIGHT.scripts'
+ or die "Couldn't open debian/COPYRIGHT.scripts: $!\n";
+ at COPYRIGHT=<COPYRIGHT>;
+close(COPYRIGHT);
+
# local variables:
-# mode: shell-script
+# mode: perl
# end:
:>//
Modified: tetex-bin/trunk/debian/rules
===================================================================
--- tetex-bin/trunk/debian/rules 2006-03-29 09:01:24 UTC (rev 1135)
+++ tetex-bin/trunk/debian/rules 2006-03-29 11:10:40 UTC (rev 1136)
@@ -64,7 +64,7 @@
# Eperl is simply great: thanks, Davide!
% :: %.in $(eperl_sourcefiles)
- eperl -I $(eperl_pwd) -P -o $@ $<
+ eperl -k -I $(eperl_pwd) -P -o $@ $<
# Override this rule for debian/rules, which needs an additional command
debian/rules: debian/rules.in $(eperl_sourcefiles)
@@ -72,13 +72,13 @@
# time the rules file is going to be regenerated
$(update_commonstuff)
# Regenerate the rules file
- eperl -P -o $@ $<
+ eperl -k -P -o $@ $<
# Override the general rule for eperl-generated files in order to avoid a
# circular dependency (debian/common.functions is listed in
# $(eperl_sourcefiles)).
debian/common.functions: debian/common.functions.in debian/common.variables
- eperl -P -o $@ $<
+ eperl -k -P -o $@ $<
clean: clean-commonstuff clean-upstream clean-deb clean-patches
@@ -115,7 +115,7 @@
test -e $(real_common_functions_in) && \
test $(real_common_functions_in) -nt debian/common.functions.in && \
cp $(real_common_functions_in) debian/ && \
- eperl -P -o debian/common.functions debian/common.functions.in || true
+ eperl -k -P -o debian/common.functions debian/common.functions.in || true
endef
# For command-line use
@@ -159,7 +159,7 @@
rm -f debian/conffiles
rm -f $(EPERL_FILES)
rm -f debian/tetex-xwarn
- rm -f debian/latex.info
+ rm -f $(shell cat debian/tetex-bin.info) debian/dir debian/dir.old
# Files generated by debiandoc2{text,html}
rm -f debian/README.Debian.tpt debian/README.Debian.txt \
Modified: tetex-bin/trunk/debian/rules.in
===================================================================
--- tetex-bin/trunk/debian/rules.in 2006-03-29 09:01:24 UTC (rev 1135)
+++ tetex-bin/trunk/debian/rules.in 2006-03-29 11:10:40 UTC (rev 1136)
@@ -69,7 +69,7 @@
# Eperl is simply great: thanks, Davide!
% :: %.in $(eperl_sourcefiles)
- eperl -I $(eperl_pwd) -P -o $@ $<
+ eperl -k -I $(eperl_pwd) -P -o $@ $<
# Override this rule for debian/rules, which needs an additional command
debian/rules: debian/rules.in $(eperl_sourcefiles)
@@ -77,13 +77,13 @@
# time the rules file is going to be regenerated
$(update_commonstuff)
# Regenerate the rules file
- eperl -P -o $@ $<
+ eperl -k -P -o $@ $<
# Override the general rule for eperl-generated files in order to avoid a
# circular dependency (debian/common.functions is listed in
# $(eperl_sourcefiles)).
debian/common.functions: debian/common.functions.in debian/common.variables
- eperl -P -o $@ $<
+ eperl -k -P -o $@ $<
clean: clean-commonstuff clean-upstream clean-deb clean-patches
@@ -120,7 +120,7 @@
test -e $(real_common_functions_in) && \
test $(real_common_functions_in) -nt debian/common.functions.in && \
cp $(real_common_functions_in) debian/ && \
- eperl -P -o debian/common.functions debian/common.functions.in || true
+ eperl -k -P -o debian/common.functions debian/common.functions.in || true
endef
# For command-line use
@@ -164,7 +164,7 @@
rm -f debian/conffiles
rm -f $(EPERL_FILES)
rm -f debian/tetex-xwarn
- rm -f debian/latex.info
+ rm -f $(shell cat debian/tetex-bin.info) debian/dir debian/dir.old
# Files generated by debiandoc2{text,html}
rm -f debian/README.Debian.tpt debian/README.Debian.txt \
Modified: tetex-bin/trunk/debian/variables
===================================================================
--- tetex-bin/trunk/debian/variables 2006-03-29 09:01:24 UTC (rev 1135)
+++ tetex-bin/trunk/debian/variables 2006-03-29 11:10:40 UTC (rev 1136)
@@ -1,25 +1,28 @@
-<:# 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$:>//
-<:use File::Basename:>//
-<:$PACKAGE="tetex-bin":>//
-<:$PKG_SHAREDIR="/usr/share/tetex-bin":>//
-<:$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:>//
-<:$VERYOLD_TEXMF="/usr/lib/texmf/web2c":>//
-<:### Variables needed for upgrades since woody:>//
-<:$OLD_WEB2C="/usr/share/texmf/web2c":>//
-<:$SYMLINK_MOVE_EXT="moved-by-preinst":>//
-<:$WOODY_FMTCNF="$PKG_SHAREDIR/fmtutil.cnf.1.0.7":>//
-<:### Variables needed for upgrades since sarge:>//
-<:$UCF_FILES="fmt.d/01tetex.cnf":>//
-<:# Misc package variables:>//
-<:$INFOSEC="Document Preparation":>//
-<:$EPRIORITY="50":>//
+<:
+# 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$
+use File::Basename;
+
+$PACKAGE="tetex-bin";
+$PKG_SHAREDIR="/usr/share/tetex-bin";
+$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
+$VERYOLD_TEXMF="/usr/lib/texmf/web2c";
+### Variables needed for upgrades since woody
+$OLD_WEB2C="/usr/share/texmf/web2c";
+$SYMLINK_MOVE_EXT="moved-by-preinst";
+$WOODY_FMTCNF="$PKG_SHAREDIR/fmtutil.cnf.1.0.7";
+### Variables needed for upgrades since sarge
+$UCF_FILES="fmt.d/01tetex.cnf";
+# Misc package variables
+$INFOSEC="Document Preparation";
+$EPRIORITY="50";
+:>//
#include "common.variables"
<:
# Local variables:
-# mode: shell-script
+# mode: perl
# end:
:>//
More information about the Pkg-tetex-commits
mailing list