[SCM] Debian packaging of texlive-bin) branch, master, updated. debian/2013.20130522.30620-1-1-g98a3a13

["Norbert Preining" <preining@debian.org>]

The following commit has been merged in the master branch:
commit 98a3a133bbc7f67fb2f372e8c5623853f845bea9
Author: Norbert Preining <preining@debian.org>
Date:   Wed May 22 14:37:47 2013 +0900

    update pmpost patch to fix png/svg output, thanks to Akira Kakuto

diff --git a/debian/changelog b/debian/changelog
index 6ee4a79..dadaaef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+texlive-bin (2013.20130522.30620-2) UNRELEASED; urgency=low
+
+  * update pmpost patch to fix png/svg output, thanks to Akira Kakuto
+
+ -- Norbert Preining <preining@debian.org>  Wed, 22 May 2013 14:47:34 +0900
+
 texlive-bin (2013.20130522.30620-1) unstable; urgency=low
 
   * remove libgd and t1lib copies by removing the need to configure
@@ -5,7 +11,8 @@ texlive-bin (2013.20130522.30620-1) unstable; urgency=low
     Thanks Ondřej Surý <ondrej@debian.org> for providing the patch.
   * build with system zzlib and ice, remove embedded copies
   * remove copies of cairo, pixman which are already unused
-  * re-include pmpost building, thanks to Hironori Kitagawa
+  * re-include pmpost building, thanks to Akira Kakuto and
+    Hironori Kitagawa
 
  -- Norbert Preining <preining@debian.org>  Wed, 22 May 2013 10:07:27 +0900
 
diff --git a/debian/patches/pmpost-20130522 b/debian/patches/pmpost-20130522
index dd6cbe6..e9678b1 100644
--- a/debian/patches/pmpost-20130522
+++ b/debian/patches/pmpost-20130522
@@ -702,11 +702,11 @@
 +@y
 +  if ( ((*(mp_text_p (p)->str + k) < bc) || (*(mp_text_p (p)->str + k) > ec)) && (mp->font_id[f]==0) ) {
 +    mp_lost_warning (mp, f, *(mp_text_p (p)->str + k));
-+  } else if (mp->font_id[f]==0) {
-+    cc = char_mp_info (f, *(mp_text_p (p)->str + k));
-+  } else {
++  } else if (mp->font_id[f]!=0) {
 +    cc=char_mp_info(f,mp_lookup_ctype(mp, f,fromBUFF(mp_text_p(p)->str,limit,k)));
 +    k++;
++  } else {
++    cc = char_mp_info (f, *(mp_text_p (p)->str + k));
 +@z
 +
 +@x

-- 
Debian packaging of texlive-bin)