diff -Nru gedit-plugins-2.26.1/aclocal.m4 gedit-plugins-2.26.2/aclocal.m4 --- gedit-plugins-2.26.1/aclocal.m4 2009-04-11 11:43:37.000000000 +0100 +++ gedit-plugins-2.26.2/aclocal.m4 2009-05-17 00:32:18.000000000 +0100 @@ -19,6 +19,196 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ(2.50) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _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]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +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 -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.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +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 + _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" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[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. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[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. + +_PKG_TEXT + +To get pkg-config, see .])], + [$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 + # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -310,59 +500,61 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 4 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[# Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -830,7 +1022,13 @@ dnl doesn't work. AC_CACHE_CHECK([for $am_display_PYTHON script directory], [am_cv_python_pythondir], - [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || + [if test "x$prefix" = xNONE + then + py_prefix_arg= + else + py_prefix_arg=",prefix='$prefix'" + fi + am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) @@ -847,8 +1045,14 @@ dnl doesn't work. AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], [am_cv_python_pyexecdir], - [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`]) + [if test "x$exec_prefix" = xNONE + then + py_exec_prefix_arg=$py_prefix_arg + else + py_exec_prefix_arg=",prefix='$exec_prefix'" + fi + am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) @@ -1085,194 +1289,6 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _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]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -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 -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - 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.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -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 - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[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. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[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. - -_PKG_TEXT - -To get pkg-config, see .])], - [$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 - dnl AM_GCONF_SOURCE_2 dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas dnl (i.e. pass to gconftool-2 @@ -1309,10 +1325,11 @@ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) AC_ARG_ENABLE(schemas-install, - [ --disable-schemas-install Disable the schemas installation], + AC_HELP_STRING([--disable-schemas-install], + [Disable the schemas installation]), [case ${enableval} in yes|no) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; esac]) AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ]) @@ -1750,7 +1767,6 @@ fi]) -m4_include([m4/gnome-doc-utils.m4]) m4_include([m4/intltool.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/ChangeLog /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/ChangeLog --- gedit-plugins-2.26.1/ChangeLog 2009-04-11 11:44:53.000000000 +0100 +++ gedit-plugins-2.26.2/ChangeLog 2009-05-17 00:32:40.000000000 +0100 @@ -1,975 +0,0 @@ -==== gedit-plugins 2.26.1 ==== - -2009-04-11 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.26.1 released. - -2009-03-31 Ignacio Casal Quinteiro - - * plugins/drawspaces/gedit-drawspaces-plugin.c: - Draw spaces should be enabled first time the plugin is activated. - -2009-03-29 Ignacio Casal Quinteiro - - * plugins/drawspaces/gedit-drawspaces-plugin.c: - Remove the gconf notification on dispose. (Fixes bug #576766). - -==== gedit-plugins 2.26.0 ==== - -2009-03-16 Ignacio Casal Quinteiro - - * configure.ac: - * NEWS: - * README: - gedit-plugins 2.26.0 released. - -==== gedit-plugins 2.25.3 ==== - -2009-02-23 Ignacio Casal Quinteiro - - * configure.ac: - * NEWS: - * README: - gedit-plugins 2.25.3 released. - -2009-02-01 Ignacio Casal Quinteiro - - * plugins/bookmarks/gedit-bookmarks-plugin.c: - Use slice instead of g_new. - -2009-01-17 Ignacio Casal Quinteiro - - * plugins/terminal/terminal.py: - Built-in terminal should reuse gnome-terminal color scheme. - (Fixes bug #567629) - -2009-01-06 Ignacio Casal Quinteiro - - * configure.ac: - Bump gedit to 2.25.4. - -2009-01-05 Ignacio Casal Quinteiro - - * plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in.in: - * plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in.in: - * plugins/smartspaces/smartspaces.gedit-plugin.desktop.in.in: - * plugins/bookmarks/bookmarks.gedit-plugin.desktop.in.in: - * plugins/joinlines/joinlines.gedit-plugin.desktop.in.in: - * plugins/charmap/charmap.gedit-plugin.desktop.in.in: - * plugins/terminal/terminal.gedit-plugin.desktop.in.in: - * plugins/colorpicker/colorpicker.gedit-plugin.desktop.in.in: - * plugins/drawspaces/drawspaces.gedit-plugin.desktop.in.in: - * plugins/showtabbar/showtabbar.gedit-plugin.desktop.in.in: - * plugins/codecomment/codecomment.gedit-plugin.desktop.in.in: - * configure.ac: - * po/POTFILES.in: - * po/POTFILES.skip: - Add new Version property to plugins. - -==== gedit-plugins 2.25.2 ==== - -2009-01-05 Ignacio Casal Quinteiro - - * NEWS: - * README: - gedit-plugins 2.25.2 released. - -2009-01-05 Ignacio Casal Quinteiro - - * plugins/bookmarks/Makefile.am: - Add icon to distribution. - -2009-01-05 Ignacio Casal Quinteiro - - * plugins/bracketcompletion/bracketcompletion.py: - Skip closing brackets. (Fixes bug #566557). - -2009-01-03 Jesse van den Kieboom - - * plugins/sessionsaver/Makefile.am: - * plugins/sessionsaver/dialogs.py: - * plugins/bookmarks/Makefile.am: - * plugins/charmap/Makefile.am: - * plugins/drawspaces/gedit-drawspaces-plugin.c: - * plugins/drawspaces/Makefile.am: - * plugins/showtabbar/Makefile.am: - - Makefile cleanup and use get_data_dir() where applicable (also install - data in correct data directory now) - -2009-01-03 Jesse van den Kieboom - - * configure.ac: bump version of gedit to 2.25.3 to make use of - gedit_plugin_get_data_dir. - -2009-01-03 Jesse van den Kieboom - - * configure.ac: bump version of gedit to 2.25.3 to make use of - gedit_plugin_get_data_dir. - -2009-01-03 Jesse van den Kieboom - - * plugins/sessionsaver/Makefile.am: - * plugins/bracketcompletion/Makefile.am: - * plugins/smartspaces/Makefile.am: - * plugins/joinlines/Makefile.am: - * plugins/charmap/Makefile.am: - * plugins/terminal/Makefile.am: - * plugins/colorpicker/Makefile.am: - * plugins/drawspaces/Makefile.am: - * plugins/showtabbar/Makefile.am: - * plugins/codecomment/Makefile.am: - - Updated to use $(GEDIT_PLUGINS_LIBS_DIR). - -2009-01-03 Jesse van den Kieboom - - * configure.ac: - * plugins/bookmarks: - - Added new bookmarks plugin. - -2009-01-02 Jesse van den Kieboom - - * plugins/bracketcompletion/bracketcompletion.py: added completion - for <> for php. - -2008-12-28 Ignacio Casal Quinteiro - - * configure.ac: Bump gtksourceview to 2.5.1 - - * plugins/drawspaces/gedit-drawspaces-plugin.c: - * plugins/drawspaces/drawspaces.glade: - * plugins/drawspaces/drawspaces.ui: - Update drawspaces to show non breaking spaces. - -2008-12-26 Paolo Borelli - - * configure.ac: use pkg-config to check for pyvte. - -==== gedit-plugins 2.25.1 ==== - -2008-12-02 Ignacio Casal Quinteiro - - * configure.ac: - * NEWS: - * README: - gedit-plugins 2.25.1 released. - -2008-12-02 Ignacio Casal Quinteiro - - * configure.ac: - Forgot this file in the previous commit. - -2008-12-02 Ignacio Casal Quinteiro - - * configure.ac: - * plugins/charmap/gedit-charmap-plugin.c: - * plugins/charmap/gedit-charmap-panel.c: - * plugins/charmap/gedit-charmap-panel.h: - Only support gucharmap 2. - -2008-11-30 Paolo Borelli - - * plugins/drawspaces/gedit-drawspaces-plugin.c: plug leak. - -2008-11-30 Paolo Borelli - - * configure.ac: require gconf, remove wrong python test. - -2008-11-30 Paolo Borelli - - * plugins/terminal: use vte api to set cursor shape and blink mode. - -2008-11-23 Ignacio Casal Quinteiro - - * plugins/terminal/terminal.py: - * configure.ac: - Ported to gio. Bump pygtk and pygobject. - -2008-11-23 Ignacio Casal Quinteiro - - * plugins/sessionsaver/sessionsaver.ui: - * plugins/sessionsaver/__init__.py: - * plugins/sessionsaver/Makefile.am: - * plugins/sessionsaver/dialogs.py: - * configure.ac: - Ported to gtkbuilder. (Fixes bug #561948). - -2008-11-23 Ignacio Casal Quinteiro - - * plugins/drawspaces/gedit-drawspaces-plugin.c: - * plugins/drawspaces/drawspaces.gedit-plugin.desktop.in: - Removed useless variable. - -2008-11-22 Ignacio Casal Quinteiro - - * configure.ac: bump gtksourceview, gtk+, glib and gedit deps. - -2008-11-22 Paolo Borelli - - * plugins/drawspaces: new implementation of the drawspaces plugin - using the appropriate gtksourceview api. - * configure.ac: bump gtksourceview dep - -2008-11-02 Paolo Borelli - - * configure.ac: - Build fixes for cygwin. Bug #317567. - -==== gedit-plugins 2.22.5 ==== - -2008-10-25 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.22.5 released. - -2008-10-25 Paolo Borelli - - * plugins/drawspaces/drawspaces.py: draw some more kind of spaces. - -2008-10-25 Paolo Borelli - - * plugins/charmap/gedit-charmap-plugin.c: use the correct API for - the new charmap lib. Bug #557598, patch by Christophe Sauthier. - -==== gedit-plugins 2.22.4 ==== - -2008-10-16 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.22.4 released. - -2008-10-16 Paolo Borelli - - * plugins/terminal/terminal.py: take into account the gnome-terminal - setting of using the default theme and properly track color scheme - changes. Based on a path by Fabricio Silva, bug #556473. - -2008-09-24 Ignacio Casal Quinteiro - - * plugins/charmap/gedit-charmap-plugin.c: - Fixed compile warning. - -==== gedit-plugins 2.22.3 ==== - -2008-09-08 Paolo Borelli - - * plugins/terminal/terminal.py: take into account system-wide cursor - blink setting - -2008-09-08 Paolo Borelli - - * plugins/terminal/terminal.py: use proper gconf key for the monospace - font. Patch by Kurt Litsch. - -2008-06-10 Paolo Borelli - - * plugins/drawspaces/drawspaces.py: properly disconnect the tab-added - handler. - -2008-04-25 Gabor Kelemen - - * plugins/sessionsaver/dialogs.py: correct glade translation setup. - Bug #529815. - -==== gedit-plugins 2.22.2 ==== - -2008-04-20 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.22.2 released. - -2008-04-20 Paolo Borelli - - * plugins/colorpicker/colorpicker.py: convert to PEP8 style. - -2008-04-20 Paolo Borelli - - * plugins/drawspaces/drawspaces.py: fix glade translation setup - Bug #527841 - -2008-04-19 Paolo Borelli - - * plugins/smartspaces/smartspaces.py: simplify logic and make it work - also when we reach the start of the buffer. - -==== gedit-plugins 2.22.1 ==== - -2008-04-08 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.22.1 released. - -2008-03-22 Paolo Borelli - - * plugins/bracketcompletion/bracketcompletion.py: only watch the - necessary keyvalues. Bug #518985. - -2008-03-21 Christian Persch - - * configure.ac: - * plugins/charmap/Makefile.am: - * plugins/charmap/gedit-charmap-panel.c: - (on_chapter_view_selection_changed), (gedit_charmap_panel_init), - (gedit_charmap_panel_get_chartable): - * plugins/charmap/gedit-charmap-panel.h: - * plugins/charmap/gedit-charmap-plugin.c: (free_window_data), - (on_table_status_message): Allow building with either gucharmap - stable, or gucharmap trunk. Bug #523694. - -==== gedit-plugins 2.22.0 ==== - -2008-03-10 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.22.0 released. - -2008-03-02 Paolo Borelli - - * plugins/drawspaces/drawspaces.py: add a menu item to toggle - drawing of spaces. Based on a patch by Stefan Schweizer. - -2008-02-16 Djihed Afifi - - * plugins/sessionsaver/__init__.py: Mark strings for translation. - -2008-02-01 Paolo Borelli - - * plugins/codecomment/codecomment.py: for C, prefer block comments - over line comments. - -2008-01-19 Paolo Borelli - - * plugins/charmap/gedit-charmap-plugin.c: fix a compiler warning. - -2007-12-22 Paolo Borelli - - * plugins/charmap/gedit-charmap-plugin.c: do not unref the panel when - we do not own the ref. Patch by Christian Persch. Bug #502707. - -2007-10-11 Paolo Borelli - - * plugins/bracketcompletion/bracketcompletion.py: fix language-specific - brackets. - -2007-10-24 Armin Burgmeier - - * plugins/terminal/terminal.py: Set word_chars from gnome-terminal - configuration. - -==== gedit-plugins 2.20.0 ==== - -2007-09-29 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.20.0 released. - -2007-09-29 Paolo Borelli - - * plugins/joinlines/joinlines.py: Patch from André Homeyer to improve - the behavior: just join the current and next line when there is no - selection and respect current line indentation when reformatting - a paragraph. - -2007-09-29 Paolo Borelli - - * plugins/joinlines/joinlines.py: update for gsv2. - -2007-09-18 Jürg Billeter - - * configure.ac: require gedit-2.20 >= 2.20.0 - -2007-09-05 Jürg Billeter - - * configure.ac: require gtksourceview-2.0 >= 1.90.4 and - gedit-2.16 >= 2.19.91 - -==== gedit-plugins 2.19.90 ==== - -2007-09-03 Paolo Borelli - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.19.90 released. - -2007-08-28 Steve Frécinaux - - * plugins/codecomment/codecomment.py: Update to new gtksourceview 1.90 - API. Comment tags are now taken from .lang metadata. - -2007-08-28 Steve Frécinaux - - * plugins/smartspaces/smartspaces.py: Update to new gtksourceview 1.90 - API. - -2007-08-16 Paolo Borelli - - * plugins/colorpicker/colorpicker.py: use "Pick Color..." - for the menu item label. - -2007-07-01 Paolo Borelli - - * plugins/drawspaces/drawspaces.glade: - * plugins/drawspaces/drawspaces.py: - - Draw non-breaking spaces. Patch by Bob Mauchin. Fixes bug - #431956. - -2007-05-06 Loïc Minier - - * plugins/sessionsaver/__init__.py: - Fix typo causing a Python stack trace on deactivation of the plugin; - thanks Vincent Untz. Fixes #436371. - -2007-04-07 Paolo Borelli - - * plugins/sessionsaver/store.py: - - Fix dir craeation. Pointed out by Trond Danielsen. - -2007-03-20 Steve Frécinaux - - * plugins/drawspaces/drawspaces.py: - * plugins/joinlines/joinlines.py: - - Remove unneeded parts of the i18n initialisation. - -2007-03-19 Wouter Bolsterlee - - * plugins/drawspaces/drawspaces.py: Make i18n actually - work for this plugin. Fixes #420305. - -2007-03-19 Wouter Bolsterlee - - * plugins/joinlines/joinlines.py: Make i18n actually - work for this plugin. Partly fixes #420305. - -==== gedit-plugins 2.18.0 ==== - -2007-03-19 Steve Frécinaux - - * README: - * configure.ac: - * NEWS: - - gedit-plugins 2.18 released. - -2007-03-15 Steve Frécinaux - - * plugins/codecomment/codecomment.py: - * plugins/colorpicker/colorpicker.py: - * plugins/sessionsaver/__init__.py: - * plugins/sessionsaver/dialogs.py: - * plugins/terminal/terminal.py: - - Use try/catch statements to define the textdomain, in order to make it - easier to copy paste plugins in ~. - Also use GETTEXT_DOMAIN instead of gving it explicitely. - - -2007-03-15 Steve Frécinaux - - * plugins/drawspaces/drawspaces.glade: - * plugins/sessionsaver/sessionsaver.glade: - - Mark stock labels as non translatable. - -2007-03-15 Steve Frécinaux - - * configure.ac: - * README: - * plugins/drawspaces/Makefile.am: - * plugins/drawspaces/drawspaces.gedit-plugin.desktop.in: - * plugins/drawspaces/drawspaces.glade: - * plugins/drawspaces/drawspaces.py: - - New Draw Spaces plugin. - -==== gedit-plugins 2.17.2 ==== - -2007-02-20 Steve Frécinaux - - * NEWS: - * README: - * configure.ac: - - gedit-plugins 2.17.2 released. - - * plugins/sessionsaver/Makefile.am: add sessionsaver.glade to - EXTRA_DIST. - -2007-02-20 Steve Frécinaux - - * plugins/sessionsaver/__init__.py: fix opening of a new window: - don't open a new window when there is only an untouched document - in the window. - - * plugins/sessionsaver/store.py: remove dead code. - -2007-02-20 Steve Frécinaux - - * plugins/sessionsaver/sessionsaver.py: fix a typo that caused the - menu items not to work properly. - -2007-02-20 Steve Frécinaux - - * plugins/smartspaces/smartspaces.py: fix annoying behaviour that - avoided the selection to be deleted on backspace. - -2007-01-22 Steve Frécinaux - - * plugins/sessionsaver/dialogs.py: add glade.bindtextdomain. - -2007-01-22 Steve Frécinaux - - * plugins/sessionsaver/Makefile.am: - * plugins/sessionsaver/__init__.py: - * plugins/sessionsaver/dialogs.py: - * plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in: - * plugins/sessionsaver/sessionsaver.glade: - * plugins/sessionsaver/store.py: - - New Session Saver plugin. - - * configure.ac: - * README: - - Add the new plugin. - -=== gedit-plugins 2.17.1 === - -2007-01-13 Steve Frécinaux - - * README: - * NEWS: - * configure.ac: - - gedit-plugins 2.17.1 released (due to a mistake in previous release). - -=== gedit-plugins 2.17.0 === - -2007-01-13 Steve Frécinaux - - * README: - * NEWS: - * configure.ac: - - gedit-plugins 2.17.0 released. - -2006-12-08 Steve Frécinaux - - * plugins/terminal/terminal.py: Fix Bug 381885 – Terminal plugin should - offer an easy way to change the directory. Patch by Osmo Salomaa. - -2006-11-20 Steve Frécinaux - - * plugins/terminal/terminal.py: Fix Bug 351630 – terminal plugin should - honour ctrl+tab; fix weird line break that appeared in the middle of - the first line. - -2006-11-07 Steve Frécinaux - - * plugins/codecomment/codecomment.py: Fix bug 359494 – codecomment - plugin is commenting unselected lines, and remove trailing spaces. - -=== gedit-plugins 2.16.0 === - -2006-09-08 Jesse van den Kieboom - - * configure.ac: bump the gedit requirement to 2.16.0 - * README: added bracketcompletion and smartspaces plugin - - * configure.ac: - * NEWS: - * README: - - gedit-plugins 2.16.0 released. - -2006-08-28 Steve Frécinaux - - * plugins/bracketcompletion/bracketcompletion.py: put the closing - bracket on the next line if the user hits Return. - Warning: this might break input methods. - -2006-08-28 Steve Frécinaux - - * plugins/bracketcompletion/bracketcompletion.py: remove both brackets - if the user hits the backspace. - -2006-08-28 Steve Frécinaux - - * configure.ac: - * plugins/bracketcompletion/bracketcompletion.py - * plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in: - * plugins/bracketcompletion/Makefile.am: - - New Bracket Completion plugin. - - * plugins/smartspaces/smartspaces.py: fix typo that caused a warning - on plugin deactivation. - - * plugins/joinlines/joinlines.gedit-plugin.desktop.in: set the name - and description translatable. - -=== gedit-plugins 2.15.5 === - -2006-08-21 Steve Frécinaux - - * configure.ac: bump the gedit requirement to 2.15.7 - - * configure.ac: - * NEWS: - * README: - - gedit-plugins 2.15.5 released. - -2006-08-18 Steve Frécinaux - - * configure.ac: - * plugins/.cvsignore: - * plugins/Makefile.am: - * plugins/gpdefs.py.in: - - New gpdef module containing data from gedit-plugin configure, including - VERSION, PACKAGE and GETTEXT stuff. - - * plugins/charmap/gedit-charmap-plugin.c: - * plugins/showtabbar/gedit-show-tabbar-plugin.c: - - Use translated strings instead of just mark them as translatable. - - * plugins/codecomment/codecomment.py: - * plugins/colorpicker/colorpicker.py: - * plugins/terminal/terminal.py: - - Fix i18n: initialize gettext domain and fix not translated strings. - -2006-08-16 Steve Frécinaux - - * plugins/terminal/terminal.py: fix plugin deactivation. - -2006-08-11 Jesse van den Kieboom - - * configure.ac: - * plugins/charmap/gedit-charmap-plugin.c: - * plugins/charmap/gedit-charmap-panel.[ch]: - - Make charmap plugin use the new GeditPlugin macros for registering - types. gedit requirement version in configure.ac has been bumped to - 2.15.5 since the new macros are included since then - -2006-08-11 Steve Frécinaux - - * plugins/codecomment/codecomment.py: fix bug introduced in last - commit. - -2006-08-11 Steve Frécinaux - - * plugins/codecomment/codecomment.py: use language id's instead - of MIME types. Add a few new language comments definitions. - Define each comment tuple only once. Fix an exception on - deactivate. - -2006-08-06 Steve Frécinaux - - * plugins/codecomment/*: - * configure.ac: - - New Code Comment plugin, from Matthew Dugan. - -2006-08-06 Steve Frécinaux - - * plugins/joinlines/joinlines.py: convert from tabs to spaces - to conform PEP8. (we decided to use spaces instead of tabs for - python). - -2006-08-05 Jesse van den Kieboom - - * configure.ac: fixed configure.ac sed rule (autoconf seems to - remove [] from the rule which is fixed by using [[]] instead) - -=== gedit-plugins 2.15.4 === - -2006-07-11 Jesse van den Kieboom - - * NEWS: - * README: - * configure.ac: - - gedit-plugins 2.15.4 released. - -2006-06-20 Steve Frécinaux - - * configure.ac: fix Bug 344655 – configure uses old-style automake - init. Patch by Christian Persch. - -2006-06-19 Steve Frécinaux - - * plugins/terminal/terminal.py: set the "copy" menu insensitive when - there is nothing selected. - -2006-06-13 Steve Frécinaux - - * configure.ac: fix some more linuxisms (bug #344613). Patch by - Joe Marcus Clarke. - -2006-06-11 Steve Frécinaux - - * configure.ac: fix bug #344563 – broken configure script (due - bashizms). Patch by Fryderyk Dziarmagowski - -=== gedit-plugins 2.15.3 === - -2006-06-11 Steve Frécinaux - - * NEWS: - * README: - * configure.ac: - - gedit-plugins 2.15.3 released. - -2006-06-11 Steve Frécinaux - - * MAINTAINERS: add MAINTAINERS file. - - * configure.ac: set default prefix to the one gedit is installed under; - lower the gedit dependency to 2.14.2; fix the --with-plugins help - message. - -2006-06-04 Steve Frécinaux - - * plugins/smartspaces/Makefile.am: - * plugins/smartspaces/smartspaces.gedit-plugin.desktop.in: - * plugins/smartspaces/smartspaces.py: - * plugins/smartspaces/.cvsignore: - - New Smart Spaces plugin. - - * configure.ac: add above plugin to python plugin list. - -2006-06-03 Steve Frécinaux - - * plugins/terminal/terminal.py: fix the context menu positioning on - "popup-menu" event. (requires gedit 2.15 from today CVS) - -2006-05-31 Steve Frécinaux - - * plugins/terminal/terminal.py: move the scrollbar into the terminal - widget; get the most part of terminal configuration from GConf (Default - gnome-terminal profile); add a terminal popup menu containing copy and - paste entries. - -2006-05-30 Steve Frécinaux - - * plugins/terminal/terminal.py: adapt to use a window helper. Converted - tabs to space to conform to PEP8. (py plugins should conform to PEP8.) - -2006-05-25 Steve Frécinaux - - * plugins/charmap/gedit-charmap-plugin.c: remove statusbar text on - plugin removal. - - * configure.ac: set gedit requirement to 2.14 since people have been - asking for it several times. Added a note about prefix. - - * plugins/colorpicker/colorpicker.py: reverted API update to make it - run with gedit 2.14 - -2006-05-24 Paolo Borelli - - * plugins/charmap/gedit-charmap-plugin.c: fix leak. - -2006-05-20 Jesse van den Kieboom - - * plugins/colorpicker/colorpicker.py: fixed setting color picker menu - item insensitive when there are no documents. Close dialog when it's - still open and there are no more documents open. - -2006-05-19 Jesse van den Kieboom - - * plugins/colorpicker/colorpicker.py: fixed finding color from cursor - position (it no longer accepts # as a hex color token, which it - shouldn't have in the first place) - -2006-05-19 Jesse van den Kieboom - - * configure.ac: added checks for plugin dependencies. When dependencies - are not met the plugin will be disabled. When the plugin is explicitely - defined with --enable-plugins then the missing dependency will generate - an error, otherwise it will only generate a warning so plugins can - still be built, but without that specific plugin. Added python vte - module check for the terminal plugin. Disable all python plugins when - there is no python support. - -2006-05-15 Steve Frécinaux - - * configure.ac: bumped intltool requirement to 0.35.0, and gedit - requirement to 2.15.2. - - * plugins/colorpicker/colorpicker.py: updated deprecated use of - gedit.gedit_app_get_default(). - -=== gedit-plugins 2.15.2 === - -2006-05-15 Steve Frécinaux - - * Makefile.am: added gnome-doc-utils.make to dist and dustclean targets. - - * plugins/showtabbar/Makefile.am: added schema file to dist, clean and - distclean targets. - - * README: information about module and how to install. - - * configure.ac: gedit-plugins 2.15.2 released. - -2006-05-14 Steve Frécinaux - - * plugins/charmap/gedit-charmap-plugin.c: fix the insertion when a - document is read-only or non-editable. Show information about the - currently selected char in the statusbar. - -2006-05-13 Steve Frécinaux - - * INSTALL: Added generic install instructions. - - * plugins/terminal/terminal.gedit-plugin.desktop.in: added custom icon. - - * plugins/colorpicker/colorpicker.gedit-plugin.desktop.in: added custom - icon and marked strings for translation. - - * plugin/charmap/charmap.gedit-plugin.desktop.in: added custom icon and - explicit plugin description. - -2006-04-23 Jesse van den Kieboom - - * plugins/colorpicker/.cvsignore: - * plugins/colorpicker/Makefile.am: - * plugins/colorpicker/colorpicker.gedit-plugin.desktop.in: - * plugins/colorpicker/colorpicker.py: - - New Color Picker plugin - - * configure.ac: Add above plugin to python plugin list - -2006-04-23 Steve Frécinaux - - * plugins/charmap/.cvsignore: - * plugins/charmap/Makefile.am: - * plugins/charmap/charmap.gedit-plugin.desktop.in: - * plugins/charmap/gedit-charmap-panel.[ch]: - * plugins/charmap/gedit-charmap-plugin.[ch]: - - New Character Map Panel plugin. - - * configure.ac: Add above plugin to plugin list. Remove useless - dependencies. Remove unused GEDIT_DATA_DIR definition. Add conditional - dependency for libgucharmap. - -2006-04-20 Steve Frécinaux - - * autogen.sh: updated package name to gedit-plugins - - * configure.ac: comment out GNOME_COMPILE_WARNINGS on a suggestion - of بهداد اسفهبد. - -2006-04-16 Steve Frécinaux - - * configure.ac: - * plugins/terminal/.cvsignore: - * plugins/terminal/Makefile.am: - * plugins/terminal/terminal.gedit-plugin.desktop.in: - * plugins/terminal/terminal.py: - - New Embedded Terminal plugin. - Plugin from Paolo Borelli . - -2006-04-16 Steve Frécinaux - - * configure.ac: - * plugins/showtabbar/.cvsignore: - * plugins/showtabbar/Makefile.am: - * plugins/showtabbar/gedit-show-tabbar-plugin.c: - * plugins/showtabbar/gedit-show-tabbar-plugin.h: - * plugins/showtabbar/gedit-show-tabbar-plugin.schemas.in: - * plugins/showtabbar/showtabbar.gedit-plugin.desktop.in: - - New Show/Hide Tabbar plugin. - -2006-04-16 Steve Frécinaux - - * configure.ac: fix typo. - - * .cvsignore: - * m4/.cvsignore: - * po/.cvsignore: - - Update cvsignore list. - -2006-04-16 Steve Frécinaux - - * configure.ac: fix the way po/LINGUAS is handled. Add gedit-2.14 into - pkg dependencies to be able to build C plugins. - -2006-04-09 Steve Frécinaux - - * configure.ac: - * po/LINGUAS: - - Move ALL_LANGUAGES content to the po/LINGUAS file, to make our - translators' life easier. - -2006-04-08 Steve Frécinaux - - * plugins/joinlines/joinlines.py: take care of the current tab size for - the line splitting. - -2006-03-30 Steve Frécinaux - - * plugins/joinlines/joinlines.gedit-plugin.desktop.in: - * plugins/joinlines/joinlines.py: - * plugins/joinlines/Makefile.am: - - New "Join/Split Lines" plugin. - - * configure.ac,Makefile.am: updated plugin list and removed - references to translations - -2006-03-29 Steve Frécinaux - - * configure.ac,Makefile.am: - * README,INSTALL,COPYING,NEWS,AUTHORS,autogen.sh: - * plugins/*: - * m4/*: - - Autotools stuff, burrowed from gedit and epiphany-extensions. - Need further testing and plugins ;-), probably quite buggy. - -2005-09-29 Raphael Slinckx - - * quickies/quickies.py,quickies.glade,quickies.gedit-plugin: - Clean the CVS module, and add the quickies python extension diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/ChangeLog-20090414 /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/ChangeLog-20090414 --- gedit-plugins-2.26.1/ChangeLog-20090414 1970-01-01 01:00:00.000000000 +0100 +++ gedit-plugins-2.26.2/ChangeLog-20090414 2009-04-25 15:33:16.000000000 +0100 @@ -0,0 +1,975 @@ +==== gedit-plugins 2.26.1 ==== + +2009-04-11 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.26.1 released. + +2009-03-31 Ignacio Casal Quinteiro + + * plugins/drawspaces/gedit-drawspaces-plugin.c: + Draw spaces should be enabled first time the plugin is activated. + +2009-03-29 Ignacio Casal Quinteiro + + * plugins/drawspaces/gedit-drawspaces-plugin.c: + Remove the gconf notification on dispose. (Fixes bug #576766). + +==== gedit-plugins 2.26.0 ==== + +2009-03-16 Ignacio Casal Quinteiro + + * configure.ac: + * NEWS: + * README: + gedit-plugins 2.26.0 released. + +==== gedit-plugins 2.25.3 ==== + +2009-02-23 Ignacio Casal Quinteiro + + * configure.ac: + * NEWS: + * README: + gedit-plugins 2.25.3 released. + +2009-02-01 Ignacio Casal Quinteiro + + * plugins/bookmarks/gedit-bookmarks-plugin.c: + Use slice instead of g_new. + +2009-01-17 Ignacio Casal Quinteiro + + * plugins/terminal/terminal.py: + Built-in terminal should reuse gnome-terminal color scheme. + (Fixes bug #567629) + +2009-01-06 Ignacio Casal Quinteiro + + * configure.ac: + Bump gedit to 2.25.4. + +2009-01-05 Ignacio Casal Quinteiro + + * plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in.in: + * plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in.in: + * plugins/smartspaces/smartspaces.gedit-plugin.desktop.in.in: + * plugins/bookmarks/bookmarks.gedit-plugin.desktop.in.in: + * plugins/joinlines/joinlines.gedit-plugin.desktop.in.in: + * plugins/charmap/charmap.gedit-plugin.desktop.in.in: + * plugins/terminal/terminal.gedit-plugin.desktop.in.in: + * plugins/colorpicker/colorpicker.gedit-plugin.desktop.in.in: + * plugins/drawspaces/drawspaces.gedit-plugin.desktop.in.in: + * plugins/showtabbar/showtabbar.gedit-plugin.desktop.in.in: + * plugins/codecomment/codecomment.gedit-plugin.desktop.in.in: + * configure.ac: + * po/POTFILES.in: + * po/POTFILES.skip: + Add new Version property to plugins. + +==== gedit-plugins 2.25.2 ==== + +2009-01-05 Ignacio Casal Quinteiro + + * NEWS: + * README: + gedit-plugins 2.25.2 released. + +2009-01-05 Ignacio Casal Quinteiro + + * plugins/bookmarks/Makefile.am: + Add icon to distribution. + +2009-01-05 Ignacio Casal Quinteiro + + * plugins/bracketcompletion/bracketcompletion.py: + Skip closing brackets. (Fixes bug #566557). + +2009-01-03 Jesse van den Kieboom + + * plugins/sessionsaver/Makefile.am: + * plugins/sessionsaver/dialogs.py: + * plugins/bookmarks/Makefile.am: + * plugins/charmap/Makefile.am: + * plugins/drawspaces/gedit-drawspaces-plugin.c: + * plugins/drawspaces/Makefile.am: + * plugins/showtabbar/Makefile.am: + + Makefile cleanup and use get_data_dir() where applicable (also install + data in correct data directory now) + +2009-01-03 Jesse van den Kieboom + + * configure.ac: bump version of gedit to 2.25.3 to make use of + gedit_plugin_get_data_dir. + +2009-01-03 Jesse van den Kieboom + + * configure.ac: bump version of gedit to 2.25.3 to make use of + gedit_plugin_get_data_dir. + +2009-01-03 Jesse van den Kieboom + + * plugins/sessionsaver/Makefile.am: + * plugins/bracketcompletion/Makefile.am: + * plugins/smartspaces/Makefile.am: + * plugins/joinlines/Makefile.am: + * plugins/charmap/Makefile.am: + * plugins/terminal/Makefile.am: + * plugins/colorpicker/Makefile.am: + * plugins/drawspaces/Makefile.am: + * plugins/showtabbar/Makefile.am: + * plugins/codecomment/Makefile.am: + + Updated to use $(GEDIT_PLUGINS_LIBS_DIR). + +2009-01-03 Jesse van den Kieboom + + * configure.ac: + * plugins/bookmarks: + + Added new bookmarks plugin. + +2009-01-02 Jesse van den Kieboom + + * plugins/bracketcompletion/bracketcompletion.py: added completion + for <> for php. + +2008-12-28 Ignacio Casal Quinteiro + + * configure.ac: Bump gtksourceview to 2.5.1 + + * plugins/drawspaces/gedit-drawspaces-plugin.c: + * plugins/drawspaces/drawspaces.glade: + * plugins/drawspaces/drawspaces.ui: + Update drawspaces to show non breaking spaces. + +2008-12-26 Paolo Borelli + + * configure.ac: use pkg-config to check for pyvte. + +==== gedit-plugins 2.25.1 ==== + +2008-12-02 Ignacio Casal Quinteiro + + * configure.ac: + * NEWS: + * README: + gedit-plugins 2.25.1 released. + +2008-12-02 Ignacio Casal Quinteiro + + * configure.ac: + Forgot this file in the previous commit. + +2008-12-02 Ignacio Casal Quinteiro + + * configure.ac: + * plugins/charmap/gedit-charmap-plugin.c: + * plugins/charmap/gedit-charmap-panel.c: + * plugins/charmap/gedit-charmap-panel.h: + Only support gucharmap 2. + +2008-11-30 Paolo Borelli + + * plugins/drawspaces/gedit-drawspaces-plugin.c: plug leak. + +2008-11-30 Paolo Borelli + + * configure.ac: require gconf, remove wrong python test. + +2008-11-30 Paolo Borelli + + * plugins/terminal: use vte api to set cursor shape and blink mode. + +2008-11-23 Ignacio Casal Quinteiro + + * plugins/terminal/terminal.py: + * configure.ac: + Ported to gio. Bump pygtk and pygobject. + +2008-11-23 Ignacio Casal Quinteiro + + * plugins/sessionsaver/sessionsaver.ui: + * plugins/sessionsaver/__init__.py: + * plugins/sessionsaver/Makefile.am: + * plugins/sessionsaver/dialogs.py: + * configure.ac: + Ported to gtkbuilder. (Fixes bug #561948). + +2008-11-23 Ignacio Casal Quinteiro + + * plugins/drawspaces/gedit-drawspaces-plugin.c: + * plugins/drawspaces/drawspaces.gedit-plugin.desktop.in: + Removed useless variable. + +2008-11-22 Ignacio Casal Quinteiro + + * configure.ac: bump gtksourceview, gtk+, glib and gedit deps. + +2008-11-22 Paolo Borelli + + * plugins/drawspaces: new implementation of the drawspaces plugin + using the appropriate gtksourceview api. + * configure.ac: bump gtksourceview dep + +2008-11-02 Paolo Borelli + + * configure.ac: + Build fixes for cygwin. Bug #317567. + +==== gedit-plugins 2.22.5 ==== + +2008-10-25 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.22.5 released. + +2008-10-25 Paolo Borelli + + * plugins/drawspaces/drawspaces.py: draw some more kind of spaces. + +2008-10-25 Paolo Borelli + + * plugins/charmap/gedit-charmap-plugin.c: use the correct API for + the new charmap lib. Bug #557598, patch by Christophe Sauthier. + +==== gedit-plugins 2.22.4 ==== + +2008-10-16 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.22.4 released. + +2008-10-16 Paolo Borelli + + * plugins/terminal/terminal.py: take into account the gnome-terminal + setting of using the default theme and properly track color scheme + changes. Based on a path by Fabricio Silva, bug #556473. + +2008-09-24 Ignacio Casal Quinteiro + + * plugins/charmap/gedit-charmap-plugin.c: + Fixed compile warning. + +==== gedit-plugins 2.22.3 ==== + +2008-09-08 Paolo Borelli + + * plugins/terminal/terminal.py: take into account system-wide cursor + blink setting + +2008-09-08 Paolo Borelli + + * plugins/terminal/terminal.py: use proper gconf key for the monospace + font. Patch by Kurt Litsch. + +2008-06-10 Paolo Borelli + + * plugins/drawspaces/drawspaces.py: properly disconnect the tab-added + handler. + +2008-04-25 Gabor Kelemen + + * plugins/sessionsaver/dialogs.py: correct glade translation setup. + Bug #529815. + +==== gedit-plugins 2.22.2 ==== + +2008-04-20 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.22.2 released. + +2008-04-20 Paolo Borelli + + * plugins/colorpicker/colorpicker.py: convert to PEP8 style. + +2008-04-20 Paolo Borelli + + * plugins/drawspaces/drawspaces.py: fix glade translation setup + Bug #527841 + +2008-04-19 Paolo Borelli + + * plugins/smartspaces/smartspaces.py: simplify logic and make it work + also when we reach the start of the buffer. + +==== gedit-plugins 2.22.1 ==== + +2008-04-08 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.22.1 released. + +2008-03-22 Paolo Borelli + + * plugins/bracketcompletion/bracketcompletion.py: only watch the + necessary keyvalues. Bug #518985. + +2008-03-21 Christian Persch + + * configure.ac: + * plugins/charmap/Makefile.am: + * plugins/charmap/gedit-charmap-panel.c: + (on_chapter_view_selection_changed), (gedit_charmap_panel_init), + (gedit_charmap_panel_get_chartable): + * plugins/charmap/gedit-charmap-panel.h: + * plugins/charmap/gedit-charmap-plugin.c: (free_window_data), + (on_table_status_message): Allow building with either gucharmap + stable, or gucharmap trunk. Bug #523694. + +==== gedit-plugins 2.22.0 ==== + +2008-03-10 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.22.0 released. + +2008-03-02 Paolo Borelli + + * plugins/drawspaces/drawspaces.py: add a menu item to toggle + drawing of spaces. Based on a patch by Stefan Schweizer. + +2008-02-16 Djihed Afifi + + * plugins/sessionsaver/__init__.py: Mark strings for translation. + +2008-02-01 Paolo Borelli + + * plugins/codecomment/codecomment.py: for C, prefer block comments + over line comments. + +2008-01-19 Paolo Borelli + + * plugins/charmap/gedit-charmap-plugin.c: fix a compiler warning. + +2007-12-22 Paolo Borelli + + * plugins/charmap/gedit-charmap-plugin.c: do not unref the panel when + we do not own the ref. Patch by Christian Persch. Bug #502707. + +2007-10-11 Paolo Borelli + + * plugins/bracketcompletion/bracketcompletion.py: fix language-specific + brackets. + +2007-10-24 Armin Burgmeier + + * plugins/terminal/terminal.py: Set word_chars from gnome-terminal + configuration. + +==== gedit-plugins 2.20.0 ==== + +2007-09-29 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.20.0 released. + +2007-09-29 Paolo Borelli + + * plugins/joinlines/joinlines.py: Patch from André Homeyer to improve + the behavior: just join the current and next line when there is no + selection and respect current line indentation when reformatting + a paragraph. + +2007-09-29 Paolo Borelli + + * plugins/joinlines/joinlines.py: update for gsv2. + +2007-09-18 Jürg Billeter + + * configure.ac: require gedit-2.20 >= 2.20.0 + +2007-09-05 Jürg Billeter + + * configure.ac: require gtksourceview-2.0 >= 1.90.4 and + gedit-2.16 >= 2.19.91 + +==== gedit-plugins 2.19.90 ==== + +2007-09-03 Paolo Borelli + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.19.90 released. + +2007-08-28 Steve Frécinaux + + * plugins/codecomment/codecomment.py: Update to new gtksourceview 1.90 + API. Comment tags are now taken from .lang metadata. + +2007-08-28 Steve Frécinaux + + * plugins/smartspaces/smartspaces.py: Update to new gtksourceview 1.90 + API. + +2007-08-16 Paolo Borelli + + * plugins/colorpicker/colorpicker.py: use "Pick Color..." + for the menu item label. + +2007-07-01 Paolo Borelli + + * plugins/drawspaces/drawspaces.glade: + * plugins/drawspaces/drawspaces.py: + + Draw non-breaking spaces. Patch by Bob Mauchin. Fixes bug + #431956. + +2007-05-06 Loïc Minier + + * plugins/sessionsaver/__init__.py: + Fix typo causing a Python stack trace on deactivation of the plugin; + thanks Vincent Untz. Fixes #436371. + +2007-04-07 Paolo Borelli + + * plugins/sessionsaver/store.py: + + Fix dir craeation. Pointed out by Trond Danielsen. + +2007-03-20 Steve Frécinaux + + * plugins/drawspaces/drawspaces.py: + * plugins/joinlines/joinlines.py: + + Remove unneeded parts of the i18n initialisation. + +2007-03-19 Wouter Bolsterlee + + * plugins/drawspaces/drawspaces.py: Make i18n actually + work for this plugin. Fixes #420305. + +2007-03-19 Wouter Bolsterlee + + * plugins/joinlines/joinlines.py: Make i18n actually + work for this plugin. Partly fixes #420305. + +==== gedit-plugins 2.18.0 ==== + +2007-03-19 Steve Frécinaux + + * README: + * configure.ac: + * NEWS: + + gedit-plugins 2.18 released. + +2007-03-15 Steve Frécinaux + + * plugins/codecomment/codecomment.py: + * plugins/colorpicker/colorpicker.py: + * plugins/sessionsaver/__init__.py: + * plugins/sessionsaver/dialogs.py: + * plugins/terminal/terminal.py: + + Use try/catch statements to define the textdomain, in order to make it + easier to copy paste plugins in ~. + Also use GETTEXT_DOMAIN instead of gving it explicitely. + + +2007-03-15 Steve Frécinaux + + * plugins/drawspaces/drawspaces.glade: + * plugins/sessionsaver/sessionsaver.glade: + + Mark stock labels as non translatable. + +2007-03-15 Steve Frécinaux + + * configure.ac: + * README: + * plugins/drawspaces/Makefile.am: + * plugins/drawspaces/drawspaces.gedit-plugin.desktop.in: + * plugins/drawspaces/drawspaces.glade: + * plugins/drawspaces/drawspaces.py: + + New Draw Spaces plugin. + +==== gedit-plugins 2.17.2 ==== + +2007-02-20 Steve Frécinaux + + * NEWS: + * README: + * configure.ac: + + gedit-plugins 2.17.2 released. + + * plugins/sessionsaver/Makefile.am: add sessionsaver.glade to + EXTRA_DIST. + +2007-02-20 Steve Frécinaux + + * plugins/sessionsaver/__init__.py: fix opening of a new window: + don't open a new window when there is only an untouched document + in the window. + + * plugins/sessionsaver/store.py: remove dead code. + +2007-02-20 Steve Frécinaux + + * plugins/sessionsaver/sessionsaver.py: fix a typo that caused the + menu items not to work properly. + +2007-02-20 Steve Frécinaux + + * plugins/smartspaces/smartspaces.py: fix annoying behaviour that + avoided the selection to be deleted on backspace. + +2007-01-22 Steve Frécinaux + + * plugins/sessionsaver/dialogs.py: add glade.bindtextdomain. + +2007-01-22 Steve Frécinaux + + * plugins/sessionsaver/Makefile.am: + * plugins/sessionsaver/__init__.py: + * plugins/sessionsaver/dialogs.py: + * plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in: + * plugins/sessionsaver/sessionsaver.glade: + * plugins/sessionsaver/store.py: + + New Session Saver plugin. + + * configure.ac: + * README: + + Add the new plugin. + +=== gedit-plugins 2.17.1 === + +2007-01-13 Steve Frécinaux + + * README: + * NEWS: + * configure.ac: + + gedit-plugins 2.17.1 released (due to a mistake in previous release). + +=== gedit-plugins 2.17.0 === + +2007-01-13 Steve Frécinaux + + * README: + * NEWS: + * configure.ac: + + gedit-plugins 2.17.0 released. + +2006-12-08 Steve Frécinaux + + * plugins/terminal/terminal.py: Fix Bug 381885 – Terminal plugin should + offer an easy way to change the directory. Patch by Osmo Salomaa. + +2006-11-20 Steve Frécinaux + + * plugins/terminal/terminal.py: Fix Bug 351630 – terminal plugin should + honour ctrl+tab; fix weird line break that appeared in the middle of + the first line. + +2006-11-07 Steve Frécinaux + + * plugins/codecomment/codecomment.py: Fix bug 359494 – codecomment + plugin is commenting unselected lines, and remove trailing spaces. + +=== gedit-plugins 2.16.0 === + +2006-09-08 Jesse van den Kieboom + + * configure.ac: bump the gedit requirement to 2.16.0 + * README: added bracketcompletion and smartspaces plugin + + * configure.ac: + * NEWS: + * README: + + gedit-plugins 2.16.0 released. + +2006-08-28 Steve Frécinaux + + * plugins/bracketcompletion/bracketcompletion.py: put the closing + bracket on the next line if the user hits Return. + Warning: this might break input methods. + +2006-08-28 Steve Frécinaux + + * plugins/bracketcompletion/bracketcompletion.py: remove both brackets + if the user hits the backspace. + +2006-08-28 Steve Frécinaux + + * configure.ac: + * plugins/bracketcompletion/bracketcompletion.py + * plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in: + * plugins/bracketcompletion/Makefile.am: + + New Bracket Completion plugin. + + * plugins/smartspaces/smartspaces.py: fix typo that caused a warning + on plugin deactivation. + + * plugins/joinlines/joinlines.gedit-plugin.desktop.in: set the name + and description translatable. + +=== gedit-plugins 2.15.5 === + +2006-08-21 Steve Frécinaux + + * configure.ac: bump the gedit requirement to 2.15.7 + + * configure.ac: + * NEWS: + * README: + + gedit-plugins 2.15.5 released. + +2006-08-18 Steve Frécinaux + + * configure.ac: + * plugins/.cvsignore: + * plugins/Makefile.am: + * plugins/gpdefs.py.in: + + New gpdef module containing data from gedit-plugin configure, including + VERSION, PACKAGE and GETTEXT stuff. + + * plugins/charmap/gedit-charmap-plugin.c: + * plugins/showtabbar/gedit-show-tabbar-plugin.c: + + Use translated strings instead of just mark them as translatable. + + * plugins/codecomment/codecomment.py: + * plugins/colorpicker/colorpicker.py: + * plugins/terminal/terminal.py: + + Fix i18n: initialize gettext domain and fix not translated strings. + +2006-08-16 Steve Frécinaux + + * plugins/terminal/terminal.py: fix plugin deactivation. + +2006-08-11 Jesse van den Kieboom + + * configure.ac: + * plugins/charmap/gedit-charmap-plugin.c: + * plugins/charmap/gedit-charmap-panel.[ch]: + + Make charmap plugin use the new GeditPlugin macros for registering + types. gedit requirement version in configure.ac has been bumped to + 2.15.5 since the new macros are included since then + +2006-08-11 Steve Frécinaux + + * plugins/codecomment/codecomment.py: fix bug introduced in last + commit. + +2006-08-11 Steve Frécinaux + + * plugins/codecomment/codecomment.py: use language id's instead + of MIME types. Add a few new language comments definitions. + Define each comment tuple only once. Fix an exception on + deactivate. + +2006-08-06 Steve Frécinaux + + * plugins/codecomment/*: + * configure.ac: + + New Code Comment plugin, from Matthew Dugan. + +2006-08-06 Steve Frécinaux + + * plugins/joinlines/joinlines.py: convert from tabs to spaces + to conform PEP8. (we decided to use spaces instead of tabs for + python). + +2006-08-05 Jesse van den Kieboom + + * configure.ac: fixed configure.ac sed rule (autoconf seems to + remove [] from the rule which is fixed by using [[]] instead) + +=== gedit-plugins 2.15.4 === + +2006-07-11 Jesse van den Kieboom + + * NEWS: + * README: + * configure.ac: + + gedit-plugins 2.15.4 released. + +2006-06-20 Steve Frécinaux + + * configure.ac: fix Bug 344655 – configure uses old-style automake + init. Patch by Christian Persch. + +2006-06-19 Steve Frécinaux + + * plugins/terminal/terminal.py: set the "copy" menu insensitive when + there is nothing selected. + +2006-06-13 Steve Frécinaux + + * configure.ac: fix some more linuxisms (bug #344613). Patch by + Joe Marcus Clarke. + +2006-06-11 Steve Frécinaux + + * configure.ac: fix bug #344563 – broken configure script (due + bashizms). Patch by Fryderyk Dziarmagowski + +=== gedit-plugins 2.15.3 === + +2006-06-11 Steve Frécinaux + + * NEWS: + * README: + * configure.ac: + + gedit-plugins 2.15.3 released. + +2006-06-11 Steve Frécinaux + + * MAINTAINERS: add MAINTAINERS file. + + * configure.ac: set default prefix to the one gedit is installed under; + lower the gedit dependency to 2.14.2; fix the --with-plugins help + message. + +2006-06-04 Steve Frécinaux + + * plugins/smartspaces/Makefile.am: + * plugins/smartspaces/smartspaces.gedit-plugin.desktop.in: + * plugins/smartspaces/smartspaces.py: + * plugins/smartspaces/.cvsignore: + + New Smart Spaces plugin. + + * configure.ac: add above plugin to python plugin list. + +2006-06-03 Steve Frécinaux + + * plugins/terminal/terminal.py: fix the context menu positioning on + "popup-menu" event. (requires gedit 2.15 from today CVS) + +2006-05-31 Steve Frécinaux + + * plugins/terminal/terminal.py: move the scrollbar into the terminal + widget; get the most part of terminal configuration from GConf (Default + gnome-terminal profile); add a terminal popup menu containing copy and + paste entries. + +2006-05-30 Steve Frécinaux + + * plugins/terminal/terminal.py: adapt to use a window helper. Converted + tabs to space to conform to PEP8. (py plugins should conform to PEP8.) + +2006-05-25 Steve Frécinaux + + * plugins/charmap/gedit-charmap-plugin.c: remove statusbar text on + plugin removal. + + * configure.ac: set gedit requirement to 2.14 since people have been + asking for it several times. Added a note about prefix. + + * plugins/colorpicker/colorpicker.py: reverted API update to make it + run with gedit 2.14 + +2006-05-24 Paolo Borelli + + * plugins/charmap/gedit-charmap-plugin.c: fix leak. + +2006-05-20 Jesse van den Kieboom + + * plugins/colorpicker/colorpicker.py: fixed setting color picker menu + item insensitive when there are no documents. Close dialog when it's + still open and there are no more documents open. + +2006-05-19 Jesse van den Kieboom + + * plugins/colorpicker/colorpicker.py: fixed finding color from cursor + position (it no longer accepts # as a hex color token, which it + shouldn't have in the first place) + +2006-05-19 Jesse van den Kieboom + + * configure.ac: added checks for plugin dependencies. When dependencies + are not met the plugin will be disabled. When the plugin is explicitely + defined with --enable-plugins then the missing dependency will generate + an error, otherwise it will only generate a warning so plugins can + still be built, but without that specific plugin. Added python vte + module check for the terminal plugin. Disable all python plugins when + there is no python support. + +2006-05-15 Steve Frécinaux + + * configure.ac: bumped intltool requirement to 0.35.0, and gedit + requirement to 2.15.2. + + * plugins/colorpicker/colorpicker.py: updated deprecated use of + gedit.gedit_app_get_default(). + +=== gedit-plugins 2.15.2 === + +2006-05-15 Steve Frécinaux + + * Makefile.am: added gnome-doc-utils.make to dist and dustclean targets. + + * plugins/showtabbar/Makefile.am: added schema file to dist, clean and + distclean targets. + + * README: information about module and how to install. + + * configure.ac: gedit-plugins 2.15.2 released. + +2006-05-14 Steve Frécinaux + + * plugins/charmap/gedit-charmap-plugin.c: fix the insertion when a + document is read-only or non-editable. Show information about the + currently selected char in the statusbar. + +2006-05-13 Steve Frécinaux + + * INSTALL: Added generic install instructions. + + * plugins/terminal/terminal.gedit-plugin.desktop.in: added custom icon. + + * plugins/colorpicker/colorpicker.gedit-plugin.desktop.in: added custom + icon and marked strings for translation. + + * plugin/charmap/charmap.gedit-plugin.desktop.in: added custom icon and + explicit plugin description. + +2006-04-23 Jesse van den Kieboom + + * plugins/colorpicker/.cvsignore: + * plugins/colorpicker/Makefile.am: + * plugins/colorpicker/colorpicker.gedit-plugin.desktop.in: + * plugins/colorpicker/colorpicker.py: + + New Color Picker plugin + + * configure.ac: Add above plugin to python plugin list + +2006-04-23 Steve Frécinaux + + * plugins/charmap/.cvsignore: + * plugins/charmap/Makefile.am: + * plugins/charmap/charmap.gedit-plugin.desktop.in: + * plugins/charmap/gedit-charmap-panel.[ch]: + * plugins/charmap/gedit-charmap-plugin.[ch]: + + New Character Map Panel plugin. + + * configure.ac: Add above plugin to plugin list. Remove useless + dependencies. Remove unused GEDIT_DATA_DIR definition. Add conditional + dependency for libgucharmap. + +2006-04-20 Steve Frécinaux + + * autogen.sh: updated package name to gedit-plugins + + * configure.ac: comment out GNOME_COMPILE_WARNINGS on a suggestion + of بهداد اسفهبد. + +2006-04-16 Steve Frécinaux + + * configure.ac: + * plugins/terminal/.cvsignore: + * plugins/terminal/Makefile.am: + * plugins/terminal/terminal.gedit-plugin.desktop.in: + * plugins/terminal/terminal.py: + + New Embedded Terminal plugin. + Plugin from Paolo Borelli . + +2006-04-16 Steve Frécinaux + + * configure.ac: + * plugins/showtabbar/.cvsignore: + * plugins/showtabbar/Makefile.am: + * plugins/showtabbar/gedit-show-tabbar-plugin.c: + * plugins/showtabbar/gedit-show-tabbar-plugin.h: + * plugins/showtabbar/gedit-show-tabbar-plugin.schemas.in: + * plugins/showtabbar/showtabbar.gedit-plugin.desktop.in: + + New Show/Hide Tabbar plugin. + +2006-04-16 Steve Frécinaux + + * configure.ac: fix typo. + + * .cvsignore: + * m4/.cvsignore: + * po/.cvsignore: + + Update cvsignore list. + +2006-04-16 Steve Frécinaux + + * configure.ac: fix the way po/LINGUAS is handled. Add gedit-2.14 into + pkg dependencies to be able to build C plugins. + +2006-04-09 Steve Frécinaux + + * configure.ac: + * po/LINGUAS: + + Move ALL_LANGUAGES content to the po/LINGUAS file, to make our + translators' life easier. + +2006-04-08 Steve Frécinaux + + * plugins/joinlines/joinlines.py: take care of the current tab size for + the line splitting. + +2006-03-30 Steve Frécinaux + + * plugins/joinlines/joinlines.gedit-plugin.desktop.in: + * plugins/joinlines/joinlines.py: + * plugins/joinlines/Makefile.am: + + New "Join/Split Lines" plugin. + + * configure.ac,Makefile.am: updated plugin list and removed + references to translations + +2006-03-29 Steve Frécinaux + + * configure.ac,Makefile.am: + * README,INSTALL,COPYING,NEWS,AUTHORS,autogen.sh: + * plugins/*: + * m4/*: + + Autotools stuff, burrowed from gedit and epiphany-extensions. + Need further testing and plugins ;-), probably quite buggy. + +2005-09-29 Raphael Slinckx + + * quickies/quickies.py,quickies.glade,quickies.gedit-plugin: + Clean the CVS module, and add the quickies python extension diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/config.guess /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/config.guess --- gedit-plugins-2.26.1/config.guess 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/config.guess 2009-05-17 00:32:20.000000000 +0100 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-11-15' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -331,20 +331,7 @@ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -809,7 +796,7 @@ x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T | authenticamd | genuineintel) + EM64T | authenticamd) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) @@ -948,9 +935,6 @@ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -1001,6 +985,9 @@ a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. @@ -1229,9 +1216,6 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/config.sub /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/config.sub --- gedit-plugins-2.26.1/config.sub 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/config.sub 2009-05-17 00:32:20.000000000 +0100 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-09-08' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -250,14 +250,12 @@ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -288,7 +286,7 @@ | v850 | v850e \ | we32k \ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) + | z8k) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -333,14 +331,12 @@ | ip2k-* | iq2000-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -368,14 +364,14 @@ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-* | z80-*) + | z8k-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) @@ -463,10 +459,6 @@ basic_machine=c90-cray os=-unicos ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -534,10 +526,6 @@ basic_machine=m88k-motorola os=-sysv3 ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1140,10 +1128,6 @@ basic_machine=z8k-unknown os=-sim ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1264,7 +1248,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1404,9 +1388,6 @@ -zvmoe) os=-zvmoe ;; - -dicos*) - os=-dicos - ;; -none) ;; *) diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/configure /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/configure --- gedit-plugins-2.26.1/configure 2009-04-11 11:43:39.000000000 +0100 +++ gedit-plugins-2.26.2/configure 2009-05-17 00:32:19.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for gedit-plugins 2.26.1. +# Generated by GNU Autoconf 2.63 for gedit-plugins 2.26.2. # # Report bugs to . # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='gedit-plugins' PACKAGE_TARNAME='gedit-plugins' -PACKAGE_VERSION='2.26.1' -PACKAGE_STRING='gedit-plugins 2.26.1' +PACKAGE_VERSION='2.26.2' +PACKAGE_STRING='gedit-plugins 2.26.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gedit' ac_unique_file="plugins" @@ -827,6 +827,7 @@ GCONF_SCHEMA_CONFIG_SOURCE GEDIT_LIBS GEDIT_CFLAGS +PKG_CONFIG MKINSTALLDIRS POSUB POFILES @@ -852,6 +853,7 @@ RANLIB AR OBJDUMP +LN_S NM ac_ct_DUMPBIN DUMPBIN @@ -919,16 +921,6 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE -HAVE_GNOME_DOC_UTILS_FALSE -HAVE_GNOME_DOC_UTILS_TRUE -DISTCHECK_CONFIGURE_FLAGS -ENABLE_SK_FALSE -ENABLE_SK_TRUE -DOC_USER_FORMATS -OMF_DIR -HELP_DIR -PKG_CONFIG -LN_S am__untar am__tar AMTAR @@ -993,10 +985,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -with_help_dir -with_omf_dir -with_help_formats -enable_scrollkeeper enable_maintainer_mode enable_static enable_nls @@ -1016,13 +1004,13 @@ ac_precious_vars='build_alias host_alias target_alias -PKG_CONFIG CC CFLAGS LDFLAGS LIBS CPPFLAGS CPP +PKG_CONFIG GEDIT_CFLAGS GEDIT_LIBS PYGTK_CFLAGS @@ -1583,7 +1571,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gedit-plugins 2.26.1 to adapt to many kinds of systems. +\`configure' configures gedit-plugins 2.26.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1653,7 +1641,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gedit-plugins 2.26.1:";; + short | recursive ) echo "Configuration of gedit-plugins 2.26.2:";; esac cat <<\_ACEOF @@ -1661,7 +1649,6 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-scrollkeeper do not make updates to the scrollkeeper database --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-static[=PKGS] build static libraries [default=no] @@ -1672,17 +1659,14 @@ --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --disable-schemas-install Disable the schemas installation + --disable-schemas-install + Disable the schemas installation --enable-python Enable python support --enable-deprecations warn about deprecated usages [default=no] Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-help-dir=DIR path to help docs - --with-omf-dir=DIR path to OMF files - --with-help-formats=FORMATS - list of formats --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1698,7 +1682,6 @@ as the aliases default, all, and really-all Some influential environment variables: - PKG_CONFIG path to pkg-config utility CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a @@ -1707,6 +1690,7 @@ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + PKG_CONFIG path to pkg-config utility GEDIT_CFLAGS C compiler flags for GEDIT, overriding pkg-config GEDIT_LIBS linker flags for GEDIT, overriding pkg-config @@ -1787,7 +1771,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gedit-plugins configure 2.26.1 +gedit-plugins configure 2.26.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1801,7 +1785,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gedit-plugins $as_me 2.26.1, which was +It was created by gedit-plugins $as_me 2.26.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2613,7 +2597,7 @@ # Define the identity of the package. PACKAGE='gedit-plugins' - VERSION='2.26.1' + VERSION='2.26.2' cat >>confdefs.h <<_ACEOF @@ -2756,219 +2740,6 @@ -{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi - -fi - -gdu_cv_version_required=0.3.2 - -if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5 - ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - gdu_cv_have_gdu=yes -else - gdu_cv_have_gdu=no -fi - -if test "$gdu_cv_have_gdu" = "yes"; then - : -else - { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5 -$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;} - { (exit 1); exit 1; }; } -fi - - - -# Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then - withval=$with_help_dir; -else - with_help_dir='${datadir}/gnome/help' -fi - -HELP_DIR="$with_help_dir" - - - -# Check whether --with-omf-dir was given. -if test "${with_omf_dir+set}" = set; then - withval=$with_omf_dir; -else - with_omf_dir='${datadir}/omf' -fi - -OMF_DIR="$with_omf_dir" - - - -# Check whether --with-help-formats was given. -if test "${with_help_formats+set}" = set; then - withval=$with_help_formats; -else - with_help_formats='' -fi - -DOC_USER_FORMATS="$with_help_formats" - - -# Check whether --enable-scrollkeeper was given. -if test "${enable_scrollkeeper+set}" = set; then - enableval=$enable_scrollkeeper; -else - enable_scrollkeeper=yes -fi - - if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then - ENABLE_SK_TRUE= - ENABLE_SK_FALSE='#' -else - ENABLE_SK_TRUE='#' - ENABLE_SK_FALSE= -fi - - -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" - - - if test "$gdu_cv_have_gdu" = "yes"; then - HAVE_GNOME_DOC_UTILS_TRUE= - HAVE_GNOME_DOC_UTILS_FALSE='#' -else - HAVE_GNOME_DOC_UTILS_TRUE='#' - HAVE_GNOME_DOC_UTILS_FALSE= -fi - - - - { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4377,6 +4148,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 @@ -4594,14 +4441,21 @@ if test -z "$INTLTOOL_PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5 -$as_echo "$as_me: error: perl not found; required for intltool" >&2;} + { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 +$as_echo "$as_me: error: perl not found" >&2;} { (exit 1); exit 1; }; } fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5 -$as_echo "$as_me: error: perl 5.x required for intltool" >&2;} +{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 +$as_echo_n "checking for perl >= 5.8.1... " >&6; } +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 +$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} { (exit 1); exit 1; }; } +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 +$as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 @@ -5476,13 +5330,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5479: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5333: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5482: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5336: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5485: output\"" >&5) + (eval echo "\"\$as_me:5339: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5492,6 +5346,17 @@ { $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5 $as_echo "$lt_cv_nm_interface" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + # find the maximum length of command line arguments { $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 $as_echo_n "checking the maximum length of command line arguments... " >&6; } @@ -5941,7 +5806,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -6676,7 +6541,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6679 "configure"' > conftest.$ac_ext + echo '#line 6544 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8503,11 +8368,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8506: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8371: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8510: \$? = $ac_status" >&5 + echo "$as_me:8375: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8842,11 +8707,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8845: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8710: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8849: \$? = $ac_status" >&5 + echo "$as_me:8714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8947,11 +8812,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8950: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8815: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8954: \$? = $ac_status" >&5 + echo "$as_me:8819: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9002,11 +8867,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8870: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9009: \$? = $ac_status" >&5 + echo "$as_me:8874: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9303,7 +9168,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9478,6 +9343,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9892,7 +9758,7 @@ link_all_deplibs=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10854,13 +10720,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10872,6 +10735,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -11805,7 +11680,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11808 "configure" +#line 11683 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11901,7 +11776,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11904 "configure" +#line 11779 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14769,14 +14644,131 @@ # ================================================================ + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi + +fi + pkg_failed=no { $as_echo "$as_me:$LINENO: checking for GEDIT" >&5 $as_echo_n "checking for GEDIT... " >&6; } -if test -n "$GEDIT_CFLAGS"; then - pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GEDIT_CFLAGS"; then + pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.13.0 gio-2.0 >= 2.16.0 @@ -14807,13 +14799,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GEDIT_LIBS"; then - pkg_cv_GEDIT_LIBS="$GEDIT_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GEDIT_LIBS"; then + pkg_cv_GEDIT_LIBS="$GEDIT_LIBS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" glib-2.0 >= 2.13.0 gio-2.0 >= 2.16.0 @@ -14844,8 +14838,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -14858,23 +14853,23 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " glib-2.0 >= 2.13.0 gio-2.0 >= 2.16.0 gtk+-2.0 >= 2.13.0 gconf-2.0 >= 1.1.11 gtksourceview-2.0 >= 2.5.1 gedit-2.20 >= 2.25.4 -" 2>&1` +"` else - GEDIT_PKG_ERRORS=`$PKG_CONFIG --print-errors " + GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " glib-2.0 >= 2.13.0 gio-2.0 >= 2.16.0 gtk+-2.0 >= 2.13.0 gconf-2.0 >= 1.1.11 gtksourceview-2.0 >= 2.5.1 gedit-2.20 >= 2.25.4 -" 2>&1` +"` fi # Put the nasty error message in config.log where it belongs echo "$GEDIT_PKG_ERRORS" >&5 @@ -14947,9 +14942,6 @@ $as_echo "yes" >&6; } : fi -GEDIT_LIBS="${GEDIT_LIBS}" - - # ================================================================ # GConf related settings @@ -15262,7 +15254,13 @@ if test "${am_cv_python_pythondir+set}" = set; then $as_echo_n "(cached) " >&6 else - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || + if test "x$prefix" = xNONE + then + py_prefix_arg= + else + py_prefix_arg=",prefix='$prefix'" + fi + am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0$py_prefix_arg)" -n -q install $py_prefix_arg 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi { $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 @@ -15279,8 +15277,14 @@ if test "${am_cv_python_pyexecdir+set}" = set; then $as_echo_n "(cached) " >&6 else - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` + if test "x$exec_prefix" = xNONE + then + py_exec_prefix_arg=$py_prefix_arg + else + py_exec_prefix_arg=",prefix='$exec_prefix'" + fi + am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0$py_exec_prefix_arg)" -n -q install $py_exec_prefix_arg 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi { $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 $as_echo "$am_cv_python_pyexecdir" >&6; } @@ -15386,10 +15390,11 @@ { $as_echo "$as_me:$LINENO: checking for PYGTK" >&5 $as_echo_n "checking for PYGTK... " >&6; } -if test -n "$PYGTK_CFLAGS"; then - pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PYGTK_CFLAGS"; then + pkg_cv_PYGTK_CFLAGS="$PYGTK_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= \$PYGOBJECT_REQUIRED pygtk-2.0 >= \$PYGTK_REQUIRED @@ -15408,13 +15413,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$PYGTK_LIBS"; then - pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PYGTK_LIBS"; then + pkg_cv_PYGTK_LIBS="$PYGTK_LIBS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" pygobject-2.0 >= \$PYGOBJECT_REQUIRED pygtk-2.0 >= \$PYGTK_REQUIRED @@ -15433,8 +15440,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -15447,15 +15455,15 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " + PYGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= $PYGOBJECT_REQUIRED pygtk-2.0 >= $PYGTK_REQUIRED - pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED" 2>&1` + pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED"` else - PYGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " + PYGTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= $PYGOBJECT_REQUIRED pygtk-2.0 >= $PYGTK_REQUIRED - pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED" 2>&1` + pygtksourceview-2.0 >= $PYGTKSOURCEVIEW_REQUIRED"` fi # Put the nasty error message in config.log where it belongs echo "$PYGTK_PKG_ERRORS" >&5 @@ -15647,10 +15655,11 @@ { $as_echo "$as_me:$LINENO: checking for GUCHARMAP" >&5 $as_echo_n "checking for GUCHARMAP... " >&6; } -if test -n "$GUCHARMAP_CFLAGS"; then - pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GUCHARMAP_CFLAGS"; then + pkg_cv_GUCHARMAP_CFLAGS="$GUCHARMAP_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap-2 >= \$GUCHARMAP2_REQUIRED\"") >&5 ($PKG_CONFIG --exists --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED") 2>&5 ac_status=$? @@ -15660,13 +15669,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$GUCHARMAP_LIBS"; then - pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$GUCHARMAP_LIBS"; then + pkg_cv_GUCHARMAP_LIBS="$GUCHARMAP_LIBS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gucharmap-2 >= \$GUCHARMAP2_REQUIRED\"") >&5 ($PKG_CONFIG --exists --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED") 2>&5 ac_status=$? @@ -15676,8 +15687,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -15690,9 +15702,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED" 2>&1` + GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED"` else - GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED" 2>&1` + GUCHARMAP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gucharmap-2 >= $GUCHARMAP2_REQUIRED"` fi # Put the nasty error message in config.log where it belongs echo "$GUCHARMAP_PKG_ERRORS" >&5 @@ -15740,10 +15752,11 @@ { $as_echo "$as_me:$LINENO: checking for PYVTE" >&5 $as_echo_n "checking for PYVTE... " >&6; } -if test -n "$PYVTE_CFLAGS"; then - pkg_cv_PYVTE_CFLAGS="$PYVTE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PYVTE_CFLAGS"; then + pkg_cv_PYVTE_CFLAGS="$PYVTE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pyvte >= \$PYVTE_REQUIRED\"") >&5 ($PKG_CONFIG --exists --print-errors "pyvte >= $PYVTE_REQUIRED") 2>&5 ac_status=$? @@ -15753,13 +15766,15 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi -if test -n "$PYVTE_LIBS"; then - pkg_cv_PYVTE_LIBS="$PYVTE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +if test -n "$PKG_CONFIG"; then + if test -n "$PYVTE_LIBS"; then + pkg_cv_PYVTE_LIBS="$PYVTE_LIBS" + else + if test -n "$PKG_CONFIG" && \ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pyvte >= \$PYVTE_REQUIRED\"") >&5 ($PKG_CONFIG --exists --print-errors "pyvte >= $PYVTE_REQUIRED") 2>&5 ac_status=$? @@ -15769,8 +15784,9 @@ else pkg_failed=yes fi - else - pkg_failed=untried + fi +else + pkg_failed=untried fi @@ -15783,9 +15799,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYVTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pyvte >= $PYVTE_REQUIRED" 2>&1` + PYVTE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pyvte >= $PYVTE_REQUIRED"` else - PYVTE_PKG_ERRORS=`$PKG_CONFIG --print-errors "pyvte >= $PYVTE_REQUIRED" 2>&1` + PYVTE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pyvte >= $PYVTE_REQUIRED"` fi # Put the nasty error message in config.log where it belongs echo "$PYVTE_PKG_ERRORS" >&5 @@ -16009,20 +16025,6 @@ LTLIBOBJS=$ac_ltlibobjs -if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi -if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -16398,7 +16400,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gedit-plugins $as_me 2.26.1, which was +This file was extended by gedit-plugins $as_me 2.26.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16461,7 +16463,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -gedit-plugins config.status 2.26.1 +gedit-plugins config.status 2.26.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -17525,27 +17527,28 @@ case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ @@ -17568,28 +17571,28 @@ q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ @@ -17612,7 +17615,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir + { as_dir=$dirpart/$fdir case $as_dir in #( -*) as_dir=./$as_dir;; esac @@ -17653,10 +17656,11 @@ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 $as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ;; "libtool":C) @@ -18297,7 +18301,7 @@ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; "po/stamp-it":C) - if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 $as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} { (exit 1); exit 1; }; } diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/configure.ac /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/configure.ac --- gedit-plugins-2.26.1/configure.ac 2009-04-11 11:41:56.000000000 +0100 +++ gedit-plugins-2.26.2/configure.ac 2009-05-17 00:29:51.000000000 +0100 @@ -4,7 +4,7 @@ m4_define(gedit_plugins_major_version, 2) m4_define(gedit_plugins_minor_version, 26) -m4_define(gedit_plugins_micro_version, 1) +m4_define(gedit_plugins_micro_version, 2) m4_define(gedit_plugins_version, gedit_plugins_major_version.gedit_plugins_minor_version.gedit_plugins_micro_version) AC_INIT(gedit-plugins, gedit_plugins_version, http://bugzilla.gnome.org/enter_bug.cgi?product=gedit) @@ -15,8 +15,6 @@ AM_INIT_AUTOMAKE([1.8 dist-bzip2 no-dist-gzip]) -GNOME_DOC_INIT - AM_MAINTAINER_MODE AC_CONFIG_HEADERS([config.h]) AC_DISABLE_STATIC @@ -68,9 +66,6 @@ gtksourceview-2.0 >= 2.5.1 gedit-2.20 >= 2.25.4 ]) -GEDIT_LIBS="${GEDIT_LIBS}" -AC_SUBST(GEDIT_LIBS) -AC_SUBST(GEDIT_CFLAGS) # ================================================================ # GConf related settings diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/debian/changelog /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/debian/changelog --- gedit-plugins-2.26.1/debian/changelog 2009-05-21 07:00:18.000000000 +0100 +++ gedit-plugins-2.26.2/debian/changelog 2009-05-21 06:46:05.000000000 +0100 @@ -1,3 +1,10 @@ +gedit-plugins (2.26.2-0ubuntu1~ppa1) jaunty; urgency=low + + * New upstream release. + * Misc Bugfixes. + + -- Nick Bryda Thu, 21 May 2009 01:45:05 -0400 + gedit-plugins (2.26.1-0ubuntu1) jaunty; urgency=low * New Upstream release: (LP: #359807) diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/debian/control /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/debian/control --- gedit-plugins-2.26.1/debian/control 2009-05-21 07:00:18.000000000 +0100 +++ gedit-plugins-2.26.2/debian/control 2009-05-21 06:53:30.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Loic Minier -Uploaders: Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Uploaders: Debian GNOME Maintainers , Josselin Mouette Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gedit-plugins/ubuntu Build-Depends: cdbs, libbonobo2-dev (>= 2.16), diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/gedit-plugins.doap /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/gedit-plugins.doap --- gedit-plugins-2.26.1/gedit-plugins.doap 1970-01-01 01:00:00.000000000 +0100 +++ gedit-plugins-2.26.2/gedit-plugins.doap 2009-04-25 15:33:16.000000000 +0100 @@ -0,0 +1,29 @@ + + + gedit-plugins + Collection of plugins for the gedit Text Editor + + + + + + + Steve Frécinaux + + sfre + + + + + Jesse van den Kieboom + + jessevdk + + + + + diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/gnome-doc-utils.make /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/gnome-doc-utils.make --- gedit-plugins-2.26.1/gnome-doc-utils.make 2009-04-11 11:43:34.000000000 +0100 +++ gedit-plugins-2.26.2/gnome-doc-utils.make 1970-01-01 01:00:00.000000000 +0100 @@ -1,578 +0,0 @@ -# gnome-doc-utils.make - make magic for building documentation -# Copyright (C) 2004-2005 Shaun McCance -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -################################################################################ -## @@ Generating Header Files - -## @ DOC_H_FILE -## The name of the header file to generate -DOC_H_FILE ?= - -## @ DOC_H_DOCS -## The input DocBook files for generating the header file -DOC_H_DOCS ?= - -$(DOC_H_FILE): $(DOC_H_DOCS); - @rm -f $@.tmp; touch $@.tmp; - echo 'const gchar* documentation_credits[] = {' >> $@.tmp - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - xsltproc --path "$$xmlpath" $(_credits) $$doc; \ - done | sort | uniq \ - | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ - | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp - echo ' NULL' >> $@.tmp - echo '};' >> $@.tmp - echo >> $@.tmp - list='$(DOC_H_DOCS)'; for doc in $$list; do \ - xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ - if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ - docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ - echo $$xmlpath; \ - ids=`xsltproc --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ - for id in $$ids; do \ - echo '#define HELP_'`echo $$docid`'_'`echo $$id \ - | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ - done; \ - echo >> $@.tmp; \ - done; - cp $@.tmp $@ && rm -f $@.tmp - -dist-check-gdu: -if !HAVE_GNOME_DOC_UTILS - @echo "*** GNOME Doc Utils must be installed in order to make dist" - @false -endif - -.PHONY: dist-doc-header -dist-doc-header: $(DOC_H_FILE) - @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ - $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; - -doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) - -.PHONY: clean-doc-header -_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) -clean-local: $(_clean_doc_header) -distclean-local: $(_clean_doc_header) -mostlyclean-local: $(_clean_doc_header) -maintainer-clean-local: $(_clean_doc_header) -clean-doc-header: - rm -f $(DOC_H_FILE) - -all: $(DOC_H_FILE) - - -################################################################################ -## @@ Generating Documentation Files - -## @ DOC_MODULE -## The name of the document being built -DOC_MODULE ?= - -## @ DOC_ENTITIES -## Files included with a SYSTEM entity -DOC_ENTITIES ?= - -## @ DOC_INCLUDES -## Files included with XInclude -DOC_INCLUDES ?= - -## @ DOC_FIGURES -## Figures and other external data -DOC_FIGURES ?= - -## @ DOC_FORMATS -## The default formats to be built and installed -DOC_FORMATS ?= docbook -_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) - -## @ DOC_LINGUAS -## The languages this document is translated into -DOC_LINGUAS ?= -_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ - $(filter $(LINGUAS),$(DOC_LINGUAS)), \ - $(DOC_LINGUAS)) - -_DOC_ABS_SRCDIR = @abs_srcdir@ - - -################################################################################ -## Variables for Bootstrapping - -_xml2po ?= `which xml2po` - -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl - -if ENABLE_SK -_ENABLE_SK = true -_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` -_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` -_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml -endif - - -################################################################################ -## @@ Rules for OMF Files - -db2omf_args = \ - --stringparam db2omf.basename $(DOC_MODULE) \ - --stringparam db2omf.format $(3) \ - --stringparam db2omf.dtd \ - $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ - | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ - --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ - --stringparam db2omf.omf_dir "$(OMF_DIR)" \ - --stringparam db2omf.help_dir "$(HELP_DIR)" \ - --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ - $(if $(_ENABLE_SK), \ - --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ - $(_db2omf) $(2) - -## @ _DOC_OMF_IN -## The OMF input file -_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) - -## @ _DOC_OMF_DB -## The OMF files for DocBook output -_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) - -$(_DOC_OMF_DB) : $(_DOC_OMF_IN) -$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml - @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ - echo "The file '$(_skcontentslist)' does not exist." >&2; \ - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } - -## @ _DOC_OMF_HTML -## The OMF files for HTML output -_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ - $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) - -$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) -$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml -if ENABLE_SK - @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ - echo "The file '$(_skcontentslist)' does not exist" >&2; \ - echo "Please check your ScrollKeeper installation." >&2; \ - exit 1; } -endif - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } - -## @ _DOC_OMF_ALL -## All OMF output files to be built -# FIXME -_DOC_OMF_ALL = \ - $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) - -.PHONY: omf -omf: $(_DOC_OMF_ALL) - - -################################################################################ -## @@ C Locale Documents - -## @ _DOC_C_MODULE -## The top-level documentation file in the C locale -_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) - -## @ _DOC_C_ENTITIES -## Files included with a SYSTEM entity in the C locale -_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) - -## @ _DOC_C_XINCLUDES -## Files included with XInclude in the C locale -_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) - -## @ _DOC_C_DOCS -## All documentation files in the C locale -_DOC_C_DOCS = \ - $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ - $(_DOC_C_MODULE) - -## @ _DOC_C_DOCS_NOENT -## All documentation files in the C locale, -## except files included with a SYSTEM entity -_DOC_C_DOCS_NOENT = \ - $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) - -## @ _DOC_C_FIGURES -## All figures and other external data in the C locale -_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ - $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) - -## @ _DOC_C_HTML -## All HTML documentation in the C locale -# FIXME: probably have to shell escape to determine the file names -_DOC_C_HTML = $(foreach f, \ - $(shell xsltproc --xinclude \ - --stringparam db.chunk.basename "$(DOC_MODULE)" \ - $(_chunks) "C/$(DOC_MODULE).xml"), \ - C/$(f).xhtml) - -############################################################################### -## @@ Other Locale Documentation - -## @ _DOC_POFILES -## The .po files used for translating the document -_DOC_POFILES = $(if $(DOC_MODULE), \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) - -.PHONY: po -po: $(_DOC_POFILES) - -## @ _DOC_LC_MODULES -## The top-level documentation files in all other locales -_DOC_LC_MODULES = $(if $(DOC_MODULE), \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) - -## @ _DOC_LC_XINCLUDES -## Files included with XInclude in all other locales -_DOC_LC_INCLUDES = \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ - $(lc)/$(notdir $(inc)) )) - -## @ _DOC_LC_HTML -## All HTML documentation in all other locales -# FIXME: probably have to shell escape to determine the file names -_DOC_LC_HTML = \ - $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ - $(lc)/$(notdir $(doc)) )) - -## @ _DOC_LC_DOCS -## All documentation files in all other locales -_DOC_LC_DOCS = \ - $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \ - $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) - -## @ _DOC_LC_FIGURES -## All figures and other external data in all other locales -_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ - $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) - -_DOC_SRC_FIGURES = \ - $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ - $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) - -$(_DOC_POFILES): - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - @if test ! -f $@ -a -f $(srcdir)/$@; then \ - echo "cp $(srcdir)/$@ $@"; \ - cp "$(srcdir)/$@" "$@"; \ - fi; - @docs=; \ - list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ - docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ - done; \ - if ! test -f $@; then \ - echo "(cd $(dir $@) && \ - $(_xml2po) -e $$docs > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ - (cd $(dir $@) && \ - $(_xml2po) -e $$docs > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ - else \ - echo "(cd $(dir $@) && \ - $(_xml2po) -e -u $(notdir $@) $$docs)"; \ - (cd $(dir $@) && \ - $(_xml2po) -e -u $(notdir $@) $$docs); \ - fi - -# FIXME: fix the dependancy -# FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_POFILES) -$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ - (cd $(dir $@) && \ - $(_xml2po) -e -p \ - "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \ - "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ - cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) - -## @ _DOC_POT -## A pot file -_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot) -.PHONY: pot -pot: $(_DOC_POT) -$(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -e -o $@ $^ - - -################################################################################ -## @@ All Documentation - -## @ _DOC_HTML_ALL -## All HTML documentation, only if it's built -_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ - $(_DOC_C_HTML) $(_DOC_LC_HTML)) - -_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) - -$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) - - -################################################################################ - -all: \ - $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ - $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ - $(_DOC_HTML_ALL) $(_DOC_POFILES) - - -.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir - -clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) -clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) -clean-doc-lc: - rm -f $(_DOC_LC_DOCS) - @list='$(_DOC_POFILES)'; for po in $$list; do \ - if ! test "$$po" -ef "$(srcdir)/$$po"; then \ - echo "rm -f $$po"; \ - rm -f "$$po"; \ - fi; \ - done - @for lc in C $(_DOC_REAL_LINGUAS); do \ - if test -f "$$lc/.xml2po.mo"; then \ - echo "rm -f $$lc/.xml2po.mo"; \ - rm -f "$$lc/.xml2po.mo"; \ - fi; \ - done -clean-doc-dir: - @for lc in C $(_DOC_REAL_LINGUAS); do \ - for dir in `find $$lc -depth -type d`; do \ - if ! test $$dir -ef $(srcdir)/$$dir; then \ - echo "rmdir $$dir"; \ - rmdir "$$dir"; \ - fi; \ - done; \ - done - -_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) -_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) -_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) -_clean_dir = $(if $(DOC_MODULE),clean-doc-dir) - -clean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -distclean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -mostlyclean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) -maintainer-clean-local: \ - $(_clean_omf) $(_clean_dsk) \ - $(_clean_lc) $(_clean_dir) - - -.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk -doc-dist-hook: \ - $(if $(DOC_MODULE),dist-doc-docs) \ - $(if $(_DOC_C_FIGURES),dist-doc-figs) \ - $(if $(_DOC_OMF_IN),dist-doc-omf) -# $(if $(_DOC_DSK_IN),dist-doc-dsk) - -dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) - @for lc in C $(_DOC_REAL_LINGUAS); do \ - echo " $(mkinstalldirs) $(distdir)/$$lc"; \ - $(mkinstalldirs) "$(distdir)/$$lc"; \ - done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \ - for doc in $$list; do \ - if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ - docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - if ! test -d "$(distdir)/$$docdir"; then \ - echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ - $(mkinstalldirs) "$(distdir)/$$docdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ - $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ - done - -dist-doc-figs: $(_DOC_SRC_FIGURES) - @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ - for fig in $$list; do \ - if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$fig"; then \ - figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - if ! test -d "$(distdir)/$$figdir"; then \ - echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ - $(mkinstalldirs) "$(distdir)/$$figdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ - $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ - fi; \ - done; - -dist-doc-omf: - @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ - $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" - -dist-doc-dsk: - @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ - echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ - $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" - - -.PHONY: check-doc-docs check-doc-omf -check: \ - $(if $(DOC_MODULE),check-doc-docs) \ - $(if $(_DOC_OMF_IN),check-doc-omf) - -check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - @for lc in C $(_DOC_REAL_LINGUAS); do \ - if test -f "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ - done - -check-doc-omf: $(_DOC_OMF_ALL) - @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ - xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ - done - - -.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk -install-data-local: \ - $(if $(DOC_MODULE),install-doc-docs) \ - $(if $(_DOC_HTML_ALL),install-doc-html) \ - $(if $(_DOC_C_FIGURES),install-doc-figs) \ - $(if $(_DOC_OMF_IN),install-doc-omf) -# $(if $(_DOC_DSK_IN),install-doc-dsk) - -install-doc-docs: - @for lc in C $(_DOC_REAL_LINGUAS); do \ - echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \ - $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \ - done - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ - if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ - docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \ - if ! test -d "$$docdir"; then \ - echo "$(mkinstalldirs) $$docdir"; \ - $(mkinstalldirs) "$$docdir"; \ - fi; \ - echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \ - done - -install-doc-figs: - @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ - for lc in C $(_DOC_REAL_LINGUAS); do \ - figsymlink=false; \ - if test -f "$$lc/$$fig"; then \ - figfile="$$lc/$$fig"; \ - elif test -f "$(srcdir)/$$lc/$$fig"; then \ - figfile="$(srcdir)/$$lc/$$fig"; \ - else \ - figsymlink=true; \ - fi; \ - figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ - figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \ - if ! test -d "$$figdir"; then \ - echo "$(mkinstalldirs) $$figdir"; \ - $(mkinstalldirs) "$$figdir"; \ - fi; \ - figbase=`echo $$fig | sed -e 's/^.*\///'`; \ - if $$figsymlink; then \ - echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ - ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ - else \ - echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ - $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ - fi; \ - done; \ - done - -install-doc-html: - echo install-html - -install-doc-omf: - $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE) - @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ - done - @if test "x$(_ENABLE_SK)" = "xtrue"; then \ - echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ - scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \ - fi; - -install-doc-dsk: - echo install-dsk - - -.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk -uninstall-local: \ - $(if $(DOC_MODULE),uninstall-doc-docs) \ - $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ - $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ - $(if $(_DOC_OMF_IN),uninstall-doc-omf) -# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) - -uninstall-doc-docs: - @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \ - echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \ - done - -uninstall-doc-figs: - @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ - echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ - rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \ - done; - -uninstall-doc-omf: - @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ - if test "x$(_ENABLE_SK)" = "xtrue"; then \ - echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - fi; \ - echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - done diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/INSTALL /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/INSTALL --- gedit-plugins-2.26.1/INSTALL 2009-03-28 10:38:59.000000000 +0000 +++ gedit-plugins-2.26.2/INSTALL 2009-05-17 00:32:21.000000000 +0100 @@ -1,16 +1,19 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -These are generic installation instructions. + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,42 +67,57 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -125,7 +140,7 @@ Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,14 +152,36 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -170,9 +207,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -181,7 +218,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -190,21 +227,29 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -231,6 +276,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/ltmain.sh /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/ltmain.sh --- gedit-plugins-2.26.1/ltmain.sh 2009-04-11 11:43:33.000000000 +0100 +++ gedit-plugins-2.26.2/ltmain.sh 2009-05-17 00:32:15.000000000 +0100 @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 +# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,7 +73,7 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=2.2.6 +VERSION="2.2.6 Debian-2.2.6a-1ubuntu1" TIMESTAMP="" package_revision=1.3012 @@ -5033,7 +5033,10 @@ case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6206,6 +6209,9 @@ revision="$number_minor" lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; esac ;; no) diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/m4/gnome-doc-utils.m4 /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/m4/gnome-doc-utils.m4 --- gedit-plugins-2.26.1/m4/gnome-doc-utils.m4 2009-04-11 11:43:34.000000000 +0100 +++ gedit-plugins-2.26.2/m4/gnome-doc-utils.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) - -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) - -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) - -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) - -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -]) - -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -# -AC_DEFUN([GNOME_DOC_INIT], -[AC_REQUIRE([AC_PROG_LN_S])dnl - -ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], - [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - -if test "$gdu_cv_have_gdu" = "yes"; then - ifelse([$2],,[:],[$2]) -else - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -fi - -GNOME_DOC_DEFINES -]) diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/m4/intltool.m4 /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/m4/intltool.m4 --- gedit-plugins-2.26.1/m4/intltool.m4 2009-04-11 11:43:34.000000000 +0100 +++ gedit-plugins-2.26.2/m4/intltool.m4 2009-05-17 00:32:15.000000000 +0100 @@ -75,25 +75,25 @@ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) -AC_SUBST(INTLTOOL_KEYS_RULE) -AC_SUBST(INTLTOOL_PROP_RULE) -AC_SUBST(INTLTOOL_OAF_RULE) -AC_SUBST(INTLTOOL_PONG_RULE) -AC_SUBST(INTLTOOL_SERVER_RULE) -AC_SUBST(INTLTOOL_SHEET_RULE) -AC_SUBST(INTLTOOL_SOUNDLIST_RULE) -AC_SUBST(INTLTOOL_UI_RULE) -AC_SUBST(INTLTOOL_XAM_RULE) -AC_SUBST(INTLTOOL_KBD_RULE) -AC_SUBST(INTLTOOL_XML_RULE) -AC_SUBST(INTLTOOL_XML_NOMERGE_RULE) -AC_SUBST(INTLTOOL_CAVES_RULE) -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -AC_SUBST(INTLTOOL_POLICY_RULE) +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) # Check the gettext tools to make sure they are GNU AC_PATH_PROG(XGETTEXT, xgettext) @@ -110,12 +110,17 @@ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi -AC_PATH_PROG(INTLTOOL_PERL, [perl]) +AC_PATH_PROG(INTLTOOL_PERL, perl) if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found; required for intltool]) + AC_MSG_ERROR([perl not found]) fi -if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then - AC_MSG_ERROR([perl 5.x required for intltool]) +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) fi if test "x$2" != "xno-xml"; then AC_MSG_CHECKING([for XML::Parser]) @@ -171,7 +176,7 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" @@ -193,6 +198,17 @@ ])dnl ]) +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/m4/libtool.m4 /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/m4/libtool.m4 --- gedit-plugins-2.26.1/m4/libtool.m4 2009-04-11 11:43:34.000000000 +0100 +++ gedit-plugins-2.26.2/m4/libtool.m4 2009-05-17 00:32:15.000000000 +0100 @@ -2470,13 +2470,10 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2488,6 +2485,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3079,7 +3088,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3760,7 +3769,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4185,6 +4194,9 @@ cygwin* | mingw* | cegcc*) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ;; + linux* | k*bsd*-gnu) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4431,7 +4443,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -4606,6 +4618,7 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -4844,7 +4857,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/Makefile.am --- gedit-plugins-2.26.1/Makefile.am 2009-03-28 10:38:59.000000000 +0000 +++ gedit-plugins-2.26.2/Makefile.am 2009-05-17 00:32:09.000000000 +0100 @@ -4,16 +4,33 @@ EXTRA_DIST = \ autogen.sh \ - ChangeLog \ - gnome-doc-utils.make \ + ChangeLog-20090414 \ + gedit-plugins.doap \ intltool-extract.in \ intltool-merge.in \ intltool-update.in DISTCLEANFILES = \ - gnome-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update DISTCHECK_CONFIGURE_FLAGS = --with-plugins=really-all + +CHANGELOG_START = GEDIT_PLUGINS_2_26_2 + +dist-hook: + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + (GIT_DIR=$(top_srcdir)/.git \ + ./missing --run git log $(CHANGELOG_START)^^.. --stat -M -C --name-status --date=short --no-color) | \ + fmt --split-only > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/Makefile.in --- gedit-plugins-2.26.1/Makefile.in 2009-04-11 11:43:41.000000000 +0100 +++ gedit-plugins-2.26.2/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -38,11 +38,11 @@ config.guess config.sub depcomp install-sh ltmain.sh missing \ mkinstalldirs py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -97,9 +97,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = --with-plugins=really-all DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -122,7 +120,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -130,29 +127,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -173,7 +151,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -274,18 +251,19 @@ SUBDIRS = plugins po EXTRA_DIST = \ autogen.sh \ - ChangeLog \ - gnome-doc-utils.make \ + ChangeLog-20090414 \ + gedit-plugins.doap \ intltool-extract.in \ intltool-merge.in \ intltool-update.in DISTCLEANFILES = \ - gnome-doc-utils.make \ intltool-extract \ intltool-merge \ intltool-update +DISTCHECK_CONFIGURE_FLAGS = --with-plugins=really-all +CHANGELOG_START = GEDIT_PLUGINS_2_26_2 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -525,6 +503,9 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ @@ -721,19 +702,35 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am + + +dist-hook: + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + (GIT_DIR=$(top_srcdir)/.git \ + ./missing --run git log $(CHANGELOG_START)^^.. --stat -M -C --name-status --date=short --no-color) | \ + fmt --split-only > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/NEWS /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/NEWS --- gedit-plugins-2.26.1/NEWS 2009-04-11 11:40:41.000000000 +0100 +++ gedit-plugins-2.26.2/NEWS 2009-05-17 00:29:51.000000000 +0100 @@ -1,4 +1,16 @@ ==================== +gedit-plugins 2.26.2 +==================== + +New features and fixes +====================== +- Misc Bugfixes. + +New and updated translations +============================ +- Sweta Kothari (gu) + +==================== gedit-plugins 2.26.1 ==================== diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bookmarks/bookmarks.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bookmarks/bookmarks.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/bookmarks/bookmarks.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/bookmarks/bookmarks.gedit-plugin.desktop.in 2009-05-17 00:32:26.000000000 +0100 @@ -6,4 +6,4 @@ Authors=Jesse van den Kieboom Copyright=Copyright @ 2009 Jesse van den Kieboom Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bookmarks/gedit-bookmarks-plugin.c /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bookmarks/gedit-bookmarks-plugin.c --- gedit-plugins-2.26.1/plugins/bookmarks/gedit-bookmarks-plugin.c 2009-04-11 11:35:04.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/bookmarks/gedit-bookmarks-plugin.c 2009-04-25 15:33:16.000000000 +0100 @@ -221,30 +221,43 @@ g_object_set_data (G_OBJECT (buffer), INSERT_DATA_KEY, NULL); } +static GdkPixbuf * +get_bookmark_pixbuf (GeditPlugin *plugin) +{ + gchar *datadir; + gchar *iconpath; + GdkPixbuf *pixbuf; + + datadir = gedit_plugin_get_data_dir (plugin); + iconpath = g_build_filename (datadir, "bookmark.png", NULL); + pixbuf = gdk_pixbuf_new_from_file (iconpath, NULL); + + g_free (datadir); + g_free (iconpath); + + return pixbuf; +} + static void enable_bookmarks (GeditView *view, - const gchar *datadir) + GeditPlugin *plugin) { - gchar *iconpath = g_build_filename (datadir, "bookmark.png", NULL); - GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file (iconpath, NULL); - GtkSourceView *source_view = GTK_SOURCE_VIEW (view); + GdkPixbuf *pixbuf; + + pixbuf = get_bookmark_pixbuf (plugin); - g_free (iconpath); - /* Make sure the category pixbuf is set */ if (pixbuf) { InsertData *data; GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - - + update_background_color (view); gtk_source_view_set_mark_category_pixbuf (GTK_SOURCE_VIEW (view), BOOKMARK_CATEGORY, pixbuf); g_object_unref (pixbuf); - gtk_source_view_set_show_line_marks (GTK_SOURCE_VIEW (view), TRUE); g_signal_connect (buffer, @@ -299,7 +312,6 @@ WindowData *data; GList *views; GList *item; - gchar *datadir; gedit_debug (DEBUG_PLUGINS); @@ -309,14 +321,13 @@ data, (GDestroyNotify) free_window_data); - datadir = gedit_plugin_get_data_dir (plugin); views = gedit_window_get_views (window); - for (item = views; item != NULL; item = item->next) - enable_bookmarks (GEDIT_VIEW (item->data), datadir); - + { + enable_bookmarks (GEDIT_VIEW (item->data), plugin); + } + g_list_free (views); - g_free (datadir); g_signal_connect (window, "tab-added", G_CALLBACK (on_tab_added), plugin); @@ -496,7 +507,6 @@ gint len, InsertData *data) { - GtkTextIter iter; gint current; if (data->previous_line == -1) @@ -534,7 +544,6 @@ GtkTextBuffer *buffer; GtkTextIter iter; GSList *marks; - GSList *item; if (!doc) return; @@ -648,9 +657,7 @@ GeditTab *tab, GeditPlugin *plugin) { - gchar *datadir = gedit_plugin_get_data_dir (plugin); - enable_bookmarks (gedit_tab_get_view (tab), datadir); - g_free (datadir); + enable_bookmarks (gedit_tab_get_view (tab), plugin); } static void diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bookmarks/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bookmarks/Makefile.am --- gedit-plugins-2.26.1/plugins/bookmarks/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/bookmarks/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -32,3 +32,5 @@ CLEANFILES = $(BUILDFILES) DISTCLEANFILES = $(BUILDFILES) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bookmarks/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bookmarks/Makefile.in --- gedit-plugins-2.26.1/plugins/bookmarks/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/bookmarks/Makefile.in 2009-05-17 00:32:20.000000000 +0100 @@ -37,11 +37,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/bookmarks.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -105,9 +105,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -130,7 +128,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -138,29 +135,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -181,7 +159,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -627,6 +604,8 @@ %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in 2009-05-17 00:32:26.000000000 +0100 @@ -8,4 +8,4 @@ Authors=Steve Frécinaux Copyright=Copyright @ 2006 Steve Frécinaux Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bracketcompletion/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bracketcompletion/Makefile.am --- gedit-plugins-2.26.1/plugins/bracketcompletion/Makefile.am 2009-03-28 10:38:59.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/bracketcompletion/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -11,3 +11,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/bracketcompletion/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/bracketcompletion/Makefile.in --- gedit-plugins-2.26.1/plugins/bracketcompletion/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/bracketcompletion/Makefile.in 2009-05-17 00:32:20.000000000 +0100 @@ -37,11 +37,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/bracketcompletion.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,9 +83,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -108,7 +106,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -116,29 +113,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -159,7 +137,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -487,6 +464,8 @@ uninstall-pluginDATA uninstall-pluginPYTHON %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/charmap/charmap.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/charmap/charmap.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/charmap/charmap.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/charmap/charmap.gedit-plugin.desktop.in 2009-05-17 00:32:26.000000000 +0100 @@ -7,4 +7,4 @@ Authors=Steve Frécinaux Copyright=Copyright @ 2006 Steve Frécinaux Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/charmap/gedit-charmap-panel.c /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/charmap/gedit-charmap-panel.c --- gedit-plugins-2.26.1/plugins/charmap/gedit-charmap-panel.c 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/charmap/gedit-charmap-panel.c 2009-04-25 15:33:16.000000000 +0100 @@ -34,82 +34,80 @@ struct _GeditCharmapPanelPrivate { - GucharmapChaptersView *chapters_view; - GucharmapChartable *chartable; + GucharmapChaptersView *chapters_view; + GucharmapChartable *chartable; }; GEDIT_PLUGIN_DEFINE_TYPE(GeditCharmapPanel, gedit_charmap_panel, GTK_TYPE_VBOX) static void on_chapter_view_selection_changed (GtkTreeSelection *selection, - GeditCharmapPanel *panel) + GeditCharmapPanel *panel) { - GeditCharmapPanelPrivate *priv = panel->priv; - GucharmapCodepointList *codepoint_list; - GtkTreeIter iter; - - if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) - return; - - codepoint_list = gucharmap_chapters_view_get_codepoint_list (priv->chapters_view); - gucharmap_chartable_set_codepoint_list (priv->chartable, codepoint_list); - g_object_unref (codepoint_list); + GeditCharmapPanelPrivate *priv = panel->priv; + GucharmapCodepointList *codepoint_list; + GtkTreeIter iter; + + if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) + return; + + codepoint_list = gucharmap_chapters_view_get_codepoint_list (priv->chapters_view); + gucharmap_chartable_set_codepoint_list (priv->chartable, codepoint_list); + g_object_unref (codepoint_list); } static void gedit_charmap_panel_init (GeditCharmapPanel *panel) { - GeditCharmapPanelPrivate *priv; - GucharmapCodepointList *codepoint_list; + GeditCharmapPanelPrivate *priv; GtkPaned *paned; - GtkWidget *scrolled_window, *view, *chartable; - GtkTreeSelection *selection; - GucharmapChaptersModel *model; - GtkTreeIter iter; + GtkWidget *scrolled_window, *view, *chartable; + GtkTreeSelection *selection; + GucharmapChaptersModel *model; priv = panel->priv = GEDIT_CHARMAP_PANEL_GET_PRIVATE (panel); paned = GTK_PANED (gtk_vpaned_new ()); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_ETCHED_IN); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_SHADOW_ETCHED_IN); - view = gucharmap_chapters_view_new (); - priv->chapters_view = GUCHARMAP_CHAPTERS_VIEW (view); + view = gucharmap_chapters_view_new (); + priv->chapters_view = GUCHARMAP_CHAPTERS_VIEW (view); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE); model = gucharmap_script_chapters_model_new (); - gucharmap_chapters_view_set_model (priv->chapters_view, model); - g_object_unref (model); + gucharmap_chapters_view_set_model (priv->chapters_view, model); + g_object_unref (model); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - g_signal_connect (selection, "changed", - G_CALLBACK (on_chapter_view_selection_changed), panel); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); + g_signal_connect (selection, "changed", + G_CALLBACK (on_chapter_view_selection_changed), panel); - gtk_container_add (GTK_CONTAINER (scrolled_window), view); - gtk_widget_show (view); + gtk_container_add (GTK_CONTAINER (scrolled_window), view); + gtk_widget_show (view); gtk_paned_pack1 (paned, scrolled_window, FALSE, TRUE); - gtk_widget_show (scrolled_window); + gtk_widget_show (scrolled_window); - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_ETCHED_IN); + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_SHADOW_ETCHED_IN); - chartable = gucharmap_chartable_new (); + chartable = gucharmap_chartable_new (); priv->chartable = GUCHARMAP_CHARTABLE (chartable); - gtk_container_add (GTK_CONTAINER (scrolled_window), chartable); - gtk_widget_show (chartable); + gtk_container_add (GTK_CONTAINER (scrolled_window), chartable); + gtk_widget_show (chartable); gtk_paned_pack2 (paned, scrolled_window, TRUE, TRUE); - gtk_widget_show (scrolled_window); + gtk_widget_show (scrolled_window); - gucharmap_chapters_view_select_locale (priv->chapters_view); + gucharmap_chapters_view_select_locale (priv->chapters_view); gtk_paned_set_position (paned, 150); diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/charmap/gedit-charmap-plugin.h /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/charmap/gedit-charmap-plugin.h --- gedit-plugins-2.26.1/plugins/charmap/gedit-charmap-plugin.h 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/charmap/gedit-charmap-plugin.h 2009-04-25 15:33:16.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gedit-charmap-plugin.h 137 2006-04-23 15:13:27Z sfre $ + * $Id$ */ #ifndef __GEDIT_CHARMAP_PLUGIN_H__ diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/charmap/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/charmap/Makefile.am --- gedit-plugins-2.26.1/plugins/charmap/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/charmap/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -31,3 +31,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/charmap/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/charmap/Makefile.in --- gedit-plugins-2.26.1/plugins/charmap/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/charmap/Makefile.in 2009-05-17 00:32:20.000000000 +0100 @@ -37,11 +37,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/charmap.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -106,9 +106,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -131,7 +129,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -139,29 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -182,7 +160,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -608,6 +585,8 @@ %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/codecomment/codecomment.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/codecomment/codecomment.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/codecomment/codecomment.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/codecomment/codecomment.gedit-plugin.desktop.in 2009-05-17 00:32:26.000000000 +0100 @@ -7,4 +7,4 @@ Authors=Alejandro Garcia \nMatthew Dugan Copyright=Copyright @ 2005-2006 Igalia, S.L.\nCopyright @ 2006 Matthew Dugan Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/codecomment/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/codecomment/Makefile.am --- gedit-plugins-2.26.1/plugins/codecomment/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/codecomment/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -12,3 +12,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/codecomment/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/codecomment/Makefile.in --- gedit-plugins-2.26.1/plugins/codecomment/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/codecomment/Makefile.in 2009-05-17 00:32:20.000000000 +0100 @@ -37,11 +37,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/codecomment.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,9 +83,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -108,7 +106,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -116,29 +113,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -159,7 +137,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -489,6 +466,8 @@ uninstall-pluginDATA uninstall-pluginPYTHON %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/colorpicker/colorpicker.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/colorpicker/colorpicker.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/colorpicker/colorpicker.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/colorpicker/colorpicker.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -8,4 +8,4 @@ Authors=Jesse van den Kieboom Copyright=Copyright @ 2006 Jesse van den Kieboom Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/colorpicker/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/colorpicker/Makefile.am --- gedit-plugins-2.26.1/plugins/colorpicker/Makefile.am 2009-03-28 10:38:59.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/colorpicker/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -12,3 +12,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/colorpicker/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/colorpicker/Makefile.in --- gedit-plugins-2.26.1/plugins/colorpicker/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/colorpicker/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -37,11 +37,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/colorpicker.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,9 +83,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -108,7 +106,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -116,29 +113,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -159,7 +137,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -489,6 +466,8 @@ uninstall-pluginDATA uninstall-pluginPYTHON %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/drawspaces/drawspaces.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/drawspaces/drawspaces.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/drawspaces/drawspaces.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/drawspaces/drawspaces.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -6,4 +6,4 @@ Authors=Paolo Borelli \nSteve Frécinaux \nIgnacio Casal Quinteiro Copyright=Copyright © 2006 Paolo Borelli\nCopyright © 2007 Steve Frécinaux\nCopyright © 2008 Ignacio Casal Quinteiro Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/drawspaces/gedit-drawspaces-plugin.c /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/drawspaces/gedit-drawspaces-plugin.c --- gedit-plugins-2.26.1/plugins/drawspaces/gedit-drawspaces-plugin.c 2009-04-11 11:35:04.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/drawspaces/gedit-drawspaces-plugin.c 2009-05-03 11:36:12.000000000 +0100 @@ -28,6 +28,7 @@ #include #include #include +#include #include @@ -316,8 +317,7 @@ impl_activate (GeditPlugin *plugin, GeditWindow *window) { - GList *views, *l; - GeditDrawspacesPlugin *ds_plugin = GEDIT_DRAWSPACES_PLUGIN (plugin); + GeditDrawspacesPlugin *ds_plugin; GtkUIManager *manager; GError *error = NULL; GtkAction *action; @@ -326,6 +326,8 @@ gedit_debug (DEBUG_PLUGINS); + ds_plugin = GEDIT_DRAWSPACES_PLUGIN (plugin); + data = g_slice_new (WindowData); action_data = g_slice_new (ActionData); @@ -398,7 +400,7 @@ ds_plugin->priv->flags = 0; draw_spaces (ds_plugin); - g_signal_handlers_disconnect_by_func (window, tab_added_cb, NULL); + g_signal_handlers_disconnect_by_func (window, tab_added_cb, ds_plugin); gtk_ui_manager_remove_ui (manager, data->ui_id); gtk_ui_manager_remove_action_group (manager, data->action_group); diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/drawspaces/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/drawspaces/Makefile.am --- gedit-plugins-2.26.1/plugins/drawspaces/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/drawspaces/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -31,3 +31,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/drawspaces/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/drawspaces/Makefile.in --- gedit-plugins-2.26.1/plugins/drawspaces/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/drawspaces/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -37,11 +37,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/drawspaces.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -106,9 +106,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -131,7 +129,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -139,29 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -182,7 +160,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -626,6 +603,8 @@ %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/gpdefs.py /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/gpdefs.py --- gedit-plugins-2.26.1/plugins/gpdefs.py 2009-04-11 11:43:47.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/gpdefs.py 2009-05-17 00:32:26.000000000 +0100 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -VERSION = "2.26.1" +VERSION = "2.26.2" PACKAGE = "gedit-plugins" -PACKAGE_STRING = "gedit-plugins 2.26.1" +PACKAGE_STRING = "gedit-plugins 2.26.2" GETTEXT_PACKAGE = "gedit-plugins" -GP_LOCALEDIR = "/opt/gnome/share/locale" +GP_LOCALEDIR = "/opt/gnome2/share/locale" diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/joinlines/joinlines.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/joinlines/joinlines.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/joinlines/joinlines.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/joinlines/joinlines.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -7,4 +7,4 @@ Authors=Steve Frécinaux \nAndré Homeyer Copyright=Copyright @ 2006-2007 Steve Frécinaux, André Homeyer Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/joinlines/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/joinlines/Makefile.am --- gedit-plugins-2.26.1/plugins/joinlines/Makefile.am 2009-03-28 10:38:59.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/joinlines/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -12,3 +12,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/joinlines/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/joinlines/Makefile.in --- gedit-plugins-2.26.1/plugins/joinlines/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/joinlines/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -37,11 +37,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/joinlines.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -83,9 +83,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -108,7 +106,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -116,29 +113,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -159,7 +137,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -489,6 +466,8 @@ uninstall-pluginDATA uninstall-pluginPYTHON %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/Makefile.am --- gedit-plugins-2.26.1/plugins/Makefile.am 2009-03-28 10:38:59.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -2,7 +2,7 @@ DIST_SUBDIRS = $(DIST_PLUGINS) plugindir = $(libdir)/gedit-2/plugins -plugin_PYTHON = \ +plugin_PYTHON = \ gpdefs.py DISTCLEANFILES = \ @@ -10,3 +10,5 @@ EXTRA_DIST = \ gpdefs.py.in + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/Makefile.in --- gedit-plugins-2.26.1/plugins/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/Makefile.in 2009-05-17 00:32:20.000000000 +0100 @@ -35,11 +35,11 @@ DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/gpdefs.py.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -90,9 +90,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -115,7 +113,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -123,29 +120,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -166,7 +144,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -623,6 +600,8 @@ tags tags-recursive uninstall uninstall-am \ uninstall-pluginPYTHON + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/sessionsaver/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/sessionsaver/Makefile.am --- gedit-plugins-2.26.1/plugins/sessionsaver/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/sessionsaver/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -16,3 +16,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/sessionsaver/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/sessionsaver/Makefile.in --- gedit-plugins-2.26.1/plugins/sessionsaver/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/sessionsaver/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -39,11 +39,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/sessionsaver.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -87,9 +87,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -112,7 +110,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -120,29 +117,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -163,7 +141,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -512,6 +489,8 @@ uninstall-uiDATA %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -7,4 +7,4 @@ Authors=Steve Frécinaux Copyright=Copyright © 2006 Steve Frécinaux Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/showtabbar/gedit-show-tabbar-plugin.c /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/showtabbar/gedit-show-tabbar-plugin.c --- gedit-plugins-2.26.1/plugins/showtabbar/gedit-show-tabbar-plugin.c 2009-03-28 10:39:01.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/showtabbar/gedit-show-tabbar-plugin.c 2009-04-25 15:33:16.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gedit-show-tabbar-plugin.c 189 2006-08-21 20:50:39Z sfre $ + * $Id$ */ #ifdef HAVE_CONFIG_H diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/showtabbar/gedit-show-tabbar-plugin.h /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/showtabbar/gedit-show-tabbar-plugin.h --- gedit-plugins-2.26.1/plugins/showtabbar/gedit-show-tabbar-plugin.h 2009-03-28 10:39:01.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/showtabbar/gedit-show-tabbar-plugin.h 2009-04-25 15:33:16.000000000 +0100 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gedit-show-tabbar-plugin.h 134 2006-04-16 12:38:23Z sfre $ + * $Id$ */ #ifndef __GEDIT_SHOW_TABBAR_PLUGIN_H__ diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/showtabbar/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/showtabbar/Makefile.am --- gedit-plugins-2.26.1/plugins/showtabbar/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/showtabbar/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -46,3 +46,5 @@ CLEANFILES = $(plugin_DATA) $(schemas_DATA) DISTCLEANFILES = $(plugin_DATA) $(schemas_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/showtabbar/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/showtabbar/Makefile.in --- gedit-plugins-2.26.1/plugins/showtabbar/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/showtabbar/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -37,11 +37,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/showtabbar.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -106,9 +106,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -131,7 +129,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -139,29 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -182,7 +160,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -638,6 +615,8 @@ @GCONF_SCHEMAS_INSTALL_TRUE@ done \ @GCONF_SCHEMAS_INSTALL_TRUE@ fi @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/showtabbar/showtabbar.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/showtabbar/showtabbar.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/showtabbar/showtabbar.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/showtabbar/showtabbar.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -6,4 +6,4 @@ Authors=Steve Frécinaux Copyright=Copyright © 2006 Steve Frécinaux Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/smartspaces/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/smartspaces/Makefile.am --- gedit-plugins-2.26.1/plugins/smartspaces/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/smartspaces/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -16,3 +16,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/smartspaces/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/smartspaces/Makefile.in --- gedit-plugins-2.26.1/plugins/smartspaces/Makefile.in 2009-04-11 11:43:40.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/smartspaces/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -39,11 +39,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/smartspaces.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -85,9 +85,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -110,7 +108,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -118,29 +115,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -161,7 +139,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -489,6 +466,8 @@ %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/smartspaces/smartspaces.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/smartspaces/smartspaces.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/smartspaces/smartspaces.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/smartspaces/smartspaces.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -8,4 +8,4 @@ Authors=Steve Frécinaux Copyright=Copyright © 2006 Steve Frécinaux Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/terminal/Makefile.am /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/terminal/Makefile.am --- gedit-plugins-2.26.1/plugins/terminal/Makefile.am 2009-03-28 10:39:00.000000000 +0000 +++ gedit-plugins-2.26.2/plugins/terminal/Makefile.am 2009-05-05 11:16:50.000000000 +0100 @@ -12,3 +12,5 @@ CLEANFILES = $(plugin_DATA) DISTCLEANFILES = $(plugin_DATA) + +-include $(top_srcdir)/git.mk diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/terminal/Makefile.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/terminal/Makefile.in --- gedit-plugins-2.26.1/plugins/terminal/Makefile.in 2009-04-11 11:43:41.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/terminal/Makefile.in 2009-05-17 00:32:21.000000000 +0100 @@ -39,11 +39,11 @@ $(srcdir)/Makefile.in \ $(srcdir)/terminal.gedit-plugin.desktop.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -85,9 +85,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ DIST_PLUGINS = @DIST_PLUGINS@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ @@ -110,7 +108,6 @@ GREP = @GREP@ GUCHARMAP_CFLAGS = @GUCHARMAP_CFLAGS@ GUCHARMAP_LIBS = @GUCHARMAP_LIBS@ -HELP_DIR = @HELP_DIR@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -118,29 +115,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ @@ -161,7 +139,6 @@ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ @@ -487,6 +464,8 @@ uninstall-pluginDATA uninstall-pluginPYTHON %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache + +-include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/terminal/terminal.gedit-plugin.desktop.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/terminal/terminal.gedit-plugin.desktop.in --- gedit-plugins-2.26.1/plugins/terminal/terminal.gedit-plugin.desktop.in 2009-04-11 11:43:48.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/terminal/terminal.gedit-plugin.desktop.in 2009-05-17 00:32:27.000000000 +0100 @@ -8,4 +8,4 @@ Authors=Paolo Borelli Copyright=Copyright © 2005 Paolo Borelli Website=http://www.gedit.org -Version=2.26.1 +Version=2.26.2 diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/plugins/terminal/terminal.py /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/plugins/terminal/terminal.py --- gedit-plugins-2.26.1/plugins/terminal/terminal.py 2009-04-11 11:35:04.000000000 +0100 +++ gedit-plugins-2.26.2/plugins/terminal/terminal.py 2009-04-25 15:33:16.000000000 +0100 @@ -263,7 +263,7 @@ if uri is not None and gedit.utils.uri_has_file_scheme(uri): gfile = gio.File(uri) directory = gfile.get_parent() - return os.path.dirname(directory.get_path()) + return directory.get_path() return None def on_panel_populate_popup(self, panel, menu): diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/po/gu.po /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/po/gu.po --- gedit-plugins-2.26.1/po/gu.po 2009-03-28 10:38:57.000000000 +0000 +++ gedit-plugins-2.26.2/po/gu.po 2009-05-03 11:36:12.000000000 +0100 @@ -1,264 +1,279 @@ -# translation of gedit-plugins.HEAD.po to Gujarati +# translation of gedit-plugins.master.gu.po to Gujarati # This file is distributed under the same license as the PACKAGE package. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. -# Ankit Patel , 2004. # +# Ankit Patel , 2004. +# Sweta Kothari , 2009. msgid "" msgstr "" -"Project-Id-Version: gedit-plugins.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-08-10 03:21+0200\n" -"PO-Revision-Date: 2004-08-10 12:04+0530\n" -"Last-Translator: Ankit Patel \n" +"Project-Id-Version: gedit-plugins.master.gu\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gedit-plugins&component=general\n" +"POT-Creation-Date: 2009-04-17 14:22+0000\n" +"PO-Revision-Date: 2009-04-27 16:44+0530\n" +"Last-Translator: Sweta Kothari \n" "Language-Team: Gujarati\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n\n" - -#: plugins/ASCII/ascii.c:43 -msgid "_ASCII Table" -msgstr "_ASCII કોષ્ટક" - -#: plugins/ASCII/ascii.c:46 -msgid "Pop-up a dialog containing an ASCII Table" -msgstr "ASCII કોષ્ટકને સમાવતો સંવાદ પોપ-અપ કરો" - -#: plugins/ASCII/ascii.c:303 -msgid "Char" -msgstr "Char" - -#: plugins/ASCII/ascii.c:310 -msgid "Dec#" -msgstr "Dec#" - -#: plugins/ASCII/ascii.c:317 -msgid "Hex#" -msgstr "Hex#" - -#: plugins/ASCII/ascii.c:324 -msgid "Name" -msgstr "નામ" - -#: plugins/ASCII/ascii.c:369 -msgid "ASCII Table" -msgstr "ASCII કોષ્ટક" - -#: plugins/ASCII/ascii.c:382 plugins/ASCII/asciitable.glade2.h:2 -msgid "_Insert char" -msgstr "અક્ષર દાખલ કરો (_I)" - -#: plugins/ASCII/asciitable.glade2.h:1 -#: plugins/ASCII/ascii.gedit-plugin.desktop.in.h:1 -msgid "ASCII table" -msgstr "ASCII કોષ્ટક" - -#: plugins/ASCII/ascii.gedit-plugin.desktop.in.h:2 -msgid "This plugin displays a pop-up dialog which contains an ASCII Table." -msgstr "પ્લગઈનો પોપ-અપ સંવાદ પ્રદર્શિત કરે છે કે જે ASCII કોષ્ટક સમાવે છે." - -#: plugins/cvschangelog/cvschangelog.c:49 -msgid "Open CVS Chan_geLogs" -msgstr "CVS Chan_geLogs ખોલો" - -#: plugins/cvschangelog/cvschangelog.c:52 -msgid "Searches for ChangeLogs in the current document and opens them" -msgstr "વર્તમાન દસ્તાવેજમાં ChangeLogs માટે ખોલે છે અને તેમને ખોલે છે" - -#: plugins/cvschangelog/cvschangelog.gedit-plugin.desktop.in.h:1 -msgid "A plugin that opens ChangeLogs found in CVS commit messages." -msgstr "પ્લગઈન કે જે ChangeLogs ખોલે છે જે CVS સંગ્રહો સંદેશાઓમાં મળી આવે છે." - -#: plugins/cvschangelog/cvschangelog.gedit-plugin.desktop.in.h:2 -msgid "CVS ChangeLog" -msgstr "CVS ChangeLog" - -#: plugins/diff/diff.c:64 -msgid "Co_mpare Files..." -msgstr "ફાઈલો સરખાવો (_m)..." - -#: plugins/diff/diff.c:67 -msgid "Makes a diff file from two documents or files" -msgstr "બે દસ્તાવેજો અથવા ફાઈલોમાંથી તફાવત બનાવે છે" - -#. Create the dialog -#: plugins/diff/diff.c:270 plugins/diff/diff.gedit-plugin.desktop.in.h:1 -msgid "Compare Files" -msgstr "ફાઈલો સરખાવો" - -#: plugins/diff/diff.c:284 -msgid "C_ompare" -msgstr "સરખાવો (_o)" - -#: plugins/diff/diff.c:511 -msgid "Executed command" -msgstr "આદેશ ચલાવો" - -#: plugins/diff/diff.c:652 -msgid "The two documents you selected are the same." -msgstr "તમે પસંદ કરેલ બંને દસ્તાવેજો સરખા છે." - -#: plugins/diff/diff.c:660 -msgid "" -"The \"first\" file you selected does not exist.\n" -"\n" -"Please provide a valid file." -msgstr "" -"તમે પસંદ કરેલ \"પ્રથમ\" ફાઈલ અસ્તિત્વમાં નથી.\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "\n" -"મહેરબાની કરીને યોગ્ય ફાઈલ પૂરી પાડો." -#: plugins/diff/diff.c:669 -msgid "" -"The \"second\" file you selected does not exist.\n" -"\n" -"Please provide a valid file." -msgstr "" -"તમે પસંદ કરેલ \"બીજી\" ફાઈલ અસ્તિત્વમાં નથી.\n" -"\n" -"મહેરબાની કરીને યોગ્ય ફાઈલ પૂરી પાડો." - -#: plugins/diff/diff.c:677 -msgid "The two files you selected are the same." -msgstr "તમે પસંદ કરેલ બંને ફાઈલો સરખી છે." - -#: plugins/diff/diff.c:694 -msgid "The \"first\" document contains no text." -msgstr "\"પહેલુ\" દસ્તાવેજ કોઈ લખાણને સમાવતું નથી." - -#: plugins/diff/diff.c:728 -msgid "The \"second\" document contains no text." -msgstr "\"બીજુ\" દસ્તાવેજ કોઈ લખાણ સમાવતું નથી." - -#. FIXME: do better error reporting ... . Chema -#: plugins/diff/diff.c:754 -msgid "" -"Impossible to compare the selected documents.\n" -"\n" -"gedit could not create a temporary file." -msgstr "" -"પસંદ કરેલ દસ્તાવેજોને સરખાવવું અશક્ય છે.\n" -"\n" -"જીએડીટ કામચલાઉ ફાઈલ બનાવી શક્યું નહિં." - -#: plugins/diff/diff.c:778 plugins/diff/diff.c:791 -msgid "" -"Impossible to compare the selected documents.\n" -"\n" -"Error executing the diff command." -msgstr "" -"પસંદ કરેલ દસ્તાવેજોને સરખાવવું અશક્ય છે.\n" -"\n" -"diff આદેશ ચલાવવામાં ભૂલ." - -#: plugins/diff/diff.c:813 -msgid "No differences were found between the selected documents." -msgstr "પસંદ કરેલ દસ્તાવેજો કોઈ તફાવતો મળ્યા નથી." - -#: plugins/diff/diff.c:854 -msgid "" -"Impossible to compare the selected documents.\n" -"\n" -"The result contains invalid UTF-8 data." -msgstr "" -"પસંદ કરેલ દસ્તાવેજોને સરખાવવું અશક્ય છે.\n" -"\n" -"પરિણામ અયોગ્ય UTF-8 માહિતી ધરાવે છે." - -#: plugins/diff/diff.glade2.h:1 -msgid "*" -msgstr "*" - -#: plugins/diff/diff.glade2.h:2 -msgid "Choose the files to compare." -msgstr "સરખાવવા માટે ફાઈલો પસંદ કરો." - -#: plugins/diff/diff.glade2.h:3 -msgid "Compare files..." -msgstr "ફાઈલો સરખાવો..." - -#: plugins/diff/diff.glade2.h:4 -msgid "F_rom document" -msgstr "દસ્તાવેજમાંથી (_r)" - -#: plugins/diff/diff.glade2.h:5 -msgid "First" -msgstr "પ્રથમ" - -#: plugins/diff/diff.glade2.h:6 -msgid "First file from disk" -msgstr "ડિસ્કમાંથી પ્રથમ ફાઈલ" - -#: plugins/diff/diff.glade2.h:7 -msgid "First file from open document" -msgstr "ખોલેલા દસ્તાવેજમાંથી પ્રથમ ફાઈલ" - -#: plugins/diff/diff.glade2.h:8 -msgid "From _document" -msgstr "દસ્તાવેજમાંથી (_d)" - -#: plugins/diff/diff.glade2.h:9 -msgid "From a _file on disk" -msgstr "ડિસ્ક પર ફાઈલમાંથી (_f)" - -#: plugins/diff/diff.glade2.h:10 -msgid "From a file o_n disk" -msgstr "ડિસ્ક પર ફાઈલમાંથી (_n)" - -#: plugins/diff/diff.glade2.h:11 -msgid "Ignore _blanks (-b option)" -msgstr "ખાલી જગ્યા અવગણો (_b) (-b વિકલ્પ)" - -#: plugins/diff/diff.glade2.h:12 -msgid "Note that this option is only supported by GNU diff" -msgstr "નોંધ કરો કે આ વિકલ્પ માત્ર GNU diff દ્વારા આધારભૂત છે" - -#: plugins/diff/diff.glade2.h:13 -msgid "Second" -msgstr "દ્વિતિય" - -#: plugins/diff/diff.glade2.h:14 -msgid "Second file from disk" -msgstr "ડિસ્કમાંથી દ્વિતિય ફાઈલ" - -#: plugins/diff/diff.glade2.h:15 -msgid "Second file from open document" -msgstr "ખોલેલા દસ્તાવેજમાંથી દ્વિતિય ફાઈલ" - -#: plugins/diff/diff.glade2.h:16 -msgid "Select the \"first\" file..." -msgstr "\"પ્રથમ\" ફાઈલ પસંદ કરો..." - -#: plugins/diff/diff.glade2.h:17 -msgid "Select the \"second\" file..." -msgstr "\"દ્વિતિય\" ફાઈલ પસંદ કરો..." - -#: plugins/diff/diff.glade2.h:18 -msgid "Select the first file to compare" -msgstr "સરખાવવા માટે પ્રથમ ફાઈલ પસંદ કરો" - -#: plugins/diff/diff.glade2.h:19 -msgid "Select the first open document to compare" -msgstr "સરખાવવા માટે પ્રથમ ખૂલેલો દસ્તાવેજ પસંદ કરો" - -#: plugins/diff/diff.glade2.h:20 -msgid "Select the second file to compare" -msgstr "સરખાવવા માટે દ્વિતિય ફાઈલ પસંદ કરો" - -#: plugins/diff/diff.glade2.h:21 -msgid "Select the second open document to compare" -msgstr "સરખાવવા માટે દ્વિતિય ખૂલેલો દસ્તાવેજ પસંદ કરો" - -#: plugins/diff/diff.glade2.h:22 -msgid "Use the _unified output format (-u option)" -msgstr "એકત્રીકરણ થયેલ આઉટપુટ બંધારણ વાપરો (_u) (-u વિકલ્પ)" - -#: plugins/diff/diff.gedit-plugin.desktop.in.h:2 -msgid "" -"The Compare Files plugin uses the \"diff\" program to compare two documents " -"or files on disk." -msgstr "" -"ફાઈલો સરખાવવાનું પ્લગઈન \"diff\" કાર્યક્રમનો ઉપયોગ ડિસ્ક પરના બે દસ્તાવેજો અથવા " -"ફાઈલો સરખાવવા માટે કરે છે." +#: ../plugins/bookmarks/bookmarks.gedit-plugin.desktop.in.in.h:1 +msgid "Bookmarks" +msgstr "બુકમાર્કો" + +#: ../plugins/bookmarks/bookmarks.gedit-plugin.desktop.in.in.h:2 +msgid "Easy document navigation with bookmarks" +msgstr "બુકમાર્કો સાથે સરળ દસ્તાવેજ શોધનાર" + +#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:129 +msgid "Toggle Bookmark" +msgstr "ટોગલ બુકમાર્ક" + +#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:130 +msgid "Toggle bookmark status of the current line" +msgstr "હાલનાં વાક્ય પર ટોગલ બુકમાર્ક સ્થિતિ" + +#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:132 +msgid "Goto Next Bookmark" +msgstr "પછીનાં બુકમાર્ક પર જાઓ" + +#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:133 +msgid "Goto the next bookmark" +msgstr "પછીનાં બુકમાર્ક પર જાઓ" + +#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:135 +msgid "Goto Previous Bookmark" +msgstr "પહેલાનાં બુકમાર્ક પર જાઓ" + +#: ../plugins/bookmarks/gedit-bookmarks-plugin.c:136 +msgid "Goto the previous bookmark" +msgstr "પહેલાનાં બુકમાર્ક પર જાઓ" + +#: ../plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in.in.h:1 +msgid "Automatically adds closing brackets." +msgstr "બંધ કરતા કૌંસો ઓપોઆપ ઉમેરાય છે." + +#: ../plugins/bracketcompletion/bracketcompletion.gedit-plugin.desktop.in.in.h:2 +msgid "Bracket Completion" +msgstr "કૌંસ સમાપ્તિ" + +#: ../plugins/charmap/charmap.gedit-plugin.desktop.in.in.h:1 +#: ../plugins/charmap/gedit-charmap-plugin.c:258 +msgid "Character Map" +msgstr "અક્ષર નક્ષો" + +#: ../plugins/charmap/charmap.gedit-plugin.desktop.in.in.h:2 +msgid "Insert special characters just by clicking on them." +msgstr "તેઓની પક ફક્ત ક્લિક કરવા દ્દારા ચોક્કસ અક્ષરોને દાખલ કરો." + +#: ../plugins/codecomment/codecomment.gedit-plugin.desktop.in.in.h:1 +msgid "Code comment" +msgstr "કોડ ટિપ્પણી" + +#: ../plugins/codecomment/codecomment.gedit-plugin.desktop.in.in.h:2 +msgid "Comment out or uncomment a selected block of code." +msgstr "કોડનાં પસંદ થયેલ બ્લોકની ટિપ્પણી ન કરો અથવા ટિપ્પણીમાંથી બહાર નીકળો." + +#: ../plugins/codecomment/codecomment.py:230 +msgid "Co_mment Code" +msgstr "ટિપ્પણી કોડ (_m)" + +#: ../plugins/codecomment/codecomment.py:232 +msgid "Comment the selected code" +msgstr "પસંદ થયેલ કોડની ટિપ્પણી કરો" + +#: ../plugins/codecomment/codecomment.py:236 +msgid "U_ncomment Code" +msgstr "કોડની ટિપ્પણી ન કરો (_n)" + +#: ../plugins/codecomment/codecomment.py:238 +msgid "Uncomment the selected code" +msgstr "પસંદ થયેલ કોડની ટિપ્પણી ન કરો" + +#. ex:ts=4:et: +#: ../plugins/colorpicker/colorpicker.gedit-plugin.desktop.in.in.h:1 +msgid "Color Picker" +msgstr "રંગ પસંક કરનાર" + +#: ../plugins/colorpicker/colorpicker.gedit-plugin.desktop.in.in.h:2 +msgid "Pick a color from a dialog and insert its hexadecimal representation." +msgstr "સંવાદ માંથી રંગને પસંદ કરો અને તેની હેક્ઝાડેશીમલ રજૂઆતને દાખલ કરો." + +#: ../plugins/colorpicker/colorpicker.py:73 +msgid "Pick _Color..." +msgstr "રંગ પસંદ કરો (_C)..." + +#: ../plugins/colorpicker/colorpicker.py:74 +msgid "Pick a color from a dialog" +msgstr "સંવાદ માંથી રંગ પસંદ કરો" + +#: ../plugins/colorpicker/colorpicker.py:220 +msgid "Pick Color" +msgstr "રંગને પસંદ કરો" + +#: ../plugins/colorpicker/colorpicker.py:226 +#| msgid "_Insert char" +msgid "_Insert" +msgstr "દાખલ કરો (_I)" + +#. ex:ts=4:et: +#: ../plugins/drawspaces/drawspaces.gedit-plugin.desktop.in.in.h:1 +msgid "Draw Spaces" +msgstr "જગ્યાઓને દોરો" + +#: ../plugins/drawspaces/drawspaces.gedit-plugin.desktop.in.in.h:2 +msgid "Draw Spaces and Tabs" +msgstr "જગ્યાઓ અને ટેબોને દોરો" + +#: ../plugins/drawspaces/drawspaces.ui.h:1 +msgid "Draw new lines" +msgstr "નવી લીટીઓને દોરો" + +#: ../plugins/drawspaces/drawspaces.ui.h:2 +msgid "Draw non-breaking spaces" +msgstr "બ્રેક ન થાય તેવી જગ્યાઓને દોરો" + +#: ../plugins/drawspaces/drawspaces.ui.h:3 +msgid "Draw spaces" +msgstr "જગ્યાઓને દોરો" + +#: ../plugins/drawspaces/drawspaces.ui.h:4 +msgid "Draw tabs" +msgstr "ટેબોને દોરો" + +#: ../plugins/drawspaces/gedit-drawspaces-plugin.c:151 +msgid "Show _White Space" +msgstr "સફેદ જગ્યાને બતાવો (_W)" + +#: ../plugins/drawspaces/gedit-drawspaces-plugin.c:152 +msgid "Show spaces and tabs" +msgstr "જગ્યાઓ અને ટેબોને બતાવો" + +#: ../plugins/drawspaces/gedit-drawspaces-plugin.c:542 +msgid "Error dialog" +msgstr "ભૂલ સંવાદ" + +#: ../plugins/joinlines/joinlines.gedit-plugin.desktop.in.in.h:1 +msgid "Join several lines or split long ones" +msgstr "ઘણીબધી લીટીઓ અથવા અલગ થયેલ લાંબી એક ને જોડો" + +#: ../plugins/joinlines/joinlines.gedit-plugin.desktop.in.in.h:2 +msgid "Join/Split Lines" +msgstr "લીટીઓને જોડો/અલગ કરો" + +#: ../plugins/joinlines/joinlines.py:56 +msgid "_Join Lines" +msgstr "લીટીઓને જોડો (_J)" + +#: ../plugins/joinlines/joinlines.py:57 +msgid "Join the selected lines" +msgstr "પસંદ થયેલ લીટીઓને જોડો" + +#: ../plugins/joinlines/joinlines.py:59 +msgid "_Split Lines" +msgstr "લીટીઓને અલગ કરો (_S)" + +#: ../plugins/joinlines/joinlines.py:60 +msgid "Split the selected lines" +msgstr "પસંદ થયેલ લીટીઓને અલગ કરો" + +#: ../plugins/showtabbar/gedit-show-tabbar-plugin.c:208 +msgid "Tab_bar" +msgstr "ટેબ પટ્ટી (_b)" + +#: ../plugins/showtabbar/gedit-show-tabbar-plugin.c:209 +msgid "Show or hide the tabbar in the current window" +msgstr "હાલની વિન્ડોમાં ટેબપટ્ટી ને બતાવો અથવા છુપાડો" + +#: ../plugins/showtabbar/gedit-show-tabbar-plugin.schemas.in.h:1 +msgid "Tabbar is Visible" +msgstr "ટેબપટ્ટી એ દેખાય તેવુ છે" + +#: ../plugins/showtabbar/gedit-show-tabbar-plugin.schemas.in.h:2 +msgid "Whether the tabbar should be visible in editing windows." +msgstr "ફેરફાર થતી વિન્ડોમાં ક્યાંતો ટેબપટ્ટી દેખાવી જોઇએ." + +#: ../plugins/showtabbar/showtabbar.gedit-plugin.desktop.in.in.h:1 +msgid "Add a menu entry to show/hide the tabbar." +msgstr "ટેબપટ્ટીને બતાવવા/છુપાડવા માટે મેનુ નોંધણીને ઉમેરો." + +#: ../plugins/showtabbar/showtabbar.gedit-plugin.desktop.in.in.h:2 +msgid "Show/Hide Tabbar" +msgstr "ટેબપટ્ટીને બતાવો/છુપાડો" + +#: ../plugins/sessionsaver/__init__.py:64 +msgid "Sa_ved sessions" +msgstr "સંગ્રહ થયેલ સત્રો (_v)" + +#: ../plugins/sessionsaver/__init__.py:65 +msgid "_Save current session" +msgstr "હાલનાં સત્રને સંગ્રહો (_S)" + +#: ../plugins/sessionsaver/__init__.py:65 +msgid "Save the current document list as a new session" +msgstr "નવા સત્ર તરીકે હાલનાં દસ્તાવેજની યાદીને સંગ્રહો" + +#: ../plugins/sessionsaver/__init__.py:66 +msgid "_Manage saved sessions..." +msgstr "સંગ્રહ થયેલ સત્રોને સંચાલિત કરો (_M)" + +#: ../plugins/sessionsaver/__init__.py:66 +msgid "Open the saved session manager" +msgstr "સંગ્રહ થયેલ સત્ર વ્યવસ્થાપકને ખોલો" + +#: ../plugins/sessionsaver/__init__.py:106 +#, python-format +msgid "Recover '%s' session" +msgstr "'%s' સત્રને પાછુ મેળવો" + +#: ../plugins/sessionsaver/dialogs.py:167 +msgid "Session Name" +msgstr "સત્ર નામ" + +#. ex:ts=4:et: +#: ../plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in.in.h:1 +msgid "Save and restore your working sessions" +msgstr "તમારી કામ કરતા સત્રોને સંગહો અને પુન:સંગ્રહ કરો" + +#: ../plugins/sessionsaver/sessionsaver.gedit-plugin.desktop.in.in.h:2 +msgid "Session Saver" +msgstr "સત્ર સંગ્રહ કરનાર" + +#: ../plugins/sessionsaver/sessionsaver.ui.h:1 +msgid "Save session" +msgstr "સત્રને સંગ્રહો" + +#: ../plugins/sessionsaver/sessionsaver.ui.h:2 +msgid "Saved Sessions" +msgstr "સંગ્રહ થયેલ સત્રો" + +#: ../plugins/sessionsaver/sessionsaver.ui.h:3 +msgid "Session name:" +msgstr "સત્ર નામ:" + +#: ../plugins/smartspaces/smartspaces.gedit-plugin.desktop.in.in.h:1 +msgid "Forget you're not using tabulations." +msgstr "ભૂલી જાઓ કે તમે કોષ્ટકોને વાપરી રહ્યા નથી." + +#: ../plugins/smartspaces/smartspaces.gedit-plugin.desktop.in.in.h:2 +msgid "Smart Spaces" +msgstr "હોશિયાર જગ્યાઓ" + +#: ../plugins/terminal/terminal.gedit-plugin.desktop.in.in.h:1 +msgid "Embed a terminal in the bottom pane." +msgstr "નીચેના તકતીમાં ટર્મિનલને એમ્બેડ કરો." + +#: ../plugins/terminal/terminal.gedit-plugin.desktop.in.in.h:2 +msgid "Embedded Terminal" +msgstr "એમ્બેડ થયેલ ટર્મિનલ" + +#: ../plugins/terminal/terminal.py:249 +msgid "Terminal" +msgstr "ટર્મિનલ" + +#: ../plugins/terminal/terminal.py:272 +msgid "C_hange Directory" +msgstr "ડિરેક્ટરીને બદલો (_h)" diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/po/Makefile.in.in /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/po/Makefile.in.in --- gedit-plugins-2.26.1/po/Makefile.in.in 2009-04-11 11:43:34.000000000 +0100 +++ gedit-plugins-2.26.2/po/Makefile.in.in 2009-05-17 00:32:15.000000000 +0100 @@ -21,7 +21,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/po/sk.po /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/po/sk.po --- gedit-plugins-2.26.1/po/sk.po 2009-03-28 10:38:58.000000000 +0000 +++ gedit-plugins-2.26.2/po/sk.po 2009-04-25 15:33:16.000000000 +0100 @@ -7,7 +7,7 @@ # Stanislav Višňovský , 2002. # Marcel Telka , 2005. # -# $Id: sk.po,v 1.3 2005/11/06 16:25:34 marcel Exp $ +# $Id$ # msgid "" msgstr "" diff -Nru /tmp/xa7jU44toe/gedit-plugins-2.26.1/README /tmp/ghoxIOXMZH/gedit-plugins-2.26.2/README --- gedit-plugins-2.26.1/README 2009-04-11 11:38:19.000000000 +0100 +++ gedit-plugins-2.26.2/README 2009-05-17 00:29:51.000000000 +0100 @@ -1,7 +1,7 @@ General Information =================== -This is version 2.26.1 of gedit-plugins. gedit-plugins are a set of plugins +This is version 2.26.2 of gedit-plugins. gedit-plugins are a set of plugins for gedit. Installation