[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/2013.20130523-1-10-g161ebb3



The following commit has been merged in the master branch:
commit 161ebb318cdae60b2aa75d5d909b1a6861544c58
Author: Norbert Preining <preining@debian.org>
Date:   Wed May 29 13:59:25 2013 +0900

    fix tl-paper breakage when paper config file is scrambled
    
    adjust tl-paper to always read the (known good) system provided
    paper config files, or the ones provided by the sysadmin, instead
    of the generated one in TEXMFSYSVAR while setting paper sizes
    (Closes: #709986)

diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index 63527c8..0005825 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,3 +1,13 @@
+texlive-base (2013.2013NNNN-1) UNRELEASED; urgency=low
+
+  * UNRELEASED
+  * adjust tl-paper to always read the (known good) system provided
+    paper config files, or the ones provided by the sysadmin, instead
+    of the generated one in TEXMFSYSVAR while setting paper sizes
+    (Closes: #709986)
+
+ -- Norbert Preining <preining@debian.org>  Wed, 29 May 2013 13:57:39 +0900
+
 texlive-base (2013.20130523-1) unstable; urgency=low
 
   * new upstream checkout
diff --git a/texlive-base/debian/tl-paper b/texlive-base/debian/tl-paper
index e8f3ec9..7fc5223 100644
--- a/texlive-base/debian/tl-paper
+++ b/texlive-base/debian/tl-paper
@@ -74,6 +74,14 @@ sub main {
       usage();
       exit 1;
     }
+    # set TEXMFVAR and TEXMFSYSVAR to something completely absurd
+    # so that we always find either the system provided config file
+    # as distributed in /usr/share/texlive/texmf-dist, or, if the
+    # admin decided to override that, a copy in TEXMFSYSCONFIG
+    # but *not* the one we have created at some point in history
+    # in TEXMF(SYS)VAR
+    $ENV{"TEXMFVAR"} = "/does/hopefully/not/exists/on/any/system";
+    $ENV{"TEXMFSYSVAR"} = "/does/hopefully/not/exists/on/any/system";
     if ($prg =~ m/^all$/i) {
       if ($newpaper !~ /^(a4|letter)$/) {
         # we cannot deal with that for now, only a4|letter supported for

-- 
Debian packaging of texlive-nonbin)


Reply to: