[Debian-hebrew-package] [svn] r255 - in pkg/pyfribidi/trunk: .
debian
Baruch Even
baruch at costa.debian.org
Thu Dec 1 00:34:58 UTC 2005
Author: baruch
Date: Thu Dec 1 00:34:57 2005
New Revision: 255
Modified:
pkg/pyfribidi/trunk/aclocal.m4
pkg/pyfribidi/trunk/configure
pkg/pyfribidi/trunk/configure.in
pkg/pyfribidi/trunk/debian/changelog
pkg/pyfribidi/trunk/pyfribidi.c
pkg/pyfribidi/trunk/setup.py
Log:
Commit merge of version 0.3.4 to debian
Modified: pkg/pyfribidi/trunk/aclocal.m4
==============================================================================
--- pkg/pyfribidi/trunk/aclocal.m4 (original)
+++ pkg/pyfribidi/trunk/aclocal.m4 Thu Dec 1 00:34:57 2005
@@ -1009,7 +1009,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
+ _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -1045,30 +1045,14 @@
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
- fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
@@ -1090,30 +1074,19 @@
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
+[Package requirements ($2) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details.])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -1121,7 +1094,9 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-_PKG_TEXT
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
Modified: pkg/pyfribidi/trunk/configure
==============================================================================
--- pkg/pyfribidi/trunk/configure (original)
+++ pkg/pyfribidi/trunk/configure Thu Dec 1 00:34:57 2005
@@ -1460,7 +1460,7 @@
PACKAGE=pyfribidi
-VERSION=0.3.3
+VERSION=0.3.4
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
@@ -3615,9 +3615,6 @@
echo $ECHO_N "checking for fribidi... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
- if test -n "$fribidi_CFLAGS"; then
- pkg_cv_fribidi_CFLAGS="$fribidi_CFLAGS"
- else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fribidi\"") >&5
($PKG_CONFIG --exists --print-errors "fribidi") 2>&5
@@ -3628,14 +3625,10 @@
else
pkg_failed=yes
fi
- fi
else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
- if test -n "$fribidi_LIBS"; then
- pkg_cv_fribidi_LIBS="$fribidi_LIBS"
- else
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fribidi\"") >&5
($PKG_CONFIG --exists --print-errors "fribidi") 2>&5
@@ -3646,59 +3639,38 @@
else
pkg_failed=yes
fi
- fi
else
pkg_failed=untried
fi
-
-
if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- fribidi_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fribidi"`
- else
- fribidi_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fribidi"`
- fi
+ fribidi_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fribidi"`
# Put the nasty error message in config.log where it belongs
- echo "$fribidi_PKG_ERRORS" >&5
-
- { { echo "$as_me:$LINENO: error: Package requirements (fribidi) were not met:
-
-$fribidi_PKG_ERRORS
+ echo "$fribidi_PKG_ERRORS" 1>&5
+ { { echo "$as_me:$LINENO: error: Package requirements (fribidi) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables fribidi_CFLAGS
-and fribidi_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (fribidi) were not met:
-
-$fribidi_PKG_ERRORS
-
+Alternatively you may set the fribidi_CFLAGS and fribidi_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details." >&5
+echo "$as_me: error: Package requirements (fribidi) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables fribidi_CFLAGS
-and fribidi_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
+Alternatively you may set the fribidi_CFLAGS and fribidi_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details." >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables fribidi_CFLAGS
-and fribidi_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+Alternatively you may set the fribidi_CFLAGS and fribidi_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&5
@@ -3706,9 +3678,9 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables fribidi_CFLAGS
-and fribidi_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+Alternatively you may set the fribidi_CFLAGS and fribidi_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
See \`config.log' for more details." >&2;}
Modified: pkg/pyfribidi/trunk/configure.in
==============================================================================
--- pkg/pyfribidi/trunk/configure.in (original)
+++ pkg/pyfribidi/trunk/configure.in Thu Dec 1 00:34:57 2005
@@ -1,6 +1,6 @@
AC_INIT(pyfribidi.c)
-AM_INIT_AUTOMAKE(pyfribidi, 0.3.3)
+AM_INIT_AUTOMAKE(pyfribidi, 0.3.4)
AC_ISC_POSIX
AC_PROG_CC
Modified: pkg/pyfribidi/trunk/debian/changelog
==============================================================================
--- pkg/pyfribidi/trunk/debian/changelog (original)
+++ pkg/pyfribidi/trunk/debian/changelog Thu Dec 1 00:34:57 2005
@@ -1,3 +1,15 @@
+pyfribidi (0.3.4-1) UNRELEASED; urgency=low
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Baruch Even <baruch at debian.org> Thu, 1 Dec 2005 00:33:51 +0000
+
+pyfribidi (0.3.3-2) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+
+ -- Baruch Even <baruch at debian.org> Sat, 26 Nov 2005 18:10:10 +0000
+
pyfribidi (0.3.3-1) unstable; urgency=low
* Initial Release (Closes: #340088)
Modified: pkg/pyfribidi/trunk/pyfribidi.c
==============================================================================
--- pkg/pyfribidi/trunk/pyfribidi.c (original)
+++ pkg/pyfribidi/trunk/pyfribidi.c Thu Dec 1 00:34:57 2005
@@ -69,7 +69,9 @@
return NULL;
/* check for base dir */
- if (strcmp (base_dir_string, "RTL") == 0)
+ if (base_dir_string == NULL)
+ simple_log2vis (instring, outstring, FRIBIDI_TYPE_RLE);
+ else if (strcmp (base_dir_string, "RTL") == 0)
simple_log2vis (instring, outstring, FRIBIDI_TYPE_RLE);
else if (strcmp (base_dir_string, "LTR") == 0)
simple_log2vis (instring, outstring, FRIBIDI_TYPE_LTR);
Modified: pkg/pyfribidi/trunk/setup.py
==============================================================================
--- pkg/pyfribidi/trunk/setup.py (original)
+++ pkg/pyfribidi/trunk/setup.py Thu Dec 1 00:34:57 2005
@@ -21,7 +21,7 @@
return l
setup (name = "pyfribidi",
- version = "0.3.3",
+ version = "0.3.4",
description = "Python libfribidi interface",
author = "Yaacov Zamir",
author_email = "kzamir at walla.co.il",
More information about the Debian-hebrew-package
mailing list