[Debian-hebrew-package] [svn] r325 - in pkg/hspell-gui/trunk: .
debian po src
Baruch Even
baruch at costa.debian.org
Sun Jan 15 22:04:09 UTC 2006
Author: baruch
Date: Sun Jan 15 22:04:08 2006
New Revision: 325
Added:
pkg/hspell-gui/trunk/po/sv.gmo
- copied unchanged from r324, pkg/hspell-gui/branches/upstream/current/po/sv.gmo
pkg/hspell-gui/trunk/po/sv.po
- copied unchanged from r324, pkg/hspell-gui/branches/upstream/current/po/sv.po
Removed:
pkg/hspell-gui/trunk/debian/Makefile.am
pkg/hspell-gui/trunk/debian/Makefile.in
Modified:
pkg/hspell-gui/trunk/Makefile.am
pkg/hspell-gui/trunk/Makefile.in
pkg/hspell-gui/trunk/aclocal.m4
pkg/hspell-gui/trunk/configure
pkg/hspell-gui/trunk/configure.in
pkg/hspell-gui/trunk/debian/changelog
pkg/hspell-gui/trunk/po/Makefile.in.in
pkg/hspell-gui/trunk/src/Makefile.in
pkg/hspell-gui/trunk/stamp-h.in
Log:
Merge upstream hspell-gui 0.2.6 to debian package trunk
Modified: pkg/hspell-gui/trunk/Makefile.am
==============================================================================
--- pkg/hspell-gui/trunk/Makefile.am (original)
+++ pkg/hspell-gui/trunk/Makefile.am Sun Jan 15 22:04:08 2006
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src po debian
+SUBDIRS = src po
EXTRA_DIST = \
autogen.sh \
Modified: pkg/hspell-gui/trunk/Makefile.in
==============================================================================
--- pkg/hspell-gui/trunk/Makefile.in (original)
+++ pkg/hspell-gui/trunk/Makefile.in Sun Jan 15 22:04:08 2006
@@ -85,7 +85,7 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-SUBDIRS = src po debian
+SUBDIRS = src po
EXTRA_DIST = autogen.sh hspell-gui-0.2.2-0.spec hspell-applet.server.in.in hspell_gui.glade hspell_gui.gladep hspell-gui-heb
Modified: pkg/hspell-gui/trunk/aclocal.m4
==============================================================================
--- pkg/hspell-gui/trunk/aclocal.m4 (original)
+++ pkg/hspell-gui/trunk/aclocal.m4 Sun Jan 15 22:04:08 2006
@@ -1153,7 +1153,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+ _pkg_min_version=m4_default([$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])
@@ -1165,29 +1165,61 @@
fi[]dnl
])# PKG_PROG_PKG_CONFIG
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
- pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
-elif test -n "$PKG_CONFIG"; then
- if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then
- pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+[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])
#
#
# Note that if there is a possibility the first call to
# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.in
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
#
#
# --------------------------------------------------------------
@@ -1197,24 +1229,35 @@
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
pkg_failed=no
-AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS],
- [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])])
-AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS],
- [_PKG_CONFIG([$1][_LIBS], [libs], [$2])])
+AC_MSG_CHECKING([for $1])
+
+_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
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ _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
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-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.])],
+_PKG_TEXT
+])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -1222,15 +1265,14 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-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.
+_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
ifelse([$3], , :, [$3])
fi[]dnl
])# PKG_CHECK_MODULES
Modified: pkg/hspell-gui/trunk/configure
==============================================================================
--- pkg/hspell-gui/trunk/configure (original)
+++ pkg/hspell-gui/trunk/configure Sun Jan 15 22:04:08 2006
@@ -1507,7 +1507,7 @@
PACKAGE=hspell-gui
-VERSION=0.2.5
+VERSION=0.2.6
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
@@ -3983,81 +3983,94 @@
fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for PACKAGE_CFLAGS" >&5
-echo $ECHO_N "checking for PACKAGE_CFLAGS... $ECHO_C" >&6
-if test "${pkg_cv_PACKAGE_CFLAGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$ac_cv_env_PACKAGE_CFLAGS_set" = "xset"; then
- pkg_cv_PACKAGE_CFLAGS=$ac_cv_env_PACKAGE_CFLAGS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"\$pkg_modules\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "$pkg_modules" >/dev/null 2>&1) 2>&5
+echo "$as_me:$LINENO: checking for PACKAGE" >&5
+echo $ECHO_N "checking for PACKAGE... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PACKAGE_CFLAGS"; then
+ pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+ pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null`
else
- pkg_failed=untried
+ pkg_failed=yes
fi
-fi
-echo "$as_me:$LINENO: result: $pkg_cv_PACKAGE_CFLAGS" >&5
-echo "${ECHO_T}$pkg_cv_PACKAGE_CFLAGS" >&6
-echo "$as_me:$LINENO: checking for PACKAGE_LIBS" >&5
-echo $ECHO_N "checking for PACKAGE_LIBS... $ECHO_C" >&6
-if test "${pkg_cv_PACKAGE_LIBS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
else
- if test "x$ac_cv_env_PACKAGE_LIBS_set" = "xset"; then
- pkg_cv_PACKAGE_LIBS=$ac_cv_env_PACKAGE_LIBS_value
-elif test -n "$PKG_CONFIG"; then
- if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"\$pkg_modules\" >/dev/null 2>&1") >&5
- ($PKG_CONFIG --exists "$pkg_modules" >/dev/null 2>&1) 2>&5
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$PACKAGE_LIBS"; then
+ pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
- else
- pkg_failed=yes
- fi
+ pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null`
else
- pkg_failed=untried
+ pkg_failed=yes
fi
+ fi
+else
+ pkg_failed=untried
fi
-echo "$as_me:$LINENO: result: $pkg_cv_PACKAGE_LIBS" >&5
-echo "${ECHO_T}$pkg_cv_PACKAGE_LIBS" >&6
+
+
if test $pkg_failed = yes; then
- PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
+
+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
+ PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"`
+ else
+ PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$PACKAGE_PKG_ERRORS" 1>&5
+ echo "$PACKAGE_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements ($pkg_modules) were not met:
+
+$PACKAGE_PKG_ERRORS
- { { echo "$as_me:$LINENO: error: Package requirements ($pkg_modules) 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 PACKAGE_CFLAGS and PACKAGE_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 ($pkg_modules) were not met.
+Alternatively, you may set the environment variables PACKAGE_CFLAGS
+and PACKAGE_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 ($pkg_modules) were not met:
+
+$PACKAGE_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the PACKAGE_CFLAGS and PACKAGE_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details." >&2;}
+Alternatively, you may set the environment variables PACKAGE_CFLAGS
+and PACKAGE_LIBS 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 PACKAGE_CFLAGS and PACKAGE_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables PACKAGE_CFLAGS
+and PACKAGE_LIBS 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
@@ -4065,9 +4078,9 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the PACKAGE_CFLAGS and PACKAGE_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables PACKAGE_CFLAGS
+and PACKAGE_LIBS 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;}
@@ -4075,6 +4088,8 @@
else
PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
:
fi
@@ -4087,7 +4102,7 @@
_ACEOF
-ALL_LINGUAS="he"
+ALL_LINGUAS="he sv"
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -5715,7 +5730,7 @@
LIBEXECDIR=${prefix}/libexec
- ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in debian/Makefile"
+ ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -6255,7 +6270,6 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "debian/Makefile" ) CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
Modified: pkg/hspell-gui/trunk/configure.in
==============================================================================
--- pkg/hspell-gui/trunk/configure.in (original)
+++ pkg/hspell-gui/trunk/configure.in Sun Jan 15 22:04:08 2006
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(hspell-gui, 0.2.5)
+AM_INIT_AUTOMAKE(hspell-gui, 0.2.6)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -20,7 +20,7 @@
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
dnl Add the languages which your application supports here.
-ALL_LINGUAS="he"
+ALL_LINGUAS="he sv"
AM_GLIB_GNU_GETTEXT
LIBEXECDIR=${prefix}/libexec
@@ -29,5 +29,4 @@
Makefile
src/Makefile
po/Makefile.in
-debian/Makefile
])
Modified: pkg/hspell-gui/trunk/debian/changelog
==============================================================================
--- pkg/hspell-gui/trunk/debian/changelog (original)
+++ pkg/hspell-gui/trunk/debian/changelog Sun Jan 15 22:04:08 2006
@@ -1,3 +1,10 @@
+hspell-gui (0.2.6-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + Added swedish translation (Closes: #348204)
+
+ -- Baruch Even <baruch at debian.org> Sun, 15 Jan 2006 22:02:57 +0000
+
hspell-gui (0.2.5-1) unstable; urgency=low
* New upstream version (Closes: #310610)
Modified: pkg/hspell-gui/trunk/po/Makefile.in.in
==============================================================================
--- pkg/hspell-gui/trunk/po/Makefile.in.in (original)
+++ pkg/hspell-gui/trunk/po/Makefile.in.in Sun Jan 15 22:04:08 2006
@@ -78,7 +78,7 @@
.po.gmo:
file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
- && rm -f $$file && $(GMSGFMT) -o $$file $<
+ && rm -f $$file && $(GMSGFMT) -c -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
@@ -93,6 +93,21 @@
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
+ --flag=g_strdup_printf:1:c-format \
+ --flag=g_string_printf:2:c-format \
+ --flag=g_string_append_printf:2:c-format \
+ --flag=g_error_new:3:c-format \
+ --flag=g_set_error:4:c-format \
+ --flag=g_markup_printf_escaped:1:c-format \
+ --flag=g_log:3:c-format \
+ --flag=g_print:1:c-format \
+ --flag=g_printerr:1:c-format \
+ --flag=g_printf:1:c-format \
+ --flag=g_fprintf:2:c-format \
+ --flag=g_sprintf:2:c-format \
+ --flag=g_snprintf:3:c-format \
+ --flag=g_scanner_error:2:c-format \
+ --flag=g_scanner_warn:2:c-format \
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(GETTEXT_PACKAGE).po \
|| ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \
Modified: pkg/hspell-gui/trunk/src/Makefile.in
==============================================================================
--- pkg/hspell-gui/trunk/src/Makefile.in (original)
+++ pkg/hspell-gui/trunk/src/Makefile.in Sun Jan 15 22:04:08 2006
@@ -308,6 +308,11 @@
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+callbacks.o: callbacks.c ../config.h callbacks.h interface.h support.h
+hspell-applet.o: hspell-applet.c ../config.h
+interface.o: interface.c ../config.h callbacks.h interface.h support.h
+main.o: main.c ../config.h interface.h callbacks.h support.h
+support.o: support.c ../config.h support.h
info-am:
info: info-am
Modified: pkg/hspell-gui/trunk/stamp-h.in
==============================================================================
--- pkg/hspell-gui/trunk/stamp-h.in (original)
+++ pkg/hspell-gui/trunk/stamp-h.in Sun Jan 15 22:04:08 2006
@@ -0,0 +1 @@
+timestamp
More information about the Debian-hebrew-package
mailing list