[latexdiff] 04/10: Update patches.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository latexdiff.

commit 3290237ce6fcafea40220a4ae7dea24369ba0660
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Aug 2 16:52:33 2014 +0200

    Update patches.
    
    Refresh 0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
    (offset). Drop file-copy.patch and pod-error.patch (applied upstream).
---
 ...oice-of-dvips-or-pdftex-optional-conditio.patch |  4 +-
 debian/patches/file-copy.patch                     | 54 ----------------------
 debian/patches/pod-error.patch                     | 16 -------
 debian/patches/series                              |  2 -
 4 files changed, 2 insertions(+), 74 deletions(-)

diff --git a/debian/patches/0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch b/debian/patches/0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
index 2d0c379..a4bf657 100644
--- a/debian/patches/0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
+++ b/debian/patches/0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
@@ -10,7 +10,7 @@ Thanks to Vincent Lefevre for the suggestion.
 
 --- a/latexdiff
 +++ b/latexdiff
-@@ -3291,14 +3291,24 @@ institute
+@@ -3412,14 +3412,24 @@ institute
  %DIF END FONTSTRIKE PREAMBLE
  
  %DIF CCHANGEBAR PREAMBLE
@@ -35,7 +35,7 @@ Thanks to Vincent Lefevre for the suggestion.
  \RequirePackage{color}\definecolor{RED}{rgb}{1,0,0}\definecolor{BLUE}{rgb}{0,0,1}
  \providecommand{\DIFadd}[1]{\protect\cbstart{\protect\color{blue}\sf #1}\protect\cbend}
  \providecommand{\DIFdel}[1]{\protect\cbdelete{\protect\color{red}\scriptsize #1}\protect\cbdelete}
-@@ -3313,7 +3323,13 @@ institute
+@@ -3434,7 +3444,13 @@ institute
  %DIF END CULINECHBAR PREAMBLE
  
  %DIF CHANGEBAR PREAMBLE
diff --git a/debian/patches/file-copy.patch b/debian/patches/file-copy.patch
deleted file mode 100644
index 3a9336c..0000000
--- a/debian/patches/file-copy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 86f23f649ed5ff60fbb3c5cd57d5243955b8a841 Mon Sep 17 00:00:00 2001
-From: David Bremner <bremner at debian.org>
-Date: Thu, 2 May 2013 21:42:37 -0300
-Subject: [PATCH] replace use of system("cp ...") with File::Copy
-
-Bug: https://developer.berlios.de/bugs/?func=detailbug&bug_id=18995&group_id=13015
-
-This had to be patched in any case because the original "\cp" is
-passing a control-p character to the shell.  I decided to replace it
-wiht File::Copy to avoid an extra shell process and also to hopefully
-be a bit more portable. File::Copy has been in core since 5.002
-(i.e. forever) so it should not be a problem.
----
- latexdiff-vc | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/latexdiff-vc b/latexdiff-vc
-index 16b0dea..9881f25 100755
---- a/latexdiff-vc
-+++ b/latexdiff-vc
-@@ -38,6 +38,8 @@ use Getopt::Long ;
- use Pod::Usage qw/pod2usage/ ;
- use File::Temp qw/tempdir/ ;
- use File::Basename qw/dirname/;
-+use File::Copy;
-+
- use strict ;
- use warnings ;
- 
-@@ -233,7 +235,7 @@ while ( $infile=$file2=shift @files ) {
-     ### system("$diffcmd$revs[0] $infile| $patchcmd -o$file1") ;
-     if (system("$diffcmd$revs[0] $infile | $patchcmd -o$file1")==0  and -z $file1 ) {
-       # no differences detected, i.e. file is equal to current version
--      system("\cp $infile $file1");
-+      copy($infile,$file1) || die "copy failed: $!";
-     }
-   } elsif ( scalar(@revs) == 2 ) {
-     ($file1=$infile) =~ s/\.(tex|bbl)/-oldtmp-$$.$1/ ;
-@@ -241,10 +243,10 @@ while ( $infile=$file2=shift @files ) {
-     push @tmpfiles,$file2;
-       ;
-     if (system("$diffcmd$revs[1] $infile | $patchcmd -o$file2")==0 and -z $file2 ) {
--      system("\cp $infile $file2");
-+      copy($infile,$file2) || die "copy failed: $!";
-     }
-     if (system("$diffcmd$revs[0] $infile | $patchcmd -o$file1")==0 and -z $file1 ) {
--	system("\cp $infile $file1");
-+      copy($infile,$file1) || die "copy failed: $!";
-     };
-   }
- 
--- 
-1.8.2.rc2
-
diff --git a/debian/patches/pod-error.patch b/debian/patches/pod-error.patch
deleted file mode 100644
index 9d30d48..0000000
--- a/debian/patches/pod-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix POD error
-Origin: vendor
-Forwarded: no
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-03-20
-
---- a/latexdiff
-+++ b/latexdiff
-@@ -2686,6 +2686,7 @@
- =head2 Miscellaneous
- 
- =over 4
-+
- =item B<--verbose> or B<-V>
- 
- Output various status information to stderr during processing.
diff --git a/debian/patches/series b/debian/patches/series
index a8aac34..7df615c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
-pod-error.patch
-file-copy.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/latexdiff.git