[SCM] Debian packaging for latexdiff branch, master, updated. debian/0.5-4-18-g1c1438a

[gregor herrmann]

The following commit has been merged in the master branch:
commit e0cd910771420fcde637490013140a51cfa7d00c
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Mar 20 17:30:49 2013 +0100

    Patches:
    
    Refresh 0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
    (offset),
    drop 0002-Add-equation-to-the-regular-expression-for-math-envi.patch
    (merged upstream).

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 88557ec..2d0c379 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
@@ -8,11 +8,9 @@ Thanks to Vincent Lefevre for the suggestion.
  latexdiff |   16 ++++++++++++++++
  1 files changed, 16 insertions(+), 0 deletions(-)
 
-diff --git a/latexdiff b/latexdiff
-index efceea4..0d39ab4 100755
 --- a/latexdiff
 +++ b/latexdiff
-@@ -2682,14 +2682,24 @@ author
+@@ -3291,14 +3291,24 @@ institute
  %DIF END FONTSTRIKE PREAMBLE
  
  %DIF CCHANGEBAR PREAMBLE
@@ -37,7 +35,7 @@ index efceea4..0d39ab4 100755
  \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}
-@@ -2704,7 +2714,13 @@ author
+@@ -3313,7 +3323,13 @@ institute
  %DIF END CULINECHBAR PREAMBLE
  
  %DIF CHANGEBAR PREAMBLE
@@ -51,4 +49,3 @@ index efceea4..0d39ab4 100755
  \providecommand{\DIFadd}[1]{\protect\cbstart{#1}\protect\cbend}
  \providecommand{\DIFdel}[1]{\protect\cbdelete}
  %DIF END CHANGEBAR PREAMBLE
--- 
diff --git a/debian/patches/0002-Add-equation-to-the-regular-expression-for-math-envi.patch b/debian/patches/0002-Add-equation-to-the-regular-expression-for-math-envi.patch
deleted file mode 100644
index 70a5afe..0000000
--- a/debian/patches/0002-Add-equation-to-the-regular-expression-for-math-envi.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: David Bremner <bremner at debian.org>
-Date: Sat, 11 Dec 2010 20:54:50 -0400
-Subject: [PATCH] Add equation* to the regular expression for math environments.
- Thanks to Vincent Lefevre for the suggestion.
-
----
- latexdiff |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/latexdiff b/latexdiff
-index 0d39ab4..1668083 100755
---- a/latexdiff
-+++ b/latexdiff
-@@ -57,7 +57,7 @@ my $MINWORDSBLOCK=3; # minimum number of tokens to form an independent block
-                      # shorter identical blocks will be merged to the previous word
- my $FLOATENV='(?:figure|table|plate)[\w\d*@]*' ;   # Environments in which FL variants of defined commands are used
- my $PICTUREENV='(?:picture|DIFnomarkup)[\w\d*@]*' ;   # Environments in which all change markup is removed
--my $MATHENV='(?:equation|displaymath|DOLLARDOLLAR)' ;           # Environments turning on display math mode (code also knows about \[ and \]
-+my $MATHENV='(?:equation\*?|displaymath|DOLLARDOLLAR)' ;           # Environments turning on display math mode (code also knows about \[ and \]
- my $MATHREPL='displaymath';  # Environment introducing deleted maths blocks
- my $MATHARRENV='(?:eqnarray|align|gather|multiline|flalign)[*]?' ;           # Environments turning on eqnarray math mode
- my $MATHARRREPL='eqnarray*';  # Environment introducing deleted maths blocks
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 6f66fea..7df615c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Make-the-choice-of-dvips-or-pdftex-optional-conditio.patch
-0002-Add-equation-to-the-regular-expression-for-math-envi.patch

-- 
Debian packaging for latexdiff