[Debian-hebrew-package] r802 - in /pkg/bidiv/trunk: Makefile bidiv.c debian/changelog debian/control debian/patches/ debian/patches/fribidi_019 debian/patches/series debian/rules
tzafrir at users.alioth.debian.org
tzafrir at users.alioth.debian.org
Sat Apr 10 20:45:54 UTC 2010
Author: tzafrir
Date: Sat Apr 10 20:45:53 2010
New Revision: 802
URL: http://svn.debian.org/wsvn/debian-hebrew/?sc=1&rev=802
Log:
Start separating out patches: fribidi_019
Added:
pkg/bidiv/trunk/debian/patches/
pkg/bidiv/trunk/debian/patches/fribidi_019
pkg/bidiv/trunk/debian/patches/series
Modified:
pkg/bidiv/trunk/Makefile
pkg/bidiv/trunk/bidiv.c
pkg/bidiv/trunk/debian/changelog
pkg/bidiv/trunk/debian/control
pkg/bidiv/trunk/debian/rules
Modified: pkg/bidiv/trunk/Makefile
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/Makefile?rev=802&op=diff
==============================================================================
--- pkg/bidiv/trunk/Makefile (original)
+++ pkg/bidiv/trunk/Makefile Sat Apr 10 20:45:53 2010
@@ -4,8 +4,8 @@
CC_OPT_FLAGS=-O2 -Wall
-PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `pkg-config --cflags fribidi`
-PKG_LDFLAGS=`pkg-config --libs fribidi`
+PKG_CFLAGS= $(CC_OPT_FLAGS) $(DEFS) `fribidi-config --cflags`
+PKG_LDFLAGS=`fribidi-config --libs`
all: bidiv
Modified: pkg/bidiv/trunk/bidiv.c
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/bidiv.c?rev=802&op=diff
==============================================================================
--- pkg/bidiv/trunk/bidiv.c (original)
+++ pkg/bidiv/trunk/bidiv.c Sat Apr 10 20:45:53 2010
@@ -143,9 +143,8 @@
*/
if(c1<0x80||c1>0xbf){
ungetc(c1, fp);
- fribidi_charset_to_unicode(
- FRIBIDI_CHAR_SET_ISO8859_8,
- &c, 1, &unicode_in[len]);
+ unicode_in[len]=
+ fribidi_iso8859_8_to_unicode_c(c);
} else
unicode_in[len]=((c & 037) << 6) + (c1 & 077);
newline=0;
@@ -156,9 +155,8 @@
In the future we will have a language
option, which will control this (as well
as the output encoding). */
- fribidi_charset_to_unicode(
- FRIBIDI_CHAR_SET_ISO8859_8,
- &c, 1, &unicode_in[len]);
+ unicode_in[len]=
+ fribidi_iso8859_8_to_unicode_c(c);
#else
in[len]=c;
#endif
@@ -210,11 +208,11 @@
rtl_line=0;
if(out_utf8)
- fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8,
- unicode_out, len, out);
+ fribidi_unicode_to_utf8(unicode_out, len,
+ out);
else
- fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_ISO8859_8,
- unicode_out, len, out);
+ fribidi_unicode_to_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=802&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/changelog (original)
+++ pkg/bidiv/trunk/debian/changelog Sat Apr 10 20:45:53 2010
@@ -8,13 +8,13 @@
* Update debian/copyright with some missing details (Closes: #458601)
[ Tzafrir Cohen ]
- * Fix bidiv for fribidi 0.19 (Closes: #568130, #571351).
+ * Patch fribidi_019: Fix bidiv for fribidi 0.19 (Closes: #568130, #571351).
* Add myself as uploader.
* Standards version 3.8.4 (no change needed).
* Correct path to license file in debian/copyright.
- * Missing ${misc:Depends} debhelper deps.
+ * Missing ${misc:Depends} debhelper deps.
- -- Tzafrir Cohen <tzafrir at debian.org> Sat, 10 Apr 2010 23:35:39 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org> Sat, 10 Apr 2010 23:44:14 +0300
bidiv (1.5-3) unstable; urgency=low
Modified: pkg/bidiv/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/control?rev=802&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/control (original)
+++ pkg/bidiv/trunk/debian/control Sat Apr 10 20:45:53 2010
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Hebrew Packaging Team <debian-hebrew-package at lists.alioth.debian.org>
Uploaders: Baruch Even <baruch at debian.org>, Lior Kaplan <kaplan at debian.org>, Shachar Shemesh <shachar at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
-Build-Depends: debhelper (>> 5.0.0), cdbs, libfribidi-dev, pkg-config
+Build-Depends: debhelper (>> 5.0.0), cdbs, quilt, libfribidi-dev, pkg-config
Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/debian-hebrew/pkg/bidiv
Vcs-Browser: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv
Added: pkg/bidiv/trunk/debian/patches/fribidi_019
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/fribidi_019?rev=802&op=file
==============================================================================
--- pkg/bidiv/trunk/debian/patches/fribidi_019 (added)
+++ pkg/bidiv/trunk/debian/patches/fribidi_019 Sat Apr 10 20:45:53 2010
@@ -1,0 +1,55 @@
+--- a/Makefile.orig 2008-02-19 15:21:53.000000000 +0200
++++ b/Makefile 2008-02-19 15:22:05.000000000 +0200
+@@ -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
+
+--- a/bidiv.c.orig 2008-02-19 15:26:53.000000000 +0200
++++ b/bidiv.c 2008-02-19 19:17:23.000000000 +0200
+@@ -136,8 +136,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;
+@@ -148,8 +149,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
+@@ -201,11 +203,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.
Added: pkg/bidiv/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/patches/series?rev=802&op=file
==============================================================================
--- pkg/bidiv/trunk/debian/patches/series (added)
+++ pkg/bidiv/trunk/debian/patches/series Sat Apr 10 20:45:53 2010
@@ -1,0 +1,1 @@
+fribidi_019
Modified: pkg/bidiv/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-hebrew/pkg/bidiv/trunk/debian/rules?rev=802&op=diff
==============================================================================
--- pkg/bidiv/trunk/debian/rules (original)
+++ pkg/bidiv/trunk/debian/rules Sat Apr 10 20:45:53 2010
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
DEB_MAKE_INSTALL_TARGET=install PREFIX=$(DEB_DESTDIR)/usr
More information about the Debian-hebrew-package
mailing list