[Reproducible-commits] [texlive-bin] 94/400: * patch handling: . removed: 41_maketexmf, 12_fix_epstopdf_invocation both included upstream or not needed anymore . new: set-e-fmtutil part of set-e-in-various-scripts that still applies . disabled: 57_texconfig_papersizes_for_upstream, 58_texconfig_papersizes_use_ucf, superseeded by 55_texconfig_stuff . disabled: set-e-in-various-scripts: split into set-e-fmtutil and a disabled part for texconfig

[Maria Valentina Marin Rodrigues]

This is an automated email from the git hooks/post-receive script.

akira-guest pushed a commit to branch master
in repository texlive-bin.

commit 25d8ceb4fb64d1dd60edd322637821c397eac64a
Author: Norbert Preining <preining at debian.org>
Date:   Wed May 30 02:04:56 2012 +0000

      * patch handling:
        . removed: 41_maketexmf, 12_fix_epstopdf_invocation
          both included upstream or not needed anymore
        . new: set-e-fmtutil part of set-e-in-various-scripts that still
          applies
        . disabled: 57_texconfig_papersizes_for_upstream,
          58_texconfig_papersizes_use_ucf, superseeded by 55_texconfig_stuff
        . disabled: set-e-in-various-scripts: split into set-e-fmtutil
          and a disabled part for texconfig
---
 debian/changelog                        | 14 +++++++++++---
 debian/quilt/12_fix_epstopdf_invocation | 21 ---------------------
 debian/quilt/series                     |  8 ++++----
 debian/quilt/set-e-fmtutil              | 29 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80faa4d..f17ae13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,17 @@ texlive-bin (2012.20120530-1) unstable; urgency=high
   * new upstream snapshot (svn 26726)
     exporting kpse_cnf_get (Closes: #675109)
   * cnf.h is again installed, don't install it via libkpathsea-dev.install
-  * remove debian/quilt/41_maketexmf, included upstream
-
- -- Norbert Preining <preining at debian.org>  Wed, 30 May 2012 09:37:30 +0900
+  * patch handling:
+    . removed: 41_maketexmf, 12_fix_epstopdf_invocation
+      both included upstream or not needed anymore
+    . new: set-e-fmtutil part of set-e-in-various-scripts that still 
+      applies
+    . disabled: 57_texconfig_papersizes_for_upstream,
+      58_texconfig_papersizes_use_ucf, superseeded by 55_texconfig_stuff
+    . disabled: set-e-in-various-scripts: split into set-e-fmtutil
+      and a disabled part for texconfig
+
+ -- Norbert Preining <preining at debian.org>  Wed, 30 May 2012 11:02:05 +0900
 
 texlive-bin (2012.20120516-1) unstable; urgency=low
 
diff --git a/debian/quilt/12_fix_epstopdf_invocation b/debian/quilt/12_fix_epstopdf_invocation
deleted file mode 100755
index bf30f59..0000000
--- a/debian/quilt/12_fix_epstopdf_invocation
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_fix_epstopdf_invocation.dpatch  <preining at logic.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix invocation of epstopdf to get rid of magic
-
- at DPATCH@
- texk/texlive/linked_scripts/epstopdf/epstopdf.pl |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: texlive-bin-2011.20120216/texk/texlive/linked_scripts/epstopdf/epstopdf.pl
-===================================================================
---- texlive-bin-2011.20120216.orig/texk/texlive/linked_scripts/epstopdf/epstopdf.pl	2011-03-01 18:20:55.000000000 +0900
-+++ texlive-bin-2011.20120216/texk/texlive/linked_scripts/epstopdf/epstopdf.pl	2012-02-17 10:35:21.030873107 +0900
-@@ -1,5 +1,4 @@
--eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
--  if 0;
-+#!/usr/bin/perl
- use strict;
- 
- # $Id: epstopdf.pl 18319 2010-05-17 16:34:21Z karl $
diff --git a/debian/quilt/series b/debian/quilt/series
index fb41781..fb2ee25 100644
--- a/debian/quilt/series
+++ b/debian/quilt/series
@@ -1,4 +1,3 @@
-12_fix_epstopdf_invocation
 12a_fix_thumbpdf_invocation
 12b_fix_a2ping_invocation
 12e_fix_vpe_invocation
@@ -7,9 +6,10 @@
 51_fmtutil_keep_failedlog
 53_builtin-searchpath-fix
 55_texconfig_stuff
-57_texconfig_papersizes_for_upstream
-58_texconfig_papersizes_use_ucf
-set-e-in-various-scripts
+#57_texconfig_papersizes_for_upstream
+#58_texconfig_papersizes_use_ucf
+set-e-fmtutil
+#set-e-in-various-scripts
 #partial_lfs_support.diff
 debian-no-linked-scripts
 #build-wovp2ovf
diff --git a/debian/quilt/set-e-fmtutil b/debian/quilt/set-e-fmtutil
new file mode 100644
index 0000000..68cea44
--- /dev/null
+++ b/debian/quilt/set-e-fmtutil
@@ -0,0 +1,29 @@
+---
+ texk/tetex/fmtutil |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: texlive-bin-2012.20120530/texk/tetex/fmtutil
+===================================================================
+--- texlive-bin-2012.20120530.orig/texk/tetex/fmtutil	2012-05-30 10:54:55.000000000 +0900
++++ texlive-bin-2012.20120530/texk/tetex/fmtutil	2012-05-30 11:00:06.369603296 +0900
+@@ -3,6 +3,9 @@
+ # Public domain.  Originally written by Thomas Esser.
+ # Run with --help for usage.
+ 
++set -e
++retval=0
++
+ # program history:
+ #   further changes in texk/tetex/ChangeLog.
+ #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
+@@ -523,8 +526,8 @@
+   if test -n "$cfgmaint"; then
+     if test -z "$cfgparam"; then
+       setupTmpDir
+-      co=`tcfmgr --tmp $tmpdir --cmd co --file $cnf`
+-      test $? = 0 || cleanup 1
++      co=`tcfmgr --tmp $tmpdir --cmd co --file $cnf || retval=$?`
++      test $retval = 0 || cleanup 1
+       set x $co; shift
+       id=$1; cnf_file=$3; orig=$4
+       verboseMsg "$progname: initial config file is \`$orig'"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/texlive-bin.git