[Debian-hebrew-package] r799 - in /pkg/bidiv/trunk: Makefile bidiv.c debian/changelog

[tzafrir at users.alioth.debian.org]

Author: tzafrir
Date: Sat Apr 10 20:22:51 2010
New Revision: 799

URL: http://svn.debian.org/wsvn/debian-hebrew/?sc=1&rev=799
Log:
Fix bidiv for fribidi 0.19 (Closes: #568130, #571351).

Modified:
    pkg/bidiv/trunk/Makefile
    pkg/bidiv/trunk/bidiv.c
    pkg/bidiv/trunk/debian/changelog

Modified: pkg/bidiv/trunk/Makefile
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/Makefile?rev=799&op=diff
==============================================================================
--- pkg/bidiv/trunk/Makefile (original)
+++ pkg/bidiv/trunk/Makefile Sat Apr 10 20:22:51 2010
@@ -4,8 +4,8 @@
 CC_OPT_FLAGS=-O2 -Wall
 
 
-PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
-PKG_LDFLAGS=`fribidi-config --libs`
+PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `pkg-config --cflags fribidi`
+PKG_LDFLAGS=`pkg-config --libs fribidi`
 
 all: bidiv
 

Modified: pkg/bidiv/trunk/bidiv.c
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/bidiv.c?rev=799&op=diff
==============================================================================
--- pkg/bidiv/trunk/bidiv.c (original)
+++ pkg/bidiv/trunk/bidiv.c Sat Apr 10 20:22:51 2010
@@ -143,8 +143,9 @@
 				*/
 				if(c1<0x80||c1>0xbf){
 					ungetc(c1, fp);
-					unicode_in[len]=
-						fribidi_iso8859_8_to_unicode_c(c);
+					fribidi_charset_to_unicode(
+						FRIBIDI_CHAR_SET_ISO8859_8,
+						&c, 1, &unicode_in[len]);
 				} else
 				unicode_in[len]=((c & 037) << 6) + (c1 & 077);
 				newline=0;
@@ -155,8 +156,9 @@
 				   In the future we will have a language
 				   option, which will control this (as well
 				   as the output encoding). */
-				unicode_in[len]=
-					fribidi_iso8859_8_to_unicode_c(c);
+				fribidi_charset_to_unicode(
+					FRIBIDI_CHAR_SET_ISO8859_8,
+					&c, 1, &unicode_in[len]);
 #else
 				in[len]=c;
 #endif
@@ -208,11 +210,11 @@
 			rtl_line=0;
 
 		if(out_utf8)
-			fribidi_unicode_to_utf8(unicode_out, len,
-					     out);
+			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8,
+					unicode_out, len, out);
 		else
-			fribidi_unicode_to_iso8859_8(unicode_out, len,
-						     out);
+			fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8,
+				unicode_out, len, out);
 		/* if rtl_line (i.e., base_dir is RL), and we didn't fill the
 		   entire width, we need to pad with spaces. Maybe in the
 		   future this should be an option.

Modified: pkg/bidiv/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/changelog?rev=799&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/changelog (original)
+++ pkg/bidiv/trunk/debian/changelog Sat Apr 10 20:22:51 2010
@@ -7,7 +7,10 @@
   [ Lior Kaplan ]
   * Update debian/copyright with some missing details (Closes: #458601)
 
- -- Baruch Even <baruch at debian.org>  Sat, 29 Dec 2007 13:47:36 +0200
+  [ Tzafrir Cohen ]
+  * Fix bidiv for fribidi 0.19 (Closes: #568130, #571351).
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 10 Apr 2010 23:19:03 +0300
 
 bidiv (1.5-3) unstable; urgency=low