[Pkg-cli-apps-commits] r3755 - /packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Feb 29 07:16:40 UTC 2008
Author: slomo
Date: Fri Feb 29 07:16:40 2008
New Revision: 3755
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3755
Log:
* fix patch
Modified:
packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch
Modified: packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch?rev=3755&op=diff
==============================================================================
--- packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch (original)
+++ packages/tomboy/branches/0.9/debian/patches/99_autoreconf.patch Fri Feb 29 07:16:40 2008
@@ -1,6 +1,6 @@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/aclocal.m4 tomboy-0.9.7/aclocal.m4
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/aclocal.m4 tomboy-0.9.7/aclocal.m4
--- tomboy-0.9.7.old/aclocal.m4 2008-02-22 21:01:02.000000000 +0100
-+++ tomboy-0.9.7/aclocal.m4 2008-02-29 08:08:31.000000000 +0100
++++ tomboy-0.9.7/aclocal.m4 2008-02-29 08:15:42.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -837,9 +837,33 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/configure tomboy-0.9.7/configure
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/autogen.sh tomboy-0.9.7/autogen.sh
+--- tomboy-0.9.7.old/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ tomboy-0.9.7/autogen.sh 2008-02-29 08:15:30.000000000 +0100
+@@ -0,0 +1,20 @@
++#!/bin/sh
++# Run this to generate all the initial makefiles, etc.
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++PKG_NAME="tomboy"
++
++(test -f $srcdir/configure.in) || {
++ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
++ echo " top-level $PKG_NAME directory"
++ exit 1
++}
++
++which gnome-autogen.sh || {
++ echo "You need to install gnome-common from the GNOME CVS"
++ exit 1
++}
++
++REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/configure tomboy-0.9.7/configure
--- tomboy-0.9.7.old/configure 2008-02-22 21:01:08.000000000 +0100
-+++ tomboy-0.9.7/configure 2008-02-29 08:08:35.000000000 +0100
++++ tomboy-0.9.7/configure 2008-02-29 08:15:47.000000000 +0100
@@ -836,6 +836,7 @@
DOC_USER_FORMATS
ENABLE_SK_TRUE
@@ -3246,9 +3270,9 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/data/icons/Makefile.in tomboy-0.9.7/data/icons/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/data/icons/Makefile.in tomboy-0.9.7/data/icons/Makefile.in
--- tomboy-0.9.7.old/data/icons/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/data/icons/Makefile.in 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/data/icons/Makefile.in 2008-02-29 08:15:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3308,9 +3332,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/data/images/Makefile.in tomboy-0.9.7/data/images/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/data/images/Makefile.in tomboy-0.9.7/data/images/Makefile.in
--- tomboy-0.9.7.old/data/images/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/data/images/Makefile.in 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/data/images/Makefile.in 2008-02-29 08:15:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3370,9 +3394,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/data/Makefile.in tomboy-0.9.7/data/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/data/Makefile.in tomboy-0.9.7/data/Makefile.in
--- tomboy-0.9.7.old/data/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/data/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/data/Makefile.in 2008-02-29 08:15:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3470,9 +3494,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/depcomp tomboy-0.9.7/depcomp
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/depcomp tomboy-0.9.7/depcomp
--- tomboy-0.9.7.old/depcomp 2008-02-22 18:30:28.000000000 +0100
-+++ tomboy-0.9.7/depcomp 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/depcomp 2008-02-29 08:15:54.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -3537,9 +3561,57 @@
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/help/Makefile.in tomboy-0.9.7/help/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/gnome-doc-utils.make tomboy-0.9.7/gnome-doc-utils.make
+--- tomboy-0.9.7.old/gnome-doc-utils.make 2008-02-22 18:30:21.000000000 +0100
++++ tomboy-0.9.7/gnome-doc-utils.make 2008-02-29 08:15:38.000000000 +0100
+@@ -416,6 +416,11 @@
+ @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
+@@ -466,8 +471,8 @@
+
+ check-doc-omf: $(_DOC_OMF_ALL)
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
+- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
++ 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
+
+
+@@ -486,6 +491,12 @@
+ 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
+@@ -554,7 +565,7 @@
+
+ uninstall-doc-omf:
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+- if test "x$(_ENABLE_SK)" == "xtrue"; then \
++ 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; \
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/help/Makefile.in tomboy-0.9.7/help/Makefile.in
--- tomboy-0.9.7.old/help/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/help/Makefile.in 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/help/Makefile.in 2008-02-29 08:15:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -3599,9 +3671,54 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/install-sh tomboy-0.9.7/install-sh
+@@ -744,6 +746,11 @@
+ @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
+@@ -793,8 +800,8 @@
+
+ check-doc-omf: $(_DOC_OMF_ALL)
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+- echo "xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
+- xmllint --noout --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
++ 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
+@@ -812,6 +819,12 @@
+ 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
+@@ -879,7 +892,7 @@
+
+ uninstall-doc-omf:
+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
+- if test "x$(_ENABLE_SK)" == "xtrue"; then \
++ 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; \
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/install-sh tomboy-0.9.7/install-sh
--- tomboy-0.9.7.old/install-sh 2008-02-22 18:30:26.000000000 +0100
-+++ tomboy-0.9.7/install-sh 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/install-sh 2008-02-29 08:15:49.000000000 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -3964,9 +4081,642 @@
trap '' 0
fi
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/libtomboy/Makefile.in tomboy-0.9.7/libtomboy/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/intltool-extract.in tomboy-0.9.7/intltool-extract.in
+--- tomboy-0.9.7.old/intltool-extract.in 2008-02-22 18:30:21.000000000 +0100
++++ tomboy-0.9.7/intltool-extract.in 2008-02-29 08:15:38.000000000 +0100
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-extract";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
+
+ ## Loaded modules
+ use strict;
+@@ -161,7 +161,8 @@
+ --type=TYPE Specify the file type of FILENAME. Currently supports:
+ "gettext/glade", "gettext/ini", "gettext/keys"
+ "gettext/rfc822deb", "gettext/schemas",
+- "gettext/scheme", "gettext/xml", "gettext/quoted"
++ "gettext/scheme", "gettext/xml", "gettext/quoted",
++ "gettext/quotedxml"
+ -l, --local Writes output into current working directory
+ (conflicts with --update)
+ --update Writes output into the same directory the source file
+@@ -218,6 +219,7 @@
+ &type_schemas if $gettext_type eq "schemas";
+ &type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
++ &type_quotedxml if $gettext_type eq "quotedxml";
+ }
+
+ sub entity_decode_minimal
+@@ -237,9 +239,9 @@
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
+ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+@@ -731,6 +733,18 @@
+ }
+ }
+
++sub type_quotedxml {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $message = entity_decode($message);
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+ sub type_glade {
+ ### For translatable Glade XML files ###
+
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/intltool-merge.in tomboy-0.9.7/intltool-merge.in
+--- tomboy-0.9.7.old/intltool-merge.in 2008-02-22 18:30:21.000000000 +0100
++++ tomboy-0.9.7/intltool-merge.in 2008-02-29 08:15:38.000000000 +0100
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
+
+ ## Loaded modules
+ use strict;
+@@ -61,6 +61,7 @@
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
+ my $QUOTED_STYLE_ARG = 0;
++my $QUOTEDXML_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -81,6 +82,7 @@
+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
+ "pass-through|p" => \$PASS_THROUGH_ARG,
+ "utf8|u" => \$UTF8_ARG,
+ "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -93,9 +95,24 @@
+
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || "iconv";
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+
++sub isProgramInPath
++{
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
++ return 0;
++}
++
++if (! isProgramInPath ("$iconv"))
++{
++ print STDERR " *** iconv is not found on this system!\n".
++ " *** Without it, intltool-merge can not convert encodings.\n";
++ exit;
++}
++
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";
+
+@@ -133,7 +150,7 @@
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- &keys_merge_translations;
++ &keys_merge_translations;
+ &finalize;
+ }
+ elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
+@@ -159,12 +176,12 @@
+ &rfc822deb_merge_translations;
+ &finalize;
+ }
+-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
+ {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- "ed_merge_translations;
++ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
+ &finalize;
+ }
+ else
+@@ -204,6 +221,7 @@
+ -s, --schemas-style includes translations in the schemas style
+ -r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
++ --quotedxml-style includes translations in the quoted xml string style
+ -x, --xml-style includes translations in the standard xml style
+
+ Other options:
+@@ -260,8 +278,41 @@
+
+ sub gather_po_files
+ {
+- for my $po_file (glob "$PO_DIR/*.po") {
+- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ if (my $linguas = $ENV{"LINGUAS"})
++ {
++ for my $lang (split / /, $linguas) {
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++ else
++ {
++ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
++ {
++ while (<LINGUAS_FILE>)
++ {
++ next if /^#/;
++
++ for my $lang (split)
++ {
++ chomp ($lang);
++ my $po_file = $PO_DIR . "/" . $lang . ".po";
++ if (-e $po_file) {
++ $po_files_by_lang{$lang} = $po_file;
++ }
++ }
++ }
++
++ close LINGUAS_FILE;
++ }
++ else
++ {
++ for my $po_file (glob "$PO_DIR/*.po") {
++ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
++ }
++ }
+ }
+ }
+
+@@ -494,16 +545,15 @@
+ return $string;
+ }
+
+-## NOTE: deal with < - < but not > - > because it seems its ok to have
+-## > in the entity. For further info please look at #84738.
+ sub entity_decode
+ {
+ local ($_) = @_;
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
++ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+@@ -528,6 +578,7 @@
+ return "&" if $_ == 38;
+ return "'" if $_ == 39;
+ return "<" if $_ == 60;
++ return ">" if $_ == 62;
+ return chr $_;
+ }
+
+@@ -1028,43 +1079,74 @@
+ close OUTPUT;
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+ }
+- }
+- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+- binmode (OUTPUT) if $^O eq 'MSWin32';
+- my $tree = readXml($FILE);
+- print_header($FILE, \*OUTPUT);
+- parseTree(\*OUTPUT, $tree);
+- close OUTPUT;
+- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ if ( ! -d "C" ) {
++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
++ }
++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
++ } else {
++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ }
+ }
+
+-sub keys_merge_translations
++sub keys_merge_translation
+ {
+- open INPUT, "<${FILE}" or die;
+- open OUTPUT, ">${OUTFILE}" or die;
++ my ($lang) = @_;
++
++ if ( ! -d $lang && $MULTIPLE_OUTPUT)
++ {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++
++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+
+- while (<INPUT>)
++ while (<INPUT>)
+ {
+- if (s/^(\s*)_(\w+=(.*))/$1$2/)
++ if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ {
+- my $string = $3;
++ my $string = $3;
+
+- print OUTPUT;
++ if (!$MULTIPLE_OUTPUT)
++ {
++ print OUTPUT;
+
+- my $non_translated_line = $_;
++ my $non_translated_line = $_;
+
+- for my $lang (sort keys %po_files_by_lang)
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ my $translation = $translations{$lang, $string};
++ next if !$translation;
++
++ $_ = $non_translated_line;
++ s/(\w+)=.*/[$lang]$1=$translation/;
++ print OUTPUT;
++ }
++ }
++ else
+ {
+- my $translation = $translations{$lang, $string};
+- next if !$translation;
++ my $non_translated_line = $_;
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
+
+ $_ = $non_translated_line;
+- s/(\w+)=.*/[$lang]$1=$translation/;
++ s/(\w+)=.*/$1=$translation/;
+ print OUTPUT;
+ }
+- }
+- else
++ }
++ else
+ {
+ print OUTPUT;
+ }
+@@ -1072,6 +1154,24 @@
+
+ close OUTPUT;
+ close INPUT;
++
++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++}
++
++sub keys_merge_translations
++{
++ if ($MULTIPLE_OUTPUT)
++ {
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ keys_merge_translation ($lang);
++ }
++ keys_merge_translation ("C");
++ }
++ else
++ {
++ keys_merge_translation (".");
++ }
+ }
+
+ sub desktop_merge_translations
+@@ -1367,19 +1467,22 @@
+
+ sub quoted_translation
+ {
+- my ($lang, $string) = @_;
++ my ($xml_mode, $lang, $string) = @_;
+
++ $string = entity_decode($string) if $xml_mode;
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+-
++ $translation = entity_encode($translation) if $xml_mode;
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+ }
+
+ sub quoted_merge_translations
+ {
++ my ($xml_mode) = @_;
++
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+@@ -1394,7 +1497,7 @@
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/intltool-update.in tomboy-0.9.7/intltool-update.in
+--- tomboy-0.9.7.old/intltool-update.in 2008-02-22 18:30:21.000000000 +0100
++++ tomboy-0.9.7/intltool-update.in 2008-02-29 08:15:38.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.37.1";
+ my $PACKAGE = "intltool";
+
+ ## Loaded modules
+@@ -71,7 +71,8 @@
+ "sheet(?:\\.in)+|". # ?
+ "schemas(?:\\.in)+|". # GConf specific
+ "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+"; # GOK specific.
++"kbd(?:\\.in)+|". # GOK specific.
++"policy(?:\\.in)+"; # PolicyKit files
+
+ my $ini_support =
+ "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
+@@ -328,7 +329,12 @@
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ }, "..";
+-
++ find sub {
++ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
++ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
++ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
++ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
++ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
+
+ open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
+ @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+@@ -428,8 +434,8 @@
+ last;
+ }
+
+- ## N_ Q_ and _ are the three macros defined in gi8n.h
+- if (/[NQ]?_ *\(QUOTEDTEXT/)
++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
++ if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -489,11 +495,15 @@
+ my %in2;
+ foreach (@buf_potfiles_sorted)
+ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
+ $in2{$_} = 1;
+ }
+
+ foreach (@buf_potfiles_ignore_sorted)
+ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
+ $in2{$_} = 1;
+ }
+
+@@ -501,9 +511,16 @@
+
+ foreach (@buf_allfiles_sorted)
+ {
+- if (!exists($in2{$_}))
++ my $dummy = $_;
++ my $srcdir = $SRCDIR;
++
++ $srcdir =~ s#^../##;
++ $dummy =~ s#^$srcdir/../##;
++ $dummy =~ s#^$srcdir/##;
++ $dummy =~ s#_build/##;
++ if (!exists($in2{$dummy}))
+ {
+- push @result, $_
++ push @result, $dummy
+ }
+ }
+
+@@ -563,13 +580,33 @@
+ exit 1;
+ }
+
++sub isProgramInPath
++{
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++ return 0;
++}
++
++sub isGNUGettextTool
++{
++ my ($file) = @_;
++ # Check that we are using GNU gettext tools
++ if (isProgramInPath ($file))
++ {
++ my $version = `$file --version`;
++ return 1 if ($version =~ m/.*\(GNU .*\).*/);
++ }
++ return 0;
++}
++
+ sub GenerateHeaders
+ {
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+
+ ## Generate the .h header files, so we can allow glade and
+ ## xml translation support
+- if (0)
++ if (! isProgramInPath ("$EXTRACT"))
+ {
+ print STDERR "\n *** The intltool-extract script wasn't found!"
+ ."\n *** Without it, intltool-update can not generate files.\n";
+@@ -616,13 +653,13 @@
+ #
+ sub GeneratePOTemplate
+ {
+- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
++ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
+ my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
+ chomp $XGETTEXT;
+
+- if (! -x $XGETTEXT)
++ if (! isGNUGettextTool ("$XGETTEXT"))
+ {
+- print STDERR " *** xgettext is not found on this system!\n".
++ print STDERR " *** GNU xgettext is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+@@ -718,13 +755,29 @@
+ unlink "$MODULE.pot";
+ my @xgettext_argument=("$XGETTEXT",
+ "--add-comments",
+- "--directory\=\.",
++ "--directory\=.",
++ "--default-domain\=$MODULE",
++ "--flag\=g_strdup_printf:1:c-format",
++ "--flag\=g_string_printf:2:c-format",
++ "--flag\=g_string_append_printf:2:c-format",
++ "--flag\=g_error_new:3:c-format",
++ "--flag\=g_set_error:4:c-format",
++ "--flag\=g_markup_printf_escaped:1:c-format",
++ "--flag\=g_log:3:c-format",
++ "--flag\=g_print:1:c-format",
++ "--flag\=g_printerr:1:c-format",
++ "--flag\=g_printf:1:c-format",
++ "--flag\=g_fprintf:2:c-format",
++ "--flag\=g_sprintf:2:c-format",
++ "--flag\=g_snprintf:3:c-format",
++ "--flag\=g_scanner_error:2:c-format",
++ "--flag\=g_scanner_warn:2:c-format",
+ "--output\=$MODULE\.pot",
+ "--files-from\=\.\/POTFILES\.in\.temp");
+ my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+ push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
+ push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
+ my $xgettext_command = join ' ', @xgettext_argument;
+@@ -785,9 +838,16 @@
+ {
+ -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
+
+- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
++ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
+ my ($lang, $outfile) = @_;
+
++ if (! isGNUGettextTool ("$MSGMERGE"))
++ {
++ print STDERR " *** GNU msgmerge is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
++
+ print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
+
+ my $infile = "$SRCDIR/$lang.po";
+@@ -828,7 +888,14 @@
+ sub Console_Write_TranslationStatus
+ {
+ my ($lang, $output_file) = @_;
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
+
+@@ -837,21 +904,28 @@
+
+ sub Console_Write_CoverageReport
+ {
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ &GatherPOFiles;
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ &POFile_Update ($lang, "");
+ }
+
+- print "\n\n * Current translation support in $MODULE \n\n";
++ print STDERR "\n\n * Current translation support in $MODULE \n\n";
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
+ }
+ }
+@@ -925,13 +999,13 @@
+
+ $conf_in || die "Cannot find top_builddir in Makevars.";
+ }
+- elsif (-f "../configure.ac")
++ elsif (-f "$SRCDIR/../configure.ac")
+ {
+- $conf_in = "../configure.ac";
++ $conf_in = "$SRCDIR/../configure.ac";
+ }
+- elsif (-f "../configure.in")
++ elsif (-f "$SRCDIR/../configure.in")
+ {
+- $conf_in = "../configure.in";
++ $conf_in = "$SRCDIR/../configure.in";
+ }
+ else
+ {
+@@ -1044,6 +1118,8 @@
+ close IN;
+ }
+
++ # unwrap lines split with a trailing \
++ $make_source =~ s/\\ $ \n/ /mxg;
+ $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
+
+ return $keywords;
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/libtomboy/Makefile.in tomboy-0.9.7/libtomboy/Makefile.in
--- tomboy-0.9.7.old/libtomboy/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/libtomboy/Makefile.in 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/libtomboy/Makefile.in 2008-02-29 08:15:54.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4095,7 +4845,7 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/ltmain.sh tomboy-0.9.7/ltmain.sh
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/ltmain.sh tomboy-0.9.7/ltmain.sh
--- tomboy-0.9.7.old/ltmain.sh 2007-09-21 20:28:33.000000000 +0200
+++ tomboy-0.9.7/ltmain.sh 2008-02-02 14:28:24.000000000 +0100
@@ -2,7 +2,7 @@
@@ -4291,9 +5041,9 @@
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Makefile.in tomboy-0.9.7/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Makefile.in tomboy-0.9.7/Makefile.in
--- tomboy-0.9.7.old/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/Makefile.in 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/Makefile.in 2008-02-29 08:15:55.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4430,9 +5180,9 @@
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 \
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Makefile.in tomboy-0.9.7/Mono.Addins/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Mono.Addins/Makefile.in tomboy-0.9.7/Mono.Addins/Makefile.in
--- tomboy-0.9.7.old/Mono.Addins/Makefile.in 2008-02-22 21:01:04.000000000 +0100
-+++ tomboy-0.9.7/Mono.Addins/Makefile.in 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Makefile.in 2008-02-29 08:15:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4530,9 +5280,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins/Makefile.in
--- tomboy-0.9.7.old/Mono.Addins/Mono.Addins/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Mono.Addins/Mono.Addins/Makefile.in 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Mono.Addins/Makefile.in 2008-02-29 08:15:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4592,9 +5342,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Gui/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins.Gui/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Gui/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins.Gui/Makefile.in
--- tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Mono.Addins.Gui/Makefile.in 2008-02-29 08:15:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4654,9 +5404,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Setup/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins.Setup/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Setup/Makefile.in tomboy-0.9.7/Mono.Addins/Mono.Addins.Setup/Makefile.in
--- tomboy-0.9.7.old/Mono.Addins/Mono.Addins.Setup/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Mono.Addins/Mono.Addins.Setup/Makefile.in 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/Mono.Addins/Mono.Addins.Setup/Makefile.in 2008-02-29 08:15:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4716,9 +5466,44 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/test/Makefile.in tomboy-0.9.7/test/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/po/Makefile.in.in tomboy-0.9.7/po/Makefile.in.in
+--- tomboy-0.9.7.old/po/Makefile.in.in 2008-02-22 18:30:21.000000000 +0100
++++ tomboy-0.9.7/po/Makefile.in.in 2008-02-29 08:15:38.000000000 +0100
+@@ -1,10 +1,10 @@
+ # Makefile for program source directory in GNU NLS utilities package.
+ # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
++# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
+ #
+-# This file file be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
++# This file may be copied and used freely without restrictions. It may
++# be used in projects which are not available under a GNU Public License,
+ # but which still want to provide support for the GNU gettext functionality.
+-# Please note that the actual code is *not* freely available.
+ #
+ # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+ # instead of PACKAGE and to look for po2tbl in ./ not in intl/
+@@ -12,7 +12,7 @@
+ # - Modified by jacob berkman <jacob at ximian.com> to install
+ # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+ #
+-# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
++# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
+ #
+ # We have the following line for use by intltoolize:
+ # INTLTOOL_MAKEFILE
+@@ -133,7 +133,7 @@
+ dvi info tags TAGS ID:
+
+ # Define this as empty until I found a useful application.
+-installcheck:
++install-exec installcheck:
+
+ uninstall:
+ linguas="$(USE_LINGUAS)"; \
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/test/Makefile.in tomboy-0.9.7/test/Makefile.in
--- tomboy-0.9.7.old/test/Makefile.in 2008-02-22 21:01:07.000000000 +0100
-+++ tomboy-0.9.7/test/Makefile.in 2008-02-29 08:08:42.000000000 +0100
++++ tomboy-0.9.7/test/Makefile.in 2008-02-29 08:15:55.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4778,9 +5563,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Backlinks/Makefile.in tomboy-0.9.7/Tomboy/Addins/Backlinks/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/Backlinks/Makefile.in tomboy-0.9.7/Tomboy/Addins/Backlinks/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/Backlinks/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/Backlinks/Makefile.in 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Backlinks/Makefile.in 2008-02-29 08:15:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4840,9 +5625,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Bugzilla/Makefile.in tomboy-0.9.7/Tomboy/Addins/Bugzilla/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/Bugzilla/Makefile.in tomboy-0.9.7/Tomboy/Addins/Bugzilla/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/Bugzilla/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/Bugzilla/Makefile.in 2008-02-29 08:08:39.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Bugzilla/Makefile.in 2008-02-29 08:15:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4902,9 +5687,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Evolution/Makefile.in tomboy-0.9.7/Tomboy/Addins/Evolution/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/Evolution/Makefile.in tomboy-0.9.7/Tomboy/Addins/Evolution/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/Evolution/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/Evolution/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Evolution/Makefile.in 2008-02-29 08:15:50.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -4964,9 +5749,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/ExportToHtml/Makefile.in tomboy-0.9.7/Tomboy/Addins/ExportToHtml/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/ExportToHtml/Makefile.in tomboy-0.9.7/Tomboy/Addins/ExportToHtml/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/ExportToHtml/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/ExportToHtml/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/ExportToHtml/Makefile.in 2008-02-29 08:15:51.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5026,9 +5811,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/FileSystemSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/FileSystemSyncService/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/FileSystemSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/FileSystemSyncService/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/FileSystemSyncService/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/FileSystemSyncService/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/FileSystemSyncService/Makefile.in 2008-02-29 08:15:51.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5088,9 +5873,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/FixedWidth/Makefile.in tomboy-0.9.7/Tomboy/Addins/FixedWidth/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/FixedWidth/Makefile.in tomboy-0.9.7/Tomboy/Addins/FixedWidth/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/FixedWidth/Makefile.in 2008-02-22 21:01:05.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/FixedWidth/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/FixedWidth/Makefile.in 2008-02-29 08:15:51.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5150,9 +5935,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/GalagoPresence/Makefile.in tomboy-0.9.7/Tomboy/Addins/GalagoPresence/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/GalagoPresence/Makefile.in tomboy-0.9.7/Tomboy/Addins/GalagoPresence/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/GalagoPresence/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/GalagoPresence/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/GalagoPresence/Makefile.in 2008-02-29 08:15:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5212,9 +5997,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/InsertTimestamp/Makefile.in tomboy-0.9.7/Tomboy/Addins/InsertTimestamp/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/InsertTimestamp/Makefile.in tomboy-0.9.7/Tomboy/Addins/InsertTimestamp/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/InsertTimestamp/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/InsertTimestamp/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/InsertTimestamp/Makefile.in 2008-02-29 08:15:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5274,9 +6059,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Makefile.in tomboy-0.9.7/Tomboy/Addins/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/Makefile.in tomboy-0.9.7/Tomboy/Addins/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Makefile.in 2008-02-29 08:15:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5374,9 +6159,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/NoteOfTheDay/Makefile.in tomboy-0.9.7/Tomboy/Addins/NoteOfTheDay/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/NoteOfTheDay/Makefile.in tomboy-0.9.7/Tomboy/Addins/NoteOfTheDay/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-02-29 08:08:40.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/NoteOfTheDay/Makefile.in 2008-02-29 08:15:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5436,9 +6221,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/PrintNotes/Makefile.in tomboy-0.9.7/Tomboy/Addins/PrintNotes/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/PrintNotes/Makefile.in tomboy-0.9.7/Tomboy/Addins/PrintNotes/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/PrintNotes/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/PrintNotes/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/PrintNotes/Makefile.in 2008-02-29 08:15:52.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5567,9 +6352,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/Sketching/Makefile.in tomboy-0.9.7/Tomboy/Addins/Sketching/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/Sketching/Makefile.in tomboy-0.9.7/Tomboy/Addins/Sketching/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/Sketching/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/Sketching/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/Sketching/Makefile.in 2008-02-29 08:15:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5629,9 +6414,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/SshSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/SshSyncService/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/SshSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/SshSyncService/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/SshSyncService/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/SshSyncService/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/SshSyncService/Makefile.in 2008-02-29 08:15:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5691,9 +6476,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/StickyNoteImport/Makefile.in tomboy-0.9.7/Tomboy/Addins/StickyNoteImport/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/StickyNoteImport/Makefile.in tomboy-0.9.7/Tomboy/Addins/StickyNoteImport/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/StickyNoteImport/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/StickyNoteImport/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/StickyNoteImport/Makefile.in 2008-02-29 08:15:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5753,9 +6538,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Addins/WebDavSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/WebDavSyncService/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Addins/WebDavSyncService/Makefile.in tomboy-0.9.7/Tomboy/Addins/WebDavSyncService/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Addins/WebDavSyncService/Makefile.in 2008-02-22 21:01:06.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Addins/WebDavSyncService/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Addins/WebDavSyncService/Makefile.in 2008-02-29 08:15:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -5815,9 +6600,9 @@
NUNIT = @NUNIT@
NUNIT_CFLAGS = @NUNIT_CFLAGS@
NUNIT_LIBS = @NUNIT_LIBS@
-diff -x'*config.sub' -x'*config.guess' -x'*INSTALL' -Naur tomboy-0.9.7.old/Tomboy/Makefile.in tomboy-0.9.7/Tomboy/Makefile.in
+diff -x'*INSTALL' -x'*config.sub' -x'*config.guess' -Naur tomboy-0.9.7.old/Tomboy/Makefile.in tomboy-0.9.7/Tomboy/Makefile.in
--- tomboy-0.9.7.old/Tomboy/Makefile.in 2008-02-25 18:17:20.000000000 +0100
-+++ tomboy-0.9.7/Tomboy/Makefile.in 2008-02-29 08:08:41.000000000 +0100
++++ tomboy-0.9.7/Tomboy/Makefile.in 2008-02-29 08:15:53.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
More information about the Pkg-cli-apps-commits
mailing list