[gimp-gap/gap-2-6] applied patches #583500 #583497 #583498

[Wolfgang Hofer <wolfgangh src gnome org>]

commit e20739762c7991d12383c8300ec5f7ab74c8c9df
Author: Wolfgang Hofer <wolfgangh svn gnome org>
Date:   Fri May 22 21:32:02 2009 +0200

    applied patches #583500 #583497 #583498
---
 ChangeLog      |   20 ++++++++++++++++++++
 autogen.sh     |    5 ++++-
 configure.in   |    3 +--
 po/POTFILES.in |    4 ++++
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e0f1da..7576d64 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2009-05-22 Wolfgang Hofer <hof gimp org>
+
+- autgen.sh script chcks for required automake now accepts automake-1.11
+  (applied patch from David Evans #583500)
+
+- added some missing files to POTFILES.in (fixes #583497)
+     gap/gap_audio_extract.c
+     gap/gap_morph_tween_dialog.c
+     gap/gap_wr_resynth.c
+     vid_enc_rawframes/gap_enc_rawframes_main.c
+
+- configure now is using a LINGUAS file 
+  (applied patch from Claude Paroz #583498)
+
+  * autogen.sh
+  * po/POTFILES.in
+  * po/LINGUAS       # new file
+  * configure.in
+ 
+  
 2009-05-19 Wolfgang Hofer <hof gimp org>
 
 - configure.in updated Version to 2.6.0.
diff --git a/autogen.sh b/autogen.sh
index c0f4fee..b547acf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -88,7 +88,10 @@ fi
 
 
 echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
-if (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
+if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
+   AUTOMAKE=automake-1.11
+   ACLOCAL=aclocal-1.11
+elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.10
    ACLOCAL=aclocal-1.10
 elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
diff --git a/configure.in b/configure.in
index b6cb1ce..190ac89 100644
--- a/configure.in
+++ b/configure.in
@@ -994,10 +994,9 @@ AM_CONDITIONAL(BUILD_LIBMPEG3_LIB, test "x$build_libmpeg3_lib_yesno" != "xno")
 
 GAPLIBDIR=${libdir}/$PACKAGE-$GAP_MAJOR_VERSION.$GAP_MINOR_VERSION
 
-ALL_LINGUAS="ar az bg ca cs da de dz el en_CA en_GB es eu fi fr gl gu hi hr hu it ja ko lt ml mr nb ne nl nn oc pa pl pt pt_BR ru rw sk sl sq sr sr Latn sv tr uk vi zh_CN zh_TW"
 
 
-AC_PROG_INTLTOOL
+IT_PROG_INTLTOOL([0.35.0])
 AM_GLIB_GNU_GETTEXT
 
 LOCALEDIR='$(prefix)/$(DATADIRNAME)/locale'
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 80e65cf..406a70c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
 # marked to allow runtime translation of messages
 
 gap/gap_arr_dialog.c
+gap/gap_audio_extract.c
 gap/gap_audio_wav.c
 gap/gap_base_ops.c
 gap/gap_bluebox.c
@@ -23,6 +24,7 @@ gap/gap_mod_layer_dialog.c
 gap/gap_morph_dialog.c
 gap/gap_morph_exec.c
 gap/gap_morph_main.c
+gap/gap_morph_tween_dialog.c
 gap/gap_mov_dialog.c
 gap/gap_mov_exec.c
 gap/gap_mpege.c
@@ -56,6 +58,7 @@ gap/gap_wr_color_curve.c
 gap/gap_wr_color_huesat.c
 gap/gap_wr_color_levels.c
 gap/gap_wr_opacity.c
+gap/gap_wr_resynth.c
 gap/gap_wr_trans.c
 libgapvidapi/gap_vid_api_mpeg3.c
 libgapvidapi/gap_vid_api_vidindex.c
@@ -69,4 +72,5 @@ vid_enc_ffmpeg/gap_enc_ffmpeg_gui.c
 vid_enc_ffmpeg/gap_enc_ffmpeg_main.c
 vid_enc_ffmpeg/gap_enc_ffmpeg_callbacks.c
 vid_enc_ffmpeg/gap_enc_ffmpeg_par.c
+vid_enc_rawframes/gap_enc_rawframes_main.c
 vid_enc_single/gap_enc_singleframes_main.c