[libgsf] Updated debianisation
- From: J.H.M. Dassen (Ray) <jdassen src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] Updated debianisation
- Date: Mon, 4 Mar 2013 20:49:43 +0000 (UTC)
commit c8333a3c311d2d6b098562586c3ccc3d84a99815
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date: Mon Mar 4 21:49:33 2013 +0100
Updated debianisation
debian/changelog | 9 +
debian/libgsf-1-114.symbols | 2 +
debian/patches/1eff4c3 | 482 +++++
debian/patches/69bb2f0 | 176 ++
debian/patches/afd9445 | 286 +++
debian/patches/c248f5a | 266 +++
debian/patches/df7ab90 | 541 ++++++
debian/patches/f7d0442 | 18 +
debian/patches/po-from-git | 554 ------
debian/patches/refresh-config-sub-guess-1.14.24-1 | 1340 -------------
debian/patches/refresh-config-sub-guess-1.14.26-1 | 2123 +++++++++++++++++++++
debian/patches/series | 9 +-
12 files changed, 3910 insertions(+), 1896 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index bae415b..99d05c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libgsf (1.14.26-1) unstable; urgency=low
+
+ * New upstream release.
+ * [debian/patches/] Pick up post-release translation updates and
+ introspection fixes.
+ * [debian/libgsf-1-114.symbols] Update.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org> Mon, 04 Mar 2013 20:54:51 +0100
+
libgsf (1.14.25-2) unstable; urgency=medium
* [debian/*] Fix introspection packaging. (Closes: #695599)
diff --git a/debian/libgsf-1-114.symbols b/debian/libgsf-1-114.symbols
index 0995f7f..0ba9407 100644
--- a/debian/libgsf-1-114.symbols
+++ b/debian/libgsf-1-114.symbols
@@ -103,6 +103,7 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_input_proxy_get_type Base 1.14.8
gsf_input_proxy_new Base 1.14.8
gsf_input_proxy_new_section Base 1.14.8
+ gsf_input_read0 Base 1.14.26
gsf_input_read Base 1.14.8
gsf_input_remaining Base 1.14.8
gsf_input_seek Base 1.14.8
@@ -261,6 +262,7 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_value_get_docprop_varray Base 1.14.8
gsf_value_get_docprop_vector Base 1.14.8
gsf_value_set_timestamp Base 1.14.8
+ gsf_vba_inflate Base 1.14.26
gsf_vdir_add_child Base 1.14.8
gsf_vdir_free Base 1.14.8
gsf_vdir_new Base 1.14.8
diff --git a/debian/patches/1eff4c3 b/debian/patches/1eff4c3
new file mode 100644
index 0000000..44b3949
--- /dev/null
+++ b/debian/patches/1eff4c3
@@ -0,0 +1,482 @@
+commit 1eff4c3c4687b35fc57a9d1531a1e7299508d2f2
+Author: Daniel Mustieles <daniel mustieles gmail com>
+Date: Mon Mar 4 17:16:01 2013 +0100
+
+ Updated Spanish translation
+
+diff --git a/po/es.po b/po/es.po
+index 7f8a919..3692cdd 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -3,15 +3,15 @@
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+ # Jorge González <jorgegonz svn gnome org>, 2009.
+-# Daniel Mustieles <daniel mustieles gmail com>, 2012.
++# Daniel Mustieles <daniel mustieles gmail com>, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: libgsf.master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+ "product=libgsf&keywords=I18N+L10N&component=General\n"
+-"POT-Creation-Date: 2012-10-16 17:52+0000\n"
+-"PO-Revision-Date: 2012-10-17 18:03+0200\n"
++"POT-Creation-Date: 2013-03-03 15:19+0000\n"
++"PO-Revision-Date: 2013-03-04 16:48+0100\n"
+ "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
+ "Language-Team: Español <gnome-es-list gnome org>\n"
+ "Language: \n"
+@@ -21,17 +21,17 @@ msgstr ""
+ "X-Generator: KBabel 1.11.4\n"
+ "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+-#: ../gsf/gsf-blob.c:115
++#: ../gsf/gsf-blob.c:113
+ #, c-format
+ msgid "Not enough memory to copy %s bytes of data"
+ msgstr "No hay memoria suficiente para copiar %s bytes de datos"
+
+-#: ../gsf/gsf-clip-data.c:166
++#: ../gsf/gsf-clip-data.c:165
+ #, c-format
+ msgid "The clip_data is in %s, but it is smaller than at least %s bytes"
+ msgstr "El clip_data está en %s, pero es más pequeño de al menos %s bytes"
+
+-#: ../gsf/gsf-clip-data.c:260
++#: ../gsf/gsf-clip-data.c:259
+ #, c-format
+ msgid ""
+ "The clip_data is in Windows clipboard format, but it is smaller than the "
+@@ -40,38 +40,117 @@ msgstr ""
+ "El clip_data está en el formato de Windows, pero es más pequeño de los 4 "
+ "bytes requeridos."
+
+-#: ../gsf/gsf-clip-data.c:271
++#: ../gsf/gsf-clip-data.c:270
+ msgid "Windows Metafile format"
+ msgstr "Formato de meta archivo de Windows"
+
+ #. CF_BITMAP
+-#: ../gsf/gsf-clip-data.c:277
++#: ../gsf/gsf-clip-data.c:276
+ msgid "Windows DIB or BITMAP format"
+ msgstr "Formato DIB o BITMAP de Windows"
+
+-#: ../gsf/gsf-clip-data.c:282
++#: ../gsf/gsf-clip-data.c:281
+ msgid "Windows Enhanced Metafile format"
+ msgstr "Formato de meta archivo mejorado de Windows"
+
+-#: ../gsf/gsf-libxml.c:1493
++#: ../gsf/gsf-infile-tar.c:542 ../gsf/gsf-infile-zip.c:821
++#: ../gsf/gsf-input-gzip.c:506
++msgid "Source"
++msgstr "Fuente"
++
++#: ../gsf/gsf-infile-tar.c:543 ../gsf/gsf-infile-zip.c:822
++msgid "The archive being interpreted"
++msgstr "El archivo que se está interpretando"
++
++#: ../gsf/gsf-infile-zip.c:837 ../gsf/gsf-outfile-zip.c:727
++msgid "Compression Level"
++msgstr "Nivel de compresión"
++
++#: ../gsf/gsf-infile-zip.c:838 ../gsf/gsf-outfile-zip.c:728
++msgid "The level of compression used, zero meaning none"
++msgstr "El nivel de compresión usado; cero significa ninguno"
++
++#: ../gsf/gsf-input-gzip.c:495
++msgid "Raw"
++msgstr ""
++
++#: ../gsf/gsf-input-gzip.c:496
++msgid "Whether to read compressed data with no header and no trailer"
++msgstr ""
++
++#: ../gsf/gsf-input-gzip.c:507
++msgid "Where the compressed data comes from"
++msgstr "De dónde provienen los datos comprimidos"
++
++#: ../gsf/gsf-input-gzip.c:523
++msgid "Size after decompression"
++msgstr "Tamaño después de descomprimir"
++
++#: ../gsf/gsf-input-gzip.c:524
++msgid "The source's uncompressed size"
++msgstr "El tamaño de la fuente sin comprimir"
++
++#: ../gsf/gsf-input.c:122 ../gsf/gsf-output.c:136
++msgid "Name"
++msgstr "Nombre"
++
++#: ../gsf/gsf-input.c:123
++msgid "The input's name"
++msgstr "El nombre de la entrada"
++
++#: ../gsf/gsf-input.c:132 ../gsf/gsf-output.c:146
++msgid "Size"
++msgstr "Tamaño"
++
++#: ../gsf/gsf-input.c:133
++msgid "The input's size"
++msgstr "El tamaño de la entrada"
++
++#: ../gsf/gsf-input.c:147
++msgid "EOF"
++msgstr "EOF"
++
++#: ../gsf/gsf-input.c:148
++msgid "End of file"
++msgstr "Fin del archivo"
++
++#: ../gsf/gsf-input.c:157
++msgid "Remaining"
++msgstr "Restante"
++
++#: ../gsf/gsf-input.c:158
++msgid "Amount of data remaining"
++msgstr ""
++
++#: ../gsf/gsf-input.c:167 ../gsf/gsf-output.c:156
++msgid "Position"
++msgstr "Posición"
++
++#: ../gsf/gsf-input.c:168
++msgid "The input's current position"
++msgstr ""
++
++#: ../gsf/gsf-libxml.c:1497
+ msgid "Pretty print"
+ msgstr "Impresión bonita"
+
+-#: ../gsf/gsf-libxml.c:1494
++#: ../gsf/gsf-libxml.c:1498
+ msgid "Should the output auto-indent elements to make reading easier?"
+ msgstr ""
+ "¿Debe la salida sangrar automáticamente los elementos para facilitar la "
+ "lectura?"
+
+-#: ../gsf/gsf-libxml.c:1500
++#: ../gsf/gsf-libxml.c:1504 ../gsf/gsf-open-pkg-utils.c:729
++#: ../gsf/gsf-outfile-zip.c:707 ../gsf/gsf-output-csv.c:333
++#: ../gsf/gsf-output-iconv.c:276
+ msgid "Sink"
+ msgstr "Destino"
+
+-#: ../gsf/gsf-libxml.c:1501
++#: ../gsf/gsf-libxml.c:1505
+ msgid "The destination for writes"
+ msgstr "El destino de la escritura"
+
+-#: ../gsf/gsf-msole-utils.c:315
++#: ../gsf/gsf-msole-utils.c:312
+ #, c-format
+ msgid ""
+ "Missing data when reading the %s property; got %s bytes, but %s bytes at "
+@@ -80,7 +159,7 @@ msgstr ""
+ "Faltan datos al leer la propiedad %s; se obtuvieron %s bytes pero se "
+ "necesitan al menos %s bytes."
+
+-#: ../gsf/gsf-msole-utils.c:366
++#: ../gsf/gsf-msole-utils.c:363
+ #, c-format
+ msgid ""
+ "Corrupt data in the VT_CF property; clipboard data length must be at least 4 "
+@@ -90,116 +169,248 @@ msgstr ""
+ "de al menos 4 bytes, pero los datos dicen que sólo tiene %s bytes "
+ "disponibles."
+
+-#: ../gsf/gsf-open-pkg-utils.c:355
++#: ../gsf/gsf-open-pkg-utils.c:353
+ #, c-format
+ msgid "Unable to find part id='%s' for '%s'"
+ msgstr "No se pudo encontrar la parte con ID=«%s» para «%s»"
+
+-#: ../gsf/gsf-open-pkg-utils.c:383
++#: ../gsf/gsf-open-pkg-utils.c:381
+ #, c-format
+ msgid "Unable to find part with type='%s' for '%s'"
+ msgstr "No se pudo encontrar la parte con el tipo=«%s» para «%s»"
+
+-#: ../gsf/gsf-open-pkg-utils.c:413
++#: ../gsf/gsf-open-pkg-utils.c:411
+ #, c-format
+ msgid "Missing id for part in '%s'"
+ msgstr "Falta un ID para una parte en «%s»"
+
+-#: ../gsf/gsf-open-pkg-utils.c:422
++#: ../gsf/gsf-open-pkg-utils.c:420
+ #, c-format
+ msgid "Part '%s' in '%s' from '%s' is corrupt!"
+ msgstr "La parte «%s» en «%s» de «%s» está corrupta."
+
+-#: ../gsf/gsf-opendoc-utils.c:353
++#: ../gsf/gsf-open-pkg-utils.c:730
++msgid "The GsfOutput that stores the Open Package content"
++msgstr ""
++
++#: ../gsf/gsf-open-pkg-utils.c:736
++msgid "Content type"
++msgstr "Tipo de contenido"
++
++#: ../gsf/gsf-open-pkg-utils.c:737
++msgid "The content type stored in the root [Content_Types].xml file"
++msgstr ""
++
++#: ../gsf/gsf-open-pkg-utils.c:743
++msgid "Is Directory"
++msgstr ""
++
++#: ../gsf/gsf-open-pkg-utils.c:744
++msgid "Can the outfile have children"
++msgstr ""
++
++#: ../gsf/gsf-opendoc-utils.c:355
+ #, c-format
+ msgid "Property \"%s\" used for multiple types!"
+ msgstr "La propiedad %s se usa para varios tipos."
+
+-#: ../gsf/gsf-opendoc-utils.c:878
++#: ../gsf/gsf-opendoc-utils.c:880
+ msgid "ODF version"
+ msgstr "Versión ODF"
+
+-#: ../gsf/gsf-opendoc-utils.c:879
++#: ../gsf/gsf-opendoc-utils.c:881
+ msgid "The ODF version this object is targeting as an integer like 100"
+ msgstr "La versión ODF de este objeto se refiere a un entero como 100"
+
+-#: ../tools/gsf.c:27
++#: ../gsf/gsf-outfile-zip.c:708
++msgid "Where the archive is written"
++msgstr "Dónde se escribe el archivo"
++
++#: ../gsf/gsf-outfile-zip.c:717
++msgid "Entry Name"
++msgstr ""
++
++#: ../gsf/gsf-outfile-zip.c:718
++msgid "The filename of this member in the archive without path"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:334
++msgid "Where the formatted output is written"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:343
++msgid "Quote"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:344
++msgid "The string used for quoting fields"
++msgstr "La cadena usada para citar campos"
++
++#: ../gsf/gsf-output-csv.c:354
++msgid "Quoting Mode"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:355
++msgid "When to quote fields"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:366
++msgid "Quoting Triggers"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:367
++msgid "Characters that cause field quoting"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:376
++msgid "Quoting On Whitespace"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:377
++msgid "Does initial or terminal whitespace force quoting?"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:386
++msgid "Separator"
++msgstr "Separador"
++
++#: ../gsf/gsf-output-csv.c:387
++msgid "The field separator"
++msgstr "El separador de campos"
++
++#: ../gsf/gsf-output-csv.c:397
++msgid "end-on-line"
++msgstr ""
++
++#: ../gsf/gsf-output-csv.c:398
++msgid "The end-of-line marker"
++msgstr "El marcador de fin de línea"
++
++#: ../gsf/gsf-output-iconv.c:277
++msgid "Where the converted data is written"
++msgstr ""
++
++#: ../gsf/gsf-output-iconv.c:287
++msgid "Input Charset"
++msgstr "Conjunto de caracteres de entrada"
++
++#: ../gsf/gsf-output-iconv.c:288
++msgid "The character set to convert from"
++msgstr ""
++
++#: ../gsf/gsf-output-iconv.c:297
++msgid "Output Charset"
++msgstr "Conjunto de caracteres de salida"
++
++#: ../gsf/gsf-output-iconv.c:298
++msgid "The character set to convert to"
++msgstr ""
++
++#: ../gsf/gsf-output-iconv.c:314
++msgid "Fallback"
++msgstr "Alternativo"
++
++#: ../gsf/gsf-output-iconv.c:315
++msgid "The string to use for invalid characters"
++msgstr "La cadena usada para caracteres no válidos"
++
++#: ../gsf/gsf-output.c:137
++msgid "The output's name"
++msgstr "El nombre de la salida"
++
++#: ../gsf/gsf-output.c:147
++msgid "The output's size"
++msgstr "El tamaño de la salida"
++
++#: ../gsf/gsf-output.c:157
++msgid "The output's current position"
++msgstr "La posición actual de la salida"
++
++#: ../gsf/gsf-output.c:166
++msgid "Is Closed"
++msgstr ""
++
++#: ../gsf/gsf-output.c:167
++msgid "Whether the output is closed"
++msgstr "Indica si la salida está cerrada"
++
++#: ../tools/gsf.c:15
+ msgid "Display program version"
+ msgstr "Mostrar la versión del programa"
+
+-#: ../tools/gsf.c:54
++#: ../tools/gsf.c:42
+ #, c-format
+ msgid "%s: Failed to open %s: %s\n"
+ msgstr "%s: Falló al abrir %s: %s\n"
+
+-#: ../tools/gsf.c:75
++#: ../tools/gsf.c:63
+ #, c-format
+ msgid "%s: Failed to recognize %s as an archive\n"
+ msgstr "%s: Falló al reconocer %s como un archivador\n"
+
+-#: ../tools/gsf.c:112
++#: ../tools/gsf.c:100
+ #, c-format
+ msgid "Available subcommands are...\n"
+ msgstr "Los subcomandos disponibles son...\n"
+
+-#: ../tools/gsf.c:113
++#: ../tools/gsf.c:101
+ #, c-format
+ msgid "* cat output one or more files in archive\n"
+ msgstr "* cat muestra la salida de uno o más archivadores\n"
+
+-#: ../tools/gsf.c:114
++#: ../tools/gsf.c:102
+ #, c-format
+ msgid "* dump dump one or more files in archive as hex\n"
+ msgstr ""
+ "* dump vuelca uno o más archivos en un archivador como datos "
+ "hexadecimales\n"
+
+-#: ../tools/gsf.c:115
++#: ../tools/gsf.c:103
+ #, c-format
+ msgid "* help list subcommands\n"
+ msgstr "* help lista los subcomandos\n"
+
+-#: ../tools/gsf.c:116
++#: ../tools/gsf.c:104
+ #, c-format
+ msgid "* list list files in archive\n"
+ msgstr "* list lista los archivos en el archivador\n"
+
+-#: ../tools/gsf.c:117
++#: ../tools/gsf.c:105
+ #, c-format
+ msgid "* listprops list document properties in archive\n"
+ msgstr ""
+ "* listprops lista las propiedades de los documentos en el archivador\n"
+
+-#: ../tools/gsf.c:118
++#: ../tools/gsf.c:106
+ #, c-format
+ msgid "* props print specified document properties\n"
+ msgstr "* props imprime las propiedades del documento especificado\n"
+
+-#: ../tools/gsf.c:119
++#: ../tools/gsf.c:107
+ #, c-format
+ msgid "* createole create OLE archive\n"
+ msgstr "* createole crear archivador OLE\n"
+
+-#: ../tools/gsf.c:120
++#: ../tools/gsf.c:108
+ #, c-format
+ msgid "* createzip create ZIP archive\n"
+ msgstr "* createzip crear archivador ZIP\n"
+
+-#: ../tools/gsf.c:303
++#: ../tools/gsf.c:291
+ #, c-format
+ msgid "No property named %s\n"
+ msgstr "No existe la propiedad de nombre %s\n"
+
+-#: ../tools/gsf.c:362
++#: ../tools/gsf.c:350
+ #, c-format
+ msgid "%s: Error processing file %s: %s\n"
+ msgstr "%s:error al procesar el archivo %s: %s\n"
+
+-#: ../tools/gsf.c:526
++#: ../tools/gsf.c:514
+ msgid "SUBCOMMAND ARCHIVE..."
+ msgstr "SUBCOMANDO ARCHIVADOR..."
+
+-#: ../tools/gsf.c:533
++#: ../tools/gsf.c:521
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -209,19 +420,20 @@ msgstr ""
+ "Ejecute «%s --help» para ver una lista completa de todas las opciones "
+ "disponibles de la línea de comandos.\n"
+
+-#: ../tools/gsf.c:540
++#: ../tools/gsf.c:528
+ #, c-format
+ msgid "gsf version %d.%d.%d\n"
+ msgstr "Versión de gsf %d.%d.%d\n"
+
+-#: ../tools/gsf.c:546
++#: ../tools/gsf.c:534
+ #, c-format
+ msgid "Usage: %s %s\n"
+ msgstr "Uso: %s %s\n"
+
+-#: ../tools/gsf.c:571
++#: ../tools/gsf.c:559
+ #, c-format
+-msgid "Run '%s help' to see a list subcommands.\n"
++#| msgid "Run '%s help' to see a list subcommands.\n"
++msgid "Run '%s help' to see a list of subcommands.\n"
+ msgstr "Ejecite «%s help» para ver una lista de los subcomandos.\n"
+
+ #~ msgid ""
diff --git a/debian/patches/69bb2f0 b/debian/patches/69bb2f0
new file mode 100644
index 0000000..fa85de9
--- /dev/null
+++ b/debian/patches/69bb2f0
@@ -0,0 +1,176 @@
+commit 69bb2f0d1a164cd9eba30bc97cb306d202632753
+Author: Morten Welinder <terra gnome org>
+Date: Fri Mar 1 14:12:37 2013 -0500
+
+ Introspection fixes
+
+diff --git a/gsf/gsf-infile-zip.c b/gsf/gsf-infile-zip.c
+index 267211c..d42662a 100644
+--- a/gsf/gsf-infile-zip.c
++++ b/gsf/gsf-infile-zip.c
+@@ -858,7 +858,7 @@ GSF_CLASS (GsfInfileZip, gsf_infile_zip,
+ /**
+ * gsf_infile_zip_new:
+ * @source: A base #GsfInput
+- * @err: A #GError, optionally %null
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Opens the root directory of a Zip file.
+ * <note>This adds a reference to @source.</note>
+diff --git a/gsf/gsf-input-bzip.c b/gsf/gsf-input-bzip.c
+index 9a2d83e..5da1412 100644
+--- a/gsf/gsf-input-bzip.c
++++ b/gsf/gsf-input-bzip.c
+@@ -33,7 +33,7 @@
+ /**
+ * gsf_input_memory_new_from_bzip:
+ * @source: a #GsfInput
+- * @err: a #GError
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Returns: a new #GsfInputMemory or %NULL.
+ */
+diff --git a/gsf/gsf-input-gzip.c b/gsf/gsf-input-gzip.c
+index b6849c5..b5556cb 100644
+--- a/gsf/gsf-input-gzip.c
++++ b/gsf/gsf-input-gzip.c
+@@ -196,7 +196,7 @@ gsf_input_gzip_set_source (GsfInputGZip *gzip, GsfInput *source)
+ /**
+ * gsf_input_gzip_new:
+ * @source: The underlying data source.
+- * @err: optionally %NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Adds a reference to @source.
+ *
+diff --git a/gsf/gsf-input-stdio.c b/gsf/gsf-input-stdio.c
+index 6b534a5..b99c74c 100644
+--- a/gsf/gsf-input-stdio.c
++++ b/gsf/gsf-input-stdio.c
+@@ -155,13 +155,13 @@ gsf_input_stdio_new (char const *filename, GError **err)
+ /**
+ * gsf_input_stdio_new_FILE:
+ * @filename: The filename corresponding to @file.
+- * @file: an existing stdio <type>FILE</type> *
++ * @file: (transfer full): an existing stdio <type>FILE</type> *
+ * @keep_open: Should @file be closed when the wrapper is closed
+ *
+ * Assumes ownership of @file when succeeding. If @keep_open is true,
+- * ownership reverts to caller when the GsfObject is closed.
++ * ownership reverts to caller when the #GsfInput is closed.
+ *
+- * Returns: a new GsfInput wrapper for @file. Note that if the file is not
++ * Returns: a new #GsfInput wrapper for @file. Note that if the file is not
+ * seekable, this function will make a local copy of the entire file.
+ **/
+ GsfInput *
+@@ -319,4 +319,3 @@ gsf_input_stdio_class_init (GObjectClass *gobject_class)
+ GSF_CLASS (GsfInputStdio, gsf_input_stdio,
+ gsf_input_stdio_class_init, gsf_input_stdio_init,
+ GSF_INPUT_TYPE)
+-
+diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c
+index c95896e..2944a9b 100644
+--- a/gsf/gsf-input.c
++++ b/gsf/gsf-input.c
+@@ -193,7 +193,7 @@ gsf_input_container (GsfInput *input)
+ /**
+ * gsf_input_dup:
+ * @input: The input to duplicate
+- * @err: optionally %NULL
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Duplicates input @src leaving the new one at the same offset.
+ *
+@@ -235,7 +235,7 @@ gsf_input_dup (GsfInput *input, GError **err)
+ * gsf_input_sibling:
+ * @input: The input
+ * @name: name.
+- * @err: #GError
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * UNIMPLEMENTED BY ANY BACKEND
+ * and it is probably unnecessary. gsf_input_get_container provides
+@@ -258,9 +258,7 @@ gsf_input_sibling (GsfInput const *input, char const *name, GError **err)
+ * gsf_input_size:
+ * @input: The input
+ *
+- * Looks up and caches the number of bytes in the input
+- *
+- * Returns: the size or -1 on error
++ * Returns: the total number of bytes in the input or -1 on error
+ **/
+ gsf_off_t
+ gsf_input_size (GsfInput *input)
+@@ -602,8 +600,8 @@ gsf_input_copy (GsfInput *input, GsfOutput *output)
+ * This functions takes ownership of the incoming reference and yields a
+ * new one as its output.
+ *
+- * Returns: (transfer full): A stream equivalent to the source stream, but uncompressed if
+- * the source was compressed.
++ * Returns: (transfer full): A stream equivalent to the source stream,
++ * but uncompressed if the source was compressed.
+ **/
+ GsfInput *
+ gsf_input_uncompress (GsfInput *src)
+diff --git a/gsf/gsf-output-stdio.c b/gsf/gsf-output-stdio.c
+index 34048b3..bf89aef 100644
+--- a/gsf/gsf-output-stdio.c
++++ b/gsf/gsf-output-stdio.c
+@@ -521,7 +521,7 @@ gsf_output_stdio_new_valist (char const *filename, GError **err,
+ /**
+ * gsf_output_stdio_new_full:
+ * @filename: name of file to create or replace.
+- * @err: optionally %NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ * @first_property_name: %NULL terminated list of properties
+ * @...:
+ *
+@@ -544,7 +544,7 @@ gsf_output_stdio_new_full (char const *filename, GError **err,
+ /**
+ * gsf_output_stdio_new:
+ * @filename: name of file to create or replace.
+- * @err: optionally %NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Returns: a new file or %NULL.
+ **/
+@@ -555,13 +555,13 @@ gsf_output_stdio_new (char const *filename, GError **err)
+ }
+
+ /**
+- * gsf_output_stdio_new_FILE:
++ * gsf_output_stdio_new_FILE: (skip)
+ * @filename: The filename corresponding to @file.
+- * @file: an existing stdio <type>FILE</type> *
++ * @file: (transfer full): an existing stdio <type>FILE</type> *
+ * @keep_open: Should @file be closed when the wrapper is closed
+ *
+ * Assumes ownership of @file. If @keep_open is true, ownership reverts
+- * to caller when the GsfObject is closed.
++ * to caller when the GsfOutput is closed.
+ *
+ * Returns: a new GsfOutput wrapper for @file. Warning: the result will be
+ * seekable only if @file is seekable. If it is seekable, the resulting
+diff --git a/gsf/gsf-output.c b/gsf/gsf-output.c
+index 49c8e3c..fb02fb2 100644
+--- a/gsf/gsf-output.c
++++ b/gsf/gsf-output.c
+@@ -360,7 +360,7 @@ gsf_output_write (GsfOutput *output,
+ * gsf_output_error:
+ * @output:
+ *
+- * Returns: the last error logged on the output, or %NULL.
++ * Returns: (transfer none): the last error logged on the output, or %NULL.
+ **/
+ GError const *
+ gsf_output_error (GsfOutput const *output)
+@@ -628,7 +628,7 @@ gsf_output_real_vprintf (GsfOutput *output, char const *fmt, va_list args)
+ /**
+ * gsf_output_puts:
+ * @output: A #GsfOutput
+- * @line: %null terminated string to write
++ * @line: Nul terminated string to write
+ *
+ * Like fputs, this assumes that the line already ends with a newline
+ *
diff --git a/debian/patches/afd9445 b/debian/patches/afd9445
new file mode 100644
index 0000000..1f3e75c
--- /dev/null
+++ b/debian/patches/afd9445
@@ -0,0 +1,286 @@
+commit afd9445ca607b3189ed9f9b2edbf0620d639c612
+Author: Matej Urbančič <mateju svn gnome org>
+Date: Fri Mar 1 20:23:03 2013 +0100
+
+ Updated Slovenian translation
+
+diff --git a/po/sl.po b/po/sl.po
+index 1a453b6..2be012a 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -2,186 +2,201 @@
+ # Copyright (C) 2009 libgsf's COPYRIGHT HOLDER
+ # This file is distributed under the same license as the libgsf package.
+ #
+-# Matej Urbančič <mateju svn gnome org>, 2009 - 2012.
++# Matej Urbančič <mateju svn gnome org>, 2009 - 2013.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: libgsf master\n"
+-"Report-Msgid-Bugs-To:
http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf&keywords=I18N+L10N&component=General\n";
+-"POT-Creation-Date: 2012-10-16 17:52+0000\n"
+-"PO-Revision-Date: 2012-10-16 20:11+0100\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
++"product=libgsf&keywords=I18N+L10N&component=General\n"
++"POT-Creation-Date: 2013-03-01 19:13+0000\n"
++"PO-Revision-Date: 2013-03-01 20:19+0100\n"
+ "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
+ "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
+-"Language: \n"
++"Language: sl_SI\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+-"X-Poedit-Country: SLOVENIA\n"
+-"X-Poedit-Language: Slovenian\n"
+ "X-Poedit-SourceCharset: utf-8\n"
++"X-Generator: Poedit 1.5.4\n"
+
+-#: ../gsf/gsf-blob.c:115
++#: ../gsf/gsf-blob.c:113
+ #, c-format
+ msgid "Not enough memory to copy %s bytes of data"
+ msgstr "Ni dovolj pomnilnika za kopiranje %s bajtov podatkov"
+
+-#: ../gsf/gsf-clip-data.c:166
++#: ../gsf/gsf-clip-data.c:165
+ #, c-format
+ msgid "The clip_data is in %s, but it is smaller than at least %s bytes"
+ msgstr "Clip_data je del %s, vendar je manjši kot %s bajtov"
+
+-#: ../gsf/gsf-clip-data.c:260
++#: ../gsf/gsf-clip-data.c:259
+ #, c-format
+-msgid "The clip_data is in Windows clipboard format, but it is smaller than the required 4 bytes."
+-msgstr "Clip_data je običajni Windows zapis odložišča, vendar je manjši od zahtevanih 4 bajtov."
++msgid ""
++"The clip_data is in Windows clipboard format, but it is smaller than the "
++"required 4 bytes."
++msgstr ""
++"Clip_data je običajni Windows zapis odložišča, vendar je manjši od "
++"zahtevanih 4 bajtov."
+
+-#: ../gsf/gsf-clip-data.c:271
++#: ../gsf/gsf-clip-data.c:270
+ msgid "Windows Metafile format"
+ msgstr "Zapis Windows Metafile"
+
+ #. CF_BITMAP
+-#: ../gsf/gsf-clip-data.c:277
++#: ../gsf/gsf-clip-data.c:276
+ msgid "Windows DIB or BITMAP format"
+ msgstr "Zapis Windows DIB ali BITMAP"
+
+-#: ../gsf/gsf-clip-data.c:282
++#: ../gsf/gsf-clip-data.c:281
+ msgid "Windows Enhanced Metafile format"
+ msgstr "Zapis Windows Enhanced Metafile"
+
+-#: ../gsf/gsf-libxml.c:1493
++#: ../gsf/gsf-libxml.c:1497
+ msgid "Pretty print"
+ msgstr "Oblikovno izrisovanje"
+
+-#: ../gsf/gsf-libxml.c:1494
++#: ../gsf/gsf-libxml.c:1498
+ msgid "Should the output auto-indent elements to make reading easier?"
+ msgstr "Ali naj se v odvodu predmeti samodejno zamaknejo za lažje branje?"
+
+-#: ../gsf/gsf-libxml.c:1500
++#: ../gsf/gsf-libxml.c:1504
+ msgid "Sink"
+ msgstr "Ponor"
+
+-#: ../gsf/gsf-libxml.c:1501
++#: ../gsf/gsf-libxml.c:1505
+ msgid "The destination for writes"
+ msgstr "Cilj za izvozne datoteke"
+
+-#: ../gsf/gsf-msole-utils.c:315
++#: ../gsf/gsf-msole-utils.c:312
+ #, c-format
+-msgid "Missing data when reading the %s property; got %s bytes, but %s bytes at least are needed."
+-msgstr "Manjkajoči podatki med branjem lastnosti %s; dobljenih %s bajtov, vendar je zahtevanih vsaj %s
bajtov."
++msgid ""
++"Missing data when reading the %s property; got %s bytes, but %s bytes at "
++"least are needed."
++msgstr ""
++"Manjkajoči podatki med branjem lastnosti %s; dobljenih %s bajtov, vendar je "
++"zahtevanih vsaj %s bajtov."
+
+-#: ../gsf/gsf-msole-utils.c:366
++#: ../gsf/gsf-msole-utils.c:363
+ #, c-format
+-msgid "Corrupt data in the VT_CF property; clipboard data length must be at least 4 bytes, but the data
says it only has %s bytes available."
+-msgstr "Pokvarjeni podatki lastnosti VT_CF; velikost podatkov odložišča mora biti vsaj 4 bajte, podatki pa
kažejo na le %s razpoložljive bajte."
++msgid ""
++"Corrupt data in the VT_CF property; clipboard data length must be at least 4 "
++"bytes, but the data says it only has %s bytes available."
++msgstr ""
++"Pokvarjeni podatki lastnosti VT_CF; velikost podatkov odložišča mora biti "
++"vsaj 4 bajte, podatki pa kažejo na le %s razpoložljive bajte."
+
+-#: ../gsf/gsf-open-pkg-utils.c:355
++#: ../gsf/gsf-open-pkg-utils.c:353
+ #, c-format
+ msgid "Unable to find part id='%s' for '%s'"
+ msgstr "Ni mogoče najti dela id='%s' za '%s'"
+
+-#: ../gsf/gsf-open-pkg-utils.c:383
++#: ../gsf/gsf-open-pkg-utils.c:381
+ #, c-format
+ msgid "Unable to find part with type='%s' for '%s'"
+ msgstr "Ni mogoče najti dela vrsta='%s' za '%s'"
+
+-#: ../gsf/gsf-open-pkg-utils.c:413
++#: ../gsf/gsf-open-pkg-utils.c:411
+ #, c-format
+ msgid "Missing id for part in '%s'"
+ msgstr "Manjkajoči id za del v '%s'"
+
+-#: ../gsf/gsf-open-pkg-utils.c:422
++#: ../gsf/gsf-open-pkg-utils.c:420
+ #, c-format
+ msgid "Part '%s' in '%s' from '%s' is corrupt!"
+ msgstr "Del '%s' v '%s' iz '%s' je pokvarjen!"
+
+-#: ../gsf/gsf-opendoc-utils.c:353
++#: ../gsf/gsf-opendoc-utils.c:355
+ #, c-format
+ msgid "Property \"%s\" used for multiple types!"
+ msgstr "Lastnost \"%s\" je uporabljena za več vrst!"
+
+-#: ../gsf/gsf-opendoc-utils.c:878
++#: ../gsf/gsf-opendoc-utils.c:880
+ msgid "ODF version"
+ msgstr "Različica ODF"
+
+-#: ../gsf/gsf-opendoc-utils.c:879
++#: ../gsf/gsf-opendoc-utils.c:881
+ msgid "The ODF version this object is targeting as an integer like 100"
+-msgstr "Različica ODF, na katerega cilja predmet, določena kot celo število; na primer 100"
++msgstr ""
++"Različica ODF, na katerega cilja predmet, določena kot celo število; na "
++"primer 100"
+
+-#: ../tools/gsf.c:27
++#: ../tools/gsf.c:15
+ msgid "Display program version"
+ msgstr "Pokaži različico programa"
+
+-#: ../tools/gsf.c:54
++#: ../tools/gsf.c:42
+ #, c-format
+ msgid "%s: Failed to open %s: %s\n"
+ msgstr "%s: napaka med odpiranjem %s: %s\n"
+
+-#: ../tools/gsf.c:75
++#: ../tools/gsf.c:63
+ #, c-format
+ msgid "%s: Failed to recognize %s as an archive\n"
+ msgstr "%s: napaka med prepoznavanjem datoteke %s kot vrste arhiva\n"
+
+-#: ../tools/gsf.c:112
++#: ../tools/gsf.c:100
+ #, c-format
+ msgid "Available subcommands are...\n"
+ msgstr "Razpoložljivi podrejeni ukazi so ...\n"
+
+-#: ../tools/gsf.c:113
++#: ../tools/gsf.c:101
+ #, c-format
+ msgid "* cat output one or more files in archive\n"
+ msgstr "* cat izpis enega ali več datotek v arhivu\n"
+
+-#: ../tools/gsf.c:114
++#: ../tools/gsf.c:102
+ #, c-format
+ msgid "* dump dump one or more files in archive as hex\n"
+-msgstr "* dump izpiši enega ali več datotek v arhivu v šestnajstiškem zapisu\n"
++msgstr ""
++"* dump izpiši enega ali več datotek v arhivu v šestnajstiškem zapisu\n"
+
+-#: ../tools/gsf.c:115
++#: ../tools/gsf.c:103
+ #, c-format
+ msgid "* help list subcommands\n"
+ msgstr "* help izpis podrejenih ukazov\n"
+
+-#: ../tools/gsf.c:116
++#: ../tools/gsf.c:104
+ #, c-format
+ msgid "* list list files in archive\n"
+ msgstr "* list izpis datotek v arhivu\n"
+
+-#: ../tools/gsf.c:117
++#: ../tools/gsf.c:105
+ #, c-format
+ msgid "* listprops list document properties in archive\n"
+ msgstr "* listprops izpis lastnosti dokumentov v arhivu\n"
+
+-#: ../tools/gsf.c:118
++#: ../tools/gsf.c:106
+ #, c-format
+ msgid "* props print specified document properties\n"
+ msgstr "* props natisne določene lastnosti dokumenta\n"
+
+-#: ../tools/gsf.c:119
++#: ../tools/gsf.c:107
+ #, c-format
+ msgid "* createole create OLE archive\n"
+ msgstr "* createole ustvari arhiv OLE\n"
+
+-#: ../tools/gsf.c:120
++#: ../tools/gsf.c:108
+ #, c-format
+ msgid "* createzip create ZIP archive\n"
+ msgstr "* createzip ustvari arhiv ZIP\n"
+
+-#: ../tools/gsf.c:303
++#: ../tools/gsf.c:291
+ #, c-format
+ msgid "No property named %s\n"
+ msgstr "Ni lastnosti z imenom %s\n"
+
+-#: ../tools/gsf.c:362
++#: ../tools/gsf.c:350
+ #, c-format
+ msgid "%s: Error processing file %s: %s\n"
+ msgstr "%s: napaka med obravnavo datoteke %s: %s\n"
+
+-#: ../tools/gsf.c:526
++#: ../tools/gsf.c:514
+ msgid "SUBCOMMAND ARCHIVE..."
+ msgstr "Arhiv podrejenih ukazov ..."
+
+-#: ../tools/gsf.c:533
++#: ../tools/gsf.c:521
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -190,19 +205,19 @@ msgstr ""
+ "%s\n"
+ "Zaženite '%s --help' za izpis popolnega seznama ukazov na voljo.\n"
+
+-#: ../tools/gsf.c:540
++#: ../tools/gsf.c:528
+ #, c-format
+ msgid "gsf version %d.%d.%d\n"
+ msgstr "gsf različica %d.%d.%d\n"
+
+-#: ../tools/gsf.c:546
++#: ../tools/gsf.c:534
+ #, c-format
+ msgid "Usage: %s %s\n"
+ msgstr "Uporaba: %s %s\n"
+
+-#: ../tools/gsf.c:571
++#: ../tools/gsf.c:559
+ #, c-format
+-msgid "Run '%s help' to see a list subcommands.\n"
++msgid "Run '%s help' to see a list of subcommands.\n"
+ msgstr "Zaženite '%s help' za izpis seznama podrejenih ukazov.\n"
+
+ #~ msgid ""
diff --git a/debian/patches/c248f5a b/debian/patches/c248f5a
new file mode 100644
index 0000000..f71a11b
--- /dev/null
+++ b/debian/patches/c248f5a
@@ -0,0 +1,266 @@
+commit c248f5a21a444ae9c3ee4ba9564318a2c0d69262
+Author: Piotr Drąg <piotrdrag gmail com>
+Date: Fri Mar 1 19:45:13 2013 +0100
+
+ Updated Polish translation
+
+diff --git a/po/pl.po b/po/pl.po
+index e1def86..b12c2e2 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -4,14 +4,14 @@
+ # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
+ # gnomepl aviary pl
+ # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+-# Piotr Drąg <piotrdrag gmail com>, 2010-2012.
+-# Aviary.pl <gnomepl aviary pl>, 2010-2012.
++# Piotr Drąg <piotrdrag gmail com>, 2010-2013.
++# Aviary.pl <gnomepl aviary pl>, 2010-2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: libgsf\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-10-26 17:32+0200\n"
+-"PO-Revision-Date: 2012-10-26 17:33+0200\n"
++"POT-Creation-Date: 2013-03-01 19:44+0100\n"
++"PO-Revision-Date: 2013-03-01 19:45+0100\n"
+ "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
+ "Language-Team: Polish <gnomepl aviary pl>\n"
+ "Language: pl\n"
+@@ -23,18 +23,18 @@ msgstr ""
+ "X-Poedit-Language: Polish\n"
+ "X-Poedit-Country: Poland\n"
+
+-#: ../gsf/gsf-blob.c:115
++#: ../gsf/gsf-blob.c:113
+ #, c-format
+ msgid "Not enough memory to copy %s bytes of data"
+ msgstr "Brak wystarczającej ilości pamięci do skopiowania %s bajtów danych"
+
+-#: ../gsf/gsf-clip-data.c:166
++#: ../gsf/gsf-clip-data.c:165
+ #, c-format
+ msgid "The clip_data is in %s, but it is smaller than at least %s bytes"
+ msgstr ""
+ "clip_data znajduje się w %s, ale jest mniejsze niż co najmniej %s bajtów"
+
+-#: ../gsf/gsf-clip-data.c:260
++#: ../gsf/gsf-clip-data.c:259
+ #, c-format
+ msgid ""
+ "The clip_data is in Windows clipboard format, but it is smaller than the "
+@@ -43,36 +43,36 @@ msgstr ""
+ "clip_data jest w formacie schowka systemu Windows, ale jest mniejsze niż "
+ "wymagane 4 bajty."
+
+-#: ../gsf/gsf-clip-data.c:271
++#: ../gsf/gsf-clip-data.c:270
+ msgid "Windows Metafile format"
+ msgstr "Format metapliku systemu Windows"
+
+ #. CF_BITMAP
+-#: ../gsf/gsf-clip-data.c:277
++#: ../gsf/gsf-clip-data.c:276
+ msgid "Windows DIB or BITMAP format"
+ msgstr "Format DIB lub BITMAP systemu Windows"
+
+-#: ../gsf/gsf-clip-data.c:282
++#: ../gsf/gsf-clip-data.c:281
+ msgid "Windows Enhanced Metafile format"
+ msgstr "Ulepszony format metapliku systemu Windows"
+
+-#: ../gsf/gsf-libxml.c:1493
++#: ../gsf/gsf-libxml.c:1497
+ msgid "Pretty print"
+ msgstr "Ładne wyjście"
+
+-#: ../gsf/gsf-libxml.c:1494
++#: ../gsf/gsf-libxml.c:1498
+ msgid "Should the output auto-indent elements to make reading easier?"
+ msgstr "Czy automatycznie wyrównywać elementy wyjścia"
+
+-#: ../gsf/gsf-libxml.c:1500
++#: ../gsf/gsf-libxml.c:1504
+ msgid "Sink"
+ msgstr "Odpływ"
+
+-#: ../gsf/gsf-libxml.c:1501
++#: ../gsf/gsf-libxml.c:1505
+ msgid "The destination for writes"
+ msgstr "Cel zapisu"
+
+-#: ../gsf/gsf-msole-utils.c:315
++#: ../gsf/gsf-msole-utils.c:312
+ #, c-format
+ msgid ""
+ "Missing data when reading the %s property; got %s bytes, but %s bytes at "
+@@ -81,7 +81,7 @@ msgstr ""
+ "Brakujące dane podczas odczytywania własności %s. Otrzymano %s bajtów, ale "
+ "wymagane jest co najmniej %s bajtów."
+
+-#: ../gsf/gsf-msole-utils.c:366
++#: ../gsf/gsf-msole-utils.c:363
+ #, c-format
+ msgid ""
+ "Corrupt data in the VT_CF property; clipboard data length must be at least 4 "
+@@ -90,115 +90,115 @@ msgstr ""
+ "Uszkodzone dane we właściwości VT_CF. Długość danych schowka musi wynosić co "
+ "najmniej 4 bajty, ale dane mają dostępne tylko %s bajty."
+
+-#: ../gsf/gsf-open-pkg-utils.c:355
++#: ../gsf/gsf-open-pkg-utils.c:353
+ #, c-format
+ msgid "Unable to find part id='%s' for '%s'"
+ msgstr "Nie można odnaleźć części id=\"%s\" dla \"%s\""
+
+-#: ../gsf/gsf-open-pkg-utils.c:383
++#: ../gsf/gsf-open-pkg-utils.c:381
+ #, c-format
+ msgid "Unable to find part with type='%s' for '%s'"
+ msgstr "Nie można odnaleźć części z type=\"%s\" for \"%s\""
+
+-#: ../gsf/gsf-open-pkg-utils.c:413
++#: ../gsf/gsf-open-pkg-utils.c:411
+ #, c-format
+ msgid "Missing id for part in '%s'"
+ msgstr "Brakująca wartość id dla części w \"%s\""
+
+-#: ../gsf/gsf-open-pkg-utils.c:422
++#: ../gsf/gsf-open-pkg-utils.c:420
+ #, c-format
+ msgid "Part '%s' in '%s' from '%s' is corrupt!"
+ msgstr "Część \"%s\" w \"%s\" z \"%s\" jest uszkodzona."
+
+-#: ../gsf/gsf-opendoc-utils.c:353
++#: ../gsf/gsf-opendoc-utils.c:355
+ #, c-format
+ msgid "Property \"%s\" used for multiple types!"
+ msgstr "Własność \"%s\" jest używana dla wielu typów."
+
+-#: ../gsf/gsf-opendoc-utils.c:878
++#: ../gsf/gsf-opendoc-utils.c:880
+ msgid "ODF version"
+ msgstr "Wersja ODF"
+
+-#: ../gsf/gsf-opendoc-utils.c:879
++#: ../gsf/gsf-opendoc-utils.c:881
+ msgid "The ODF version this object is targeting as an integer like 100"
+ msgstr "Wersja ODF tego obiektu jako liczba całkowita, taka jak 100"
+
+-#: ../tools/gsf.c:27
++#: ../tools/gsf.c:15
+ msgid "Display program version"
+ msgstr "Wyświetla wersję programu"
+
+-#: ../tools/gsf.c:54
++#: ../tools/gsf.c:42
+ #, c-format
+ msgid "%s: Failed to open %s: %s\n"
+ msgstr "%s: otwarcie %s się nie powiodło: %s\n"
+
+-#: ../tools/gsf.c:75
++#: ../tools/gsf.c:63
+ #, c-format
+ msgid "%s: Failed to recognize %s as an archive\n"
+ msgstr "%s rozpoznanie %s jako archiwum się nie powiodło\n"
+
+-#: ../tools/gsf.c:112
++#: ../tools/gsf.c:100
+ #, c-format
+ msgid "Available subcommands are...\n"
+ msgstr "Dostępne podpolecenia to...\n"
+
+-#: ../tools/gsf.c:113
++#: ../tools/gsf.c:101
+ #, c-format
+ msgid "* cat output one or more files in archive\n"
+ msgstr "* cat wyświetla jeden lub więcej plików w archiwum\n"
+
+-#: ../tools/gsf.c:114
++#: ../tools/gsf.c:102
+ #, c-format
+ msgid "* dump dump one or more files in archive as hex\n"
+ msgstr ""
+ "* dump zrzuca jeden lub więcej plików w archiwum w postaci "
+ "szesnastkowej\n"
+
+-#: ../tools/gsf.c:115
++#: ../tools/gsf.c:103
+ #, c-format
+ msgid "* help list subcommands\n"
+ msgstr "* help wyświetla listę podpoleceń\n"
+
+-#: ../tools/gsf.c:116
++#: ../tools/gsf.c:104
+ #, c-format
+ msgid "* list list files in archive\n"
+ msgstr "* list wyświetla listę plików w archiwum\n"
+
+-#: ../tools/gsf.c:117
++#: ../tools/gsf.c:105
+ #, c-format
+ msgid "* listprops list document properties in archive\n"
+ msgstr "* listprops wyświetla listę właściwości dokumentu w archiwum\n"
+
+-#: ../tools/gsf.c:118
++#: ../tools/gsf.c:106
+ #, c-format
+ msgid "* props print specified document properties\n"
+ msgstr "* props wyświetla podane właściwości dokumentu\n"
+
+-#: ../tools/gsf.c:119
++#: ../tools/gsf.c:107
+ #, c-format
+ msgid "* createole create OLE archive\n"
+ msgstr "* createole tworzy archiwum OLE\n"
+
+-#: ../tools/gsf.c:120
++#: ../tools/gsf.c:108
+ #, c-format
+ msgid "* createzip create ZIP archive\n"
+ msgstr "* createzip tworzy archiwum ZIP\n"
+
+-#: ../tools/gsf.c:303
++#: ../tools/gsf.c:291
+ #, c-format
+ msgid "No property named %s\n"
+ msgstr "Brak właściwości o nazwie %s\n"
+
+-#: ../tools/gsf.c:362
++#: ../tools/gsf.c:350
+ #, c-format
+ msgid "%s: Error processing file %s: %s\n"
+ msgstr "%s: błąd podczas przetwarzania pliku %s: %s\n"
+
+-#: ../tools/gsf.c:526
++#: ../tools/gsf.c:514
+ msgid "SUBCOMMAND ARCHIVE..."
+ msgstr "PODPOLECENIE ARCHIWUM..."
+
+-#: ../tools/gsf.c:533
++#: ../tools/gsf.c:521
+ #, c-format
+ msgid ""
+ "%s\n"
+@@ -208,17 +208,17 @@ msgstr ""
+ "Wykonanie polecenia \"%s --help\" wyświetli listę wszystkich dostępnych "
+ "opcji wiersza poleceń.\n"
+
+-#: ../tools/gsf.c:540
++#: ../tools/gsf.c:528
+ #, c-format
+ msgid "gsf version %d.%d.%d\n"
+ msgstr "gsf wersja %d.%d.%d\n"
+
+-#: ../tools/gsf.c:546
++#: ../tools/gsf.c:534
+ #, c-format
+ msgid "Usage: %s %s\n"
+ msgstr "Użycie: %s %s\n"
+
+-#: ../tools/gsf.c:571
++#: ../tools/gsf.c:559
+ #, c-format
+-msgid "Run '%s help' to see a list subcommands.\n"
++msgid "Run '%s help' to see a list of subcommands.\n"
+ msgstr "Wykonanie polecenia \"%s help\" wyświetli listę podpoleceń.\n"
diff --git a/debian/patches/df7ab90 b/debian/patches/df7ab90
new file mode 100644
index 0000000..667e3ec
--- /dev/null
+++ b/debian/patches/df7ab90
@@ -0,0 +1,541 @@
+Backport of
+commit df7ab90d537c25507b0a7dba046380cbce31e451
+Author: Morten Welinder <terra gnome org>
+Date: Fri Mar 1 13:24:34 2013 -0500
+
+ Introspection fixes
+
+diff --git a/gsf/gsf-infile-msole.c b/gsf/gsf-infile-msole.c
+index 4990fcd..a6bb268 100644
+--- a/gsf/gsf-infile-msole.c
++++ b/gsf/gsf-infile-msole.c
+@@ -116,15 +116,15 @@ ole_seek_block (GsfInfileMSOle const *ole, guint32 block, gsf_off_t offset)
+ }
+
+ /**
+- * ole_get_block :
++ * ole_get_block: (skip)
+ * @ole: the infile
+ * @block: block number
+- * @buffer: optionally NULL
++ * @buffer: optionally %NULL
+ *
+ * Read a block of data from the underlying input.
+ * Be really anal.
+ *
+- * Returns: pointer to the buffer or NULL if there is an error or 0 bytes are
++ * Returns: pointer to the buffer or %NULL if there is an error or 0 bytes are
+ * requested.
+ **/
+ static guint8 const *
+diff --git a/gsf/gsf-infile-msvba.c b/gsf/gsf-infile-msvba.c
+index c187d59..3dc925b 100644
+--- a/gsf/gsf-infile-msvba.c
++++ b/gsf/gsf-infile-msvba.c
+@@ -143,7 +143,7 @@ vba_extract_module_source (GsfInfileMSVBA *vba, char const *name, guint32 src_of
+ /**
+ * vba_dir_read:
+ * @vba: #GsfInfileMSVBA
+- * @err: optionally NULL
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Read an VBA dirctory and its project file.
+ * along the way.
+@@ -334,7 +334,7 @@ fail_stream :
+ /**
+ * vba_project_read:
+ * @vba: #GsfInfileMSVBA
+- * @err: optionally NULL
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+ * Read an VBA dirctory and its project file.
+ * along the way.
+@@ -544,7 +544,7 @@ gsf_infile_msvba_steal_modules (GsfInfileMSVBA *vba_stream)
+ *
+ * A utility routine that attempts to find the VBA file withint a stream.
+ *
+- * Returns: (transfer full): a GsfInfileMSVBA *gsf_input_find_vba (GsfInput *input, GError *err);
++ * Returns: (transfer full): a GsfInfile
+ **/
+ GsfInfileMSVBA *
+ gsf_input_find_vba (GsfInput *input, GError **err)
+diff --git a/gsf/gsf-infile.c b/gsf/gsf-infile.c
+index 4e09f8f..1aea12b 100644
+--- a/gsf/gsf-infile.c
++++ b/gsf/gsf-infile.c
+@@ -62,7 +62,7 @@ gsf_infile_name_by_index (GsfInfile *infile, int i)
+ * @infile: #GsfInfile
+ * @i: target index
+ *
+- * TODO : For 2.0 api will change to include a GError.
++ * TODO : For 2.0 api will change to include a #GError.
+ * Returns: (transfer full): a newly created child which must be unrefed.
+ **/
+ GsfInput *
+@@ -95,7 +95,7 @@ gsf_infile_child_by_index (GsfInfile *infile, int i)
+ * works for an immediate child. If you need to go several levels
+ * down use gsf_infile_child_by_aname, for example.
+ *
+- * TODO : For 2.0 api will change to include a GError.
++ * TODO : For 2.0 api will change to include a #GError.
+ *
+ * Returns: (transfer full): a newly created child which must be
+ * unrefed.
+diff --git a/gsf/gsf-input-gio.c b/gsf/gsf-input-gio.c
+index 617ffd4..ed71fd4 100644
+--- a/gsf/gsf-input-gio.c
++++ b/gsf/gsf-input-gio.c
+@@ -114,9 +114,9 @@ make_local_copy (GFile *file, GInputStream *stream)
+ /**
+ * gsf_input_gio_new:
+ * @file:
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: A new #GsfInputGio or NULL
++ * Returns: A new #GsfInputGio or %NULL
+ */
+ GsfInput *
+ gsf_input_gio_new (GFile *file, GError **err)
+@@ -163,9 +163,9 @@ gsf_input_gio_new (GFile *file, GError **err)
+ /**
+ * gsf_input_gio_new_for_path:
+ * @path:
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: A new #GsfInputGio or NULL
++ * Returns: A new #GsfInputGio or %NULL
+ */
+ GsfInput *
+ gsf_input_gio_new_for_path (char const *path, GError **err)
+@@ -185,9 +185,9 @@ gsf_input_gio_new_for_path (char const *path, GError **err)
+ /**
+ * gsf_input_gio_new_for_uri:
+ * @uri:
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: A new #GsfInputGio or NULL
++ * Returns: A new #GsfInputGio or %NULL
+ */
+ GsfInput *
+ gsf_input_gio_new_for_uri (char const *uri, GError **err)
+diff --git a/gsf/gsf-input-iochannel.c b/gsf/gsf-input-iochannel.c
+index b12be30..778c946 100644
+--- a/gsf/gsf-input-iochannel.c
++++ b/gsf/gsf-input-iochannel.c
+@@ -29,7 +29,7 @@
+ * @channel: a #GIOChannel.
+ * @error: a #GError
+ *
+- * Returns: a new #GsfInputMemory or NULL.
++ * Returns: a new #GsfInputMemory or %NULL.
+ **/
+ GsfInput *
+ gsf_input_memory_new_from_iochannel (GIOChannel *channel,
+diff --git a/gsf/gsf-input-stdio.c b/gsf/gsf-input-stdio.c
+index 5c9ed13..6b534a5 100644
+--- a/gsf/gsf-input-stdio.c
++++ b/gsf/gsf-input-stdio.c
+@@ -103,9 +103,9 @@ error:
+ /**
+ * gsf_input_stdio_new:
+ * @filename: in utf8.
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: a new file or NULL.
++ * Returns: a new file or %NULL.
+ **/
+ /* coverity[ -tainted_string_sink_content : arg-0 ] */
+ GsfInput *
+diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c
+index f02782f..c95896e 100644
+--- a/gsf/gsf-input.c
++++ b/gsf/gsf-input.c
+@@ -531,7 +531,7 @@ gsf_input_seek_emulate (GsfInput *input, gsf_off_t pos)
+ /**
+ * gsf_input_error_id:
+ *
+- * Returns: A utility quark to flag a GError as being an input problem.
++ * Returns: A utility quark to flag a #GError as being an input problem.
+ */
+ GQuark
+ gsf_input_error_id (void)
+@@ -547,7 +547,7 @@ gsf_input_error_id (void)
+ *
+ * Deprecated as of GSF 1.12.0; use gsf_input_error_id() instead.
+ *
+- * Returns: A utility quark to flag a GError as being an input problem.
++ * Returns: A utility quark to flag a #GError as being an input problem.
+ */
+ GQuark
+ gsf_input_error (void)
+diff --git a/gsf/gsf-libxml.c b/gsf/gsf-libxml.c
+index 73b82b6..b428c1c 100644
+--- a/gsf/gsf-libxml.c
++++ b/gsf/gsf-libxml.c
+@@ -358,9 +358,9 @@ gsf_xml_parser_context (GsfInput *input)
+ }
+
+ /**
+- * gsf_xml_output_buffer_new:
++ * gsf_xml_output_buffer_new: (skip)
+ * @output: #GsfOutput
+- * @encoding: optionally %NULL.
++ * @handler (allow-none):
+ *
+ * <note>This adds a reference to @output.</note>
+ * <note>This is <emphasis>not</emphasis> releated to #GsfXMLOut.</note>
+@@ -384,7 +384,7 @@ gsf_xml_output_buffer_new (GsfOutput *output,
+ * gsf_xmlDocFormatDump:
+ * @output: #GsfOutput
+ * @cur: #xmlDocPtr
+- * @encoding: The encoding to use.
++ * @encoding: (allow-none): The encoding to use.
+ * @format: %TRUE to reformat the output.
+ *
+ * Dumps the document @cur into @output.
+@@ -1714,13 +1714,13 @@ close_tag_if_neccessary (GsfXMLOut* xout)
+ /**
+ * gsf_xml_out_add_cstr_unchecked:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
+- * @val_utf8: a utf8 encoded string to export
++ * @id: (allow-none): tag id or %NULL for content
++ * @val_utf8: (allow-none): a utf8 encoded string to export
+ *
+- * dump @val_utf8 to an attribute named @id without checking to see if the
+- * content needs escaping. A useful performance enhancement when the
+- * application knows that structure of the content well. If @val_utf8 is NULL
+- * do nothing (no warning, no output)
++ * dump @val_utf8 to an attribute named @id without checking to see if
++ * the content needs escaping. A useful performance enhancement when
++ * the application knows that structure of the content well. If
++ * @val_utf8 is %NULL do nothing (no warning, no output)
+ **/
+ void
+ gsf_xml_out_add_cstr_unchecked (GsfXMLOut *xout, char const *id,
+@@ -1741,11 +1741,11 @@ gsf_xml_out_add_cstr_unchecked (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_cstr:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
+- * @val_utf8: a utf8 encoded string
++ * @id: (allow-none): tag id or %NULL for content
++ * @val_utf8: (allow-none): a utf8 encoded string
+ *
+ * dump @val_utf8 to an attribute named @id or as the nodes content escaping
+- * characters as necessary. If @val_utf8 is NULL do nothing (no warning, no
++ * characters as necessary. If @val_utf8 is %NULL do nothing (no warning, no
+ * output)
+ **/
+ void
+@@ -1820,7 +1820,7 @@ gsf_xml_out_add_cstr (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_bool:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @val: a boolean
+ *
+ * dump boolean value @val to an attribute named @id or as the nodes content
+@@ -1837,7 +1837,7 @@ gsf_xml_out_add_bool (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_int:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @val: the value
+ *
+ * dump integer value @val to an attribute named @id or as the nodes content
+@@ -1854,7 +1854,7 @@ gsf_xml_out_add_int (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_uint:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @val: the value
+ *
+ * dump unsigned integer value @val to an attribute named @id or as the nodes
+@@ -1872,7 +1872,7 @@ gsf_xml_out_add_uint (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_float:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @val: the value
+ * @precision: the number of significant digits to use, -1 meaning "enough".
+ *
+@@ -1898,7 +1898,7 @@ gsf_xml_out_add_float (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_color:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @r: Red value
+ * @g: Green value
+ * @b: Blue value
+@@ -1917,7 +1917,7 @@ gsf_xml_out_add_color (GsfXMLOut *xout, char const *id,
+ /**
+ * gsf_xml_out_add_enum:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @etype: #GType
+ * @val: enum element number
+ *
+@@ -1940,7 +1940,7 @@ gsf_xml_out_add_enum (GsfXMLOut *xout, char const *id, GType etype, gint val)
+ /**
+ * gsf_xml_out_add_gvalue:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @val: #GValue
+ *
+ * Output the value of @val as a string. Does NOT store any type information
+@@ -2021,11 +2021,11 @@ gsf_xml_out_add_gvalue (GsfXMLOut *xout, char const *id, GValue const *val)
+ /**
+ * gsf_xml_out_add_base64:
+ * @xout: #GsfXMLOut
+- * @id: optionally NULL for content
++ * @id: (allow-none): tag id or %NULL for content
+ * @data: Data to be written
+ * @len: Length of data
+ *
+- * dump @len bytes in @data into the content of node @id using base64
++ * Dump @len bytes in @data into the content of node @id using base64
+ **/
+ void
+ gsf_xml_out_add_base64 (GsfXMLOut *xout, char const *id,
+diff --git a/gsf/gsf-msole-utils.c b/gsf/gsf-msole-utils.c
+index 2090ade..ec72ba2 100644
+--- a/gsf/gsf-msole-utils.c
++++ b/gsf/gsf-msole-utils.c
+@@ -1103,7 +1103,7 @@ msole_prop_cmp (gconstpointer a, gconstpointer b)
+ *
+ * Since: 1.14.24
+ *
+- * Returns: GError which the caller must free on error.
++ * Returns: (transfer full): A #GError if there was an error.
+ **/
+ GError *
+ gsf_doc_meta_data_read_from_msole (GsfDocMetaData *accum, GsfInput *in)
+@@ -1319,7 +1319,7 @@ gsf_doc_meta_data_read_from_msole (GsfDocMetaData *accum, GsfInput *in)
+ *
+ * Deprecated: 1.14.24, use gsf_doc_meta_data_read_from_msole
+ *
+- * Returns: GError which the caller must free on error.
++ * Returns: (transfer full): A #GError if there was an error.
+ **/
+ GError *
+ gsf_msole_metadata_read (GsfInput *in, GsfDocMetaData *accum)
+diff --git a/gsf/gsf-open-pkg-utils.c b/gsf/gsf-open-pkg-utils.c
+index cad01e0..91b5083 100644
+--- a/gsf/gsf-open-pkg-utils.c
++++ b/gsf/gsf-open-pkg-utils.c
+@@ -392,7 +392,7 @@ gsf_open_pkg_open_rel_by_type (GsfInput *opkg, char const *type, GError **err)
+ *
+ * Convenience function to parse a related part.
+ *
+- * Returns: NULL on success or a GError which callerss need to free on failure.
++ * Returns: (transfer full): %NULL on success or a #GError on failure.
+ **/
+ GError *
+ gsf_open_pkg_parse_rel_by_id (GsfXMLIn *xin, char const *id,
+diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c
+index 0deac72..8555ddd 100644
+--- a/gsf/gsf-opendoc-utils.c
++++ b/gsf/gsf-opendoc-utils.c
+@@ -499,9 +499,9 @@ static GsfXMLInNode const gsf_opendoc_meta_dtd[] = {
+ *
+ * Since: 1.14.24
+ *
+- * Returns: a GError if there is a problem.
++ * Returns: (transfer full): a #GError if there is a problem.
+ **/
+-GError *
++GError*
+ gsf_doc_meta_data_read_from_odf (GsfDocMetaData *md, GsfInput *input)
+ {
+ GsfXMLInDoc *doc;
+@@ -538,7 +538,7 @@ gsf_doc_meta_data_read_from_odf (GsfDocMetaData *md, GsfInput *input)
+ *
+ * Deprecated: 1.14.24, use gsf_doc_meta_data_read_from_odf
+ *
+- * Returns: a GError if there is a problem.
++ * Returns: (transfer full): a #GError if there is a problem.
+ **/
+ GError *
+ gsf_opendoc_metadata_read (GsfInput *input, GsfDocMetaData *md)
+@@ -746,7 +746,7 @@ meta_write_props (char const *prop_name, GsfDocProp *prop, GsfXMLOut *output)
+ *
+ * Since: 1.14.24
+ *
+- * Returns: TRUE if no error occured.
++ * Returns: %TRUE if no error occured.
+ **/
+ gboolean
+ gsf_doc_meta_data_write_to_odf (GsfDocMetaData const *md, gpointer output)
+@@ -797,7 +797,7 @@ gsf_doc_meta_data_write_to_odf (GsfDocMetaData const *md, gpointer output)
+ *
+ * Deprecated: 1.14.24, use gsf_doc_meta_data_write_to_odf
+ *
+- * Returns: TRUE if no error occured.
++ * Returns: %TRUE if no error occured.
+ **/
+ gboolean
+ gsf_opendoc_metadata_write (gpointer output, GsfDocMetaData const *md)
+diff --git a/gsf/gsf-outfile-msole.c b/gsf/gsf-outfile-msole.c
+index 87ed2e1..38b4b47 100644
+--- a/gsf/gsf-outfile-msole.c
++++ b/gsf/gsf-outfile-msole.c
+@@ -806,7 +806,7 @@ gsf_outfile_msole_new (GsfOutput *sink)
+ *
+ * Write @clsid to the directory associated with @ole.
+ *
+- * Returns: TRUE on success.
++ * Returns: %TRUE on success.
+ **/
+ gboolean
+ gsf_outfile_msole_set_class_id (GsfOutfileMSOle *ole, guint8 const *clsid)
+diff --git a/gsf/gsf-outfile-stdio.c b/gsf/gsf-outfile-stdio.c
+index e813205..834fb98 100644
+--- a/gsf/gsf-outfile-stdio.c
++++ b/gsf/gsf-outfile-stdio.c
+@@ -104,11 +104,11 @@ GSF_CLASS (GsfOutfileStdio, gsf_outfile_stdio,
+ /**
+ * gsf_outfile_stdio_new_valist:
+ * @root: root directory in utf8.
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ * @first_property_name: name of first property to set
+ * @var_args: a %NULL-terminated #va_list
+ *
+- * Returns: a new outfile or NULL.
++ * Returns (transfer full): a new outfile or %NULL.
+ **/
+ GsfOutfile *
+ gsf_outfile_stdio_new_valist (char const *root, GError **err,
+@@ -140,12 +140,12 @@ gsf_outfile_stdio_new_valist (char const *root, GError **err,
+ /**
+ * gsf_outfile_stdio_new_full:
+ * @root: root directory in utf8.
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ * @first_property_name: name of first property to set
+ * @...: value of first property, followed by more properties,
+ * %NULL-terminated
+ *
+- * Returns: a new outfile or NULL.
++ * Returns (transfer full): a new outfile or %NULL.
+ **/
+ GsfOutfile *
+ gsf_outfile_stdio_new_full (char const *root, GError **err,
+@@ -165,9 +165,9 @@ gsf_outfile_stdio_new_full (char const *root, GError **err,
+ /**
+ * gsf_outfile_stdio_new:
+ * @root: root directory in utf8.
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: a new outfile or NULL.
++ * Returns: a new outfile or %NULL.
+ **/
+ GsfOutfile *
+ gsf_outfile_stdio_new (char const *root, GError **err)
+diff --git a/gsf/gsf-outfile.c b/gsf/gsf-outfile.c
+index bff47ef..08ed232 100644
+--- a/gsf/gsf-outfile.c
++++ b/gsf/gsf-outfile.c
+@@ -44,7 +44,7 @@ gsf_outfile_new_child (GsfOutfile *outfile,
+ * gsf_outfile_new_child_full:
+ * @outfile: A #GsfOutfile
+ * @name: The name of the new child to create
+- * @is_dir: TRUE to create a directory, FALSE to create a plain file
++ * @is_dir: %TRUE to create a directory, %FALSE to create a plain file
+ * @first_property_name:
+ * @...:
+ *
+@@ -73,7 +73,7 @@ gsf_outfile_new_child_full (GsfOutfile *outfile,
+ * gsf_outfile_new_child_varg:
+ * @outfile: A #GsfOutfile
+ * @name: The name of the new child to create
+- * @is_dir: TRUE to create a directory, FALSE to create a plain file
++ * @is_dir: %TRUE to create a directory, %FALSE to create a plain file
+ * @first_property_name:
+ * @args:
+ *
+diff --git a/gsf/gsf-output-gio.c b/gsf/gsf-output-gio.c
+index 1d54ea2..ff5ce36 100644
+--- a/gsf/gsf-output-gio.c
++++ b/gsf/gsf-output-gio.c
+@@ -59,7 +59,7 @@ wrap_if_not_seekable (GsfOutputGio *output, GError **err)
+ * gsf_output_gio_new_full:
+ * @file: an existing GFile
+ *
+- * Returns: A new #GsfOutputGio or NULL
++ * Returns: (transfer full): A new #GsfOutputGio or %NULL
+ */
+ static GsfOutput *
+ gsf_output_gio_new_full (GFile *file, GError **err)
+@@ -86,7 +86,7 @@ gsf_output_gio_new_full (GFile *file, GError **err)
+ * gsf_output_gio_new:
+ * @file: an existing GFile
+ *
+- * Returns: A new #GsfOutputGio or NULL
++ * Returns: (transfer full): A new #GsfOutputGio or %NULL
+ */
+ GsfOutput *
+ gsf_output_gio_new (GFile *file)
+@@ -97,9 +97,9 @@ gsf_output_gio_new (GFile *file)
+ /**
+ * gsf_output_gio_new_for_path:
+ * @path:
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: A new #GsfOutputGio or NULL
++ * Returns: (transfer full): A new #GsfOutputGio or %NULL
+ */
+ GsfOutput *
+ gsf_output_gio_new_for_path (char const *path, GError **err)
+@@ -125,9 +125,9 @@ gsf_output_gio_new_for_path (char const *path, GError **err)
+ /**
+ * gsf_output_gio_new_for_uri:
+ * @uri:
+- * @err: optionally NULL.
++ * @err: (allow-none): place to store a #GError if anything goes wrong
+ *
+- * Returns: A new #GsfOutputGio or NULL
++ * Returns: (transfer full): A new #GsfOutputGio or %NULL
+ */
+ GsfOutput *
+ gsf_output_gio_new_for_uri (char const *uri, GError **err)
+diff --git a/gsf/gsf-output-iochannel.c b/gsf/gsf-output-iochannel.c
+index 3df476c..1521784 100644
+--- a/gsf/gsf-output-iochannel.c
++++ b/gsf/gsf-output-iochannel.c
+@@ -37,7 +37,7 @@ typedef struct {
+ * gsf_output_iochannel_new:
+ * @channel: A #GIOChannel
+ *
+- * Returns: a new file or NULL.
++ * Returns: (transfer full): a new file or %NULL.
+ **/
+ GsfOutput *
+ gsf_output_iochannel_new (GIOChannel *channel)
+diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
+index da744fa..6f721c8 100644
+--- a/gsf/gsf-utils.c
++++ b/gsf/gsf-utils.c
+@@ -720,7 +720,7 @@ gsf_base64_decode_simple (guint8 *data, size_t len)
+ * @p_params: a pointer to the GParameter array that holds the properties.
+ * (Used for both input and output. This may point to a %NULL pointer if
+ * there are no properties collected yet.)
+- * @first_property_name: the name of the first property being set, or NULL.
++ * @first_property_name: the name of the first property being set, or %NULL.
+ * @var_args: a va_list holding the remainder of the property names and
+ * values, terminated by a %NULL.
+ *
diff --git a/debian/patches/f7d0442 b/debian/patches/f7d0442
new file mode 100644
index 0000000..c83c8a5
--- /dev/null
+++ b/debian/patches/f7d0442
@@ -0,0 +1,18 @@
+commit f7d0442bc062a29e456e0d46038ced59855121dc
+Author: Morten Welinder <terra gnome org>
+Date: Fri Mar 1 10:35:26 2013 -0500
+
+ gsf: fix grammar in help text.
+
+diff --git a/tools/gsf.c b/tools/gsf.c
+index f8a1ce9..304cbd6 100644
+--- a/tools/gsf.c
++++ b/tools/gsf.c
+@@ -556,6 +556,6 @@ main (int argc, char **argv)
+ if (strcmp (cmd, "createzip") == 0)
+ return gsf_create (argc - 2, argv + 2, GSF_OUTFILE_TYPE_ZIP);
+
+- g_printerr (_("Run '%s help' to see a list subcommands.\n"), me);
++ g_printerr (_("Run '%s help' to see a list of subcommands.\n"), me);
+ return 1;
+ }
diff --git a/debian/patches/refresh-config-sub-guess-1.14.26-1
b/debian/patches/refresh-config-sub-guess-1.14.26-1
new file mode 100644
index 0000000..0c01329
--- /dev/null
+++ b/debian/patches/refresh-config-sub-guess-1.14.26-1
@@ -0,0 +1,2123 @@
+diff -ru libgsf-1.14.26.old/config.guess libgsf-1.14.26/config.guess
+--- libgsf-1.14.26.old/config.guess 2012-11-14 02:47:40.000000000 +0100
++++ libgsf-1.14.26/config.guess 2013-03-03 15:18:34.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-# Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2012-02-10'
+
+ # 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
+@@ -17,9 +17,7 @@
+ # 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., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -56,8 +54,9 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -139,22 +138,12 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-case "${UNAME_MACHINE}" in
+- i?86)
+- test -z "$VENDOR" && VENDOR=pc
+- ;;
+- *)
+- test -z "$VENDOR" && VENDOR=unknown
+- ;;
+-esac
+-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+@@ -190,7 +179,7 @@
+ fi
+ ;;
+ *)
+- os=netbsd
++ os=netbsd
+ ;;
+ esac
+ # The OS release
+@@ -213,19 +202,19 @@
+ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+- echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
++ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+@@ -233,7 +222,7 @@
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -279,7 +268,10 @@
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr
'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit ;;
++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++ exitcode=$?
++ trap '' 0
++ exit $exitcode ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+@@ -290,13 +282,13 @@
+ echo alpha-dec-winnt3.5
+ exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+- echo m68k-${VENDOR}-sysv4
++ echo m68k-unknown-sysv4
+ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-amigaos
++ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-morphos
++ echo ${UNAME_MACHINE}-unknown-morphos
+ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+@@ -305,13 +297,13 @@
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+- echo powerpc-ibm-os400
++ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+- echo arm-${VENDOR}-riscos
++ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+@@ -404,23 +396,23 @@
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit ;;
++ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+- echo m68k-milan-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-milan-mint${UNAME_RELEASE}
++ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+- echo m68k-hades-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-hades-mint${UNAME_RELEASE}
++ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+- echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-unknown-mint${UNAME_RELEASE}
++ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
+@@ -490,8 +482,8 @@
+ echo m88k-motorola-sysv3
+ exit ;;
+ AViiON:dgux:*:*)
+- # DG/UX returns AViiON for all architectures
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ # DG/UX returns AViiON for all architectures
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -504,7 +496,7 @@
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit ;;
+@@ -561,7 +553,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -604,52 +596,52 @@
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+- case "${sc_cpu_version}" in
+- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+- 532) # CPU_PA_RISC2_0
+- case "${sc_kernel_bits}" in
+- 32) HP_ARCH="hppa2.0n" ;;
+- 64) HP_ARCH="hppa2.0w" ;;
++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ case "${sc_cpu_version}" in
++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++ 532) # CPU_PA_RISC2_0
++ case "${sc_kernel_bits}" in
++ 32) HP_ARCH="hppa2.0n" ;;
++ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+- esac ;;
+- esac
++ esac ;;
++ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ sed 's/^ //' << EOF >$dummy.c
++
++ #define _HPUX_SOURCE
++ #include <stdlib.h>
++ #include <unistd.h>
+
+- #define _HPUX_SOURCE
+- #include <stdlib.h>
+- #include <unistd.h>
+-
+- int main ()
+- {
+- #if defined(_SC_KERNEL_BITS)
+- long bits = sysconf(_SC_KERNEL_BITS);
+- #endif
+- long cpu = sysconf (_SC_CPU_VERSION);
+-
+- switch (cpu)
+- {
+- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+- case CPU_PA_RISC2_0:
+- #if defined(_SC_KERNEL_BITS)
+- switch (bits)
+- {
+- case 64: puts ("hppa2.0w"); break;
+- case 32: puts ("hppa2.0n"); break;
+- default: puts ("hppa2.0"); break;
+- } break;
+- #else /* !defined(_SC_KERNEL_BITS) */
+- puts ("hppa2.0"); break;
+- #endif
+- default: puts ("hppa1.0"); break;
+- }
+- exit (0);
+- }
++ int main ()
++ {
++ #if defined(_SC_KERNEL_BITS)
++ long bits = sysconf(_SC_KERNEL_BITS);
++ #endif
++ long cpu = sysconf (_SC_CPU_VERSION);
++
++ switch (cpu)
++ {
++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++ case CPU_PA_RISC2_0:
++ #if defined(_SC_KERNEL_BITS)
++ switch (bits)
++ {
++ case 64: puts ("hppa2.0w"); break;
++ case 32: puts ("hppa2.0n"); break;
++ default: puts ("hppa2.0"); break;
++ } break;
++ #else /* !defined(_SC_KERNEL_BITS) */
++ puts ("hppa2.0"); break;
++ #endif
++ default: puts ("hppa1.0"); break;
++ }
++ exit (0);
++ }
+ EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -730,9 +722,9 @@
+ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+- echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
++ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+- echo ${UNAME_MACHINE}-${VENDOR}-osf1
++ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit ;;
+ parisc*:Lites*:*:*)
+@@ -740,22 +732,22 @@
+ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+- exit ;;
++ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit ;;
++ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+- exit ;;
++ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+- exit ;;
++ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+- exit ;;
++ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+@@ -779,32 +771,31 @@
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e
's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit ;;
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e
's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e
's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' |
sed -e 's/ /_/'`
+- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e
's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' |
sed -e 's/ /_/'`
++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit ;;
+ sparc*:BSD/OS:*:*)
+- echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
++ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:BSD/OS:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- case ${UNAME_MACHINE} in
+- pc98)
+- echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
++ case ${UNAME_PROCESSOR} in
+ amd64)
+- echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+@@ -813,23 +804,26 @@
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ i*:windows32*:*)
+- # uname -m includes "-pc" on this system.
+- echo ${UNAME_MACHINE}-mingw32
++ # uname -m includes "-pc" on this system.
++ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+ *:Interix*:*)
+- case ${UNAME_MACHINE} in
++ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ authenticamd | genuineintel | EM64T)
+- echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
++ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+- echo ia64-${VENDOR}-interix${UNAME_RELEASE}
++ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+@@ -848,25 +842,32 @@
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+- echo x86_64-${VENDOR}-cygwin
++ echo x86_64-unknown-cygwin
+ exit ;;
+ p*:CYGWIN*:*)
+- echo powerpcle-${VENDOR}-cygwin
++ echo powerpcle-unknown-cygwin
+ exit ;;
+ prep*:SunOS:5.*:*)
+- echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e
's,/.*$,,'`
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo
${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ aarch64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ aarch64_be:Linux:*:*)
++ UNAME_MACHINE=aarch64_be
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+@@ -876,32 +877,41 @@
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
++ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ hexagon:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+@@ -912,16 +922,16 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -940,51 +950,54 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+- echo sparc-${VENDOR}-linux-gnu
++ echo sparc-unknown-linux-gnu
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-${VENDOR}-linux-gnu
++ echo hppa64-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
+- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+- *) echo hppa-${VENDOR}-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-gnu ;;
++ PA8*) echo hppa2.0-unknown-linux-gnu ;;
++ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-${VENDOR}-linux-gnu
++ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-${VENDOR}-linux-gnu
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ tile*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -993,11 +1006,11 @@
+ echo i386-sequent-sysv4
+ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+- # Unixware is an offshoot of SVR4, but it has its own version
+- # number series starting with 2...
+- # I am not positive that other SVR4 systems won't match this,
++ # Unixware is an offshoot of SVR4, but it has its own version
++ # number series starting with 2...
++ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+- # Use sysv4.2uw... so that sysv4* matches it.
++ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit ;;
+ i*86:OS/2:*:*)
+@@ -1006,16 +1019,16 @@
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+- echo ${UNAME_MACHINE}-${VENDOR}-stop
++ echo ${UNAME_MACHINE}-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-atheos
++ echo ${UNAME_MACHINE}-unknown-atheos
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+- echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+@@ -1029,13 +1042,13 @@
+ fi
+ exit ;;
+ i*86:*:5:[678]*)
+- # UnixWare 7.x, OpenUNIX and OpenServer 6.
++ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+@@ -1057,13 +1070,13 @@
+ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+- # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i586.
++ # uname -m prints for DJGPP always 'pc', but it prints nothing about
++ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+- exit ;;
++ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit ;;
+@@ -1074,7 +1087,7 @@
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+- echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit ;;
+ mini*:CTIX:SYS*5:*)
+@@ -1098,8 +1111,8 @@
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4; exit; } ;;
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+@@ -1111,19 +1124,19 @@
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ rs6000:LynxOS:2.*:*)
+- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+@@ -1142,10 +1155,10 @@
+ echo ns32k-sni-sysv
+ fi
+ exit ;;
+- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+- # says <Richard M Bartel ccMail Census GOV>
+- echo i586-unisys-sysv4
+- exit ;;
++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++ # says <Richard M Bartel ccMail Census GOV>
++ echo i586-unisys-sysv4
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes openmarket com>.
+ # How about differentiating between stratus architectures? -djm
+@@ -1171,11 +1184,11 @@
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+- echo mips-nec-sysv${UNAME_RELEASE}
++ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit ;;
+@@ -1240,6 +1253,9 @@
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit ;;
++ NEO-?:NONSTOP_KERNEL:*:*)
++ echo neo-tandem-nsk${UNAME_RELEASE}
++ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+@@ -1264,13 +1280,13 @@
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+- echo ${UNAME_MACHINE}-${VENDOR}-plan9
++ echo ${UNAME_MACHINE}-unknown-plan9
+ exit ;;
+ *:TOPS-10:*:*)
+- echo pdp10-${VENDOR}-tops10
++ echo pdp10-unknown-tops10
+ exit ;;
+ *:TENEX:*:*)
+- echo pdp10-${VENDOR}-tenex
++ echo pdp10-unknown-tenex
+ exit ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+@@ -1279,19 +1295,19 @@
+ echo pdp10-xkl-tops20
+ exit ;;
+ *:TOPS-20:*:*)
+- echo pdp10-${VENDOR}-tops20
++ echo pdp10-unknown-tops20
+ exit ;;
+ *:ITS:*:*)
+- echo pdp10-${VENDOR}-its
++ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+- echo mips-sei-seiux${UNAME_RELEASE}
++ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+@@ -1309,6 +1325,9 @@
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
++ x86_64:VMkernel:*:*)
++ echo ${UNAME_MACHINE}-unknown-esx
++ exit ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1331,11 +1350,11 @@
+ #include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+- "4"
++ "4"
+ #else
+- ""
++ ""
+ #endif
+- ); exit (0);
++ ); exit (0);
+ #endif
+ #endif
+
+diff -ru libgsf-1.14.26.old/config.sub libgsf-1.14.26/config.sub
+--- libgsf-1.14.26.old/config.sub 2012-11-14 02:47:40.000000000 +0100
++++ libgsf-1.14.26/config.sub 2013-03-03 15:18:34.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-# Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2012-04-18'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,9 +21,7 @@
+ # 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., 51 Franklin Street - Fifth Floor, Boston, MA
+-# 02110-1301, USA.
++# along with this program; if not, see <http://www.gnu.org/licenses/>.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -75,8 +73,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -123,13 +122,18 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
++ android-linux)
++ os=-linux-android
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
++ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+@@ -156,8 +160,8 @@
+ os=
+ basic_machine=$1
+ ;;
+- -bluegene*)
+- os=-cnk
++ -bluegene*)
++ os=-cnk
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+@@ -173,10 +177,10 @@
+ os=-chorusos
+ basic_machine=$1
+ ;;
+- -chorusrdb)
+- os=-chorusrdb
++ -chorusrdb)
++ os=-chorusrdb
+ basic_machine=$1
+- ;;
++ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+@@ -221,6 +225,12 @@
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
++ -lynx*178)
++ os=-lynxos178
++ ;;
++ -lynx*5)
++ os=-lynxos5
++ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+@@ -245,17 +255,22 @@
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
++ | aarch64 | aarch64_be \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
++ | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -281,29 +296,39 @@
+ | moxie \
+ | mt \
+ | msp430 \
++ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
+ | ns16k | ns32k \
++ | open8 \
+ | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++ | powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pyramid \
+- | rx \
++ | rl78 | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele
\
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+- | spu | strongarm \
+- | tahoe | thumb | tic4x | tic80 | tron \
++ | spu \
++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
+- | v850 | v850e \
++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | we32k \
+- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++ | x86 | xc16x | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+- # Motorola 68HC11/12.
++ c54x)
++ basic_machine=tic54x-unknown
++ ;;
++ c55x)
++ basic_machine=tic55x-unknown
++ ;;
++ c6x)
++ basic_machine=tic6x-unknown
++ ;;
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+@@ -313,6 +338,21 @@
+ basic_machine=mt-unknown
+ ;;
+
++ strongarm | thumb | xscale)
++ basic_machine=arm-unknown
++ ;;
++ xgate)
++ basic_machine=$basic_machine-unknown
++ os=-none
++ ;;
++ xscaleeb)
++ basic_machine=armeb-unknown
++ ;;
++
++ xscaleel)
++ basic_machine=armel-unknown
++ ;;
++
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+@@ -327,21 +367,25 @@
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
++ | aarch64-* | aarch64_be-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
++ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | le32-* | le64-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+@@ -367,25 +411,29 @@
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
++ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
++ | open8-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pyramid-* \
+- | romp-* | rs6000-* | rx-* \
++ | rl78-* | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+- | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++ | tahoe-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile*-* \
+ | tron-* \
+ | ubicom32-* \
+- | v850-* | v850e-* | vax-* \
++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++ | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-* | z80-*)
+@@ -410,7 +458,7 @@
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+- abacus)
++ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+@@ -480,11 +528,20 @@
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
++ c54x-*)
++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c55x-*)
++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c6x-*)
++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+- cegcc)
++ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
+@@ -516,7 +573,7 @@
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16)
++ cr16 | cr16-*)
+ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+@@ -674,7 +731,6 @@
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+@@ -732,7 +788,7 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+- microblaze)
++ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
+ mingw32)
+@@ -771,10 +827,18 @@
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
++ msys)
++ basic_machine=i386-pc
++ os=-msys
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=-nacl
++ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -839,6 +903,12 @@
+ np1)
+ basic_machine=np1-gould
+ ;;
++ neo-tandem)
++ basic_machine=neo-tandem
++ ;;
++ nse-tandem)
++ basic_machine=nse-tandem
++ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+@@ -921,9 +991,10 @@
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+- ppc) basic_machine=powerpc-unknown
++ ppc | ppcbe) basic_machine=powerpc-unknown
+ ;;
+- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ppc-* | ppcbe-*)
++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+@@ -1017,6 +1088,9 @@
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
++ strongarm-* | thumb-*)
++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+@@ -1073,20 +1147,8 @@
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+- tic54x | c54x*)
+- basic_machine=tic54x-unknown
+- os=-coff
+- ;;
+- tic55x | c55x*)
+- basic_machine=tic55x-unknown
+- os=-coff
+- ;;
+- tic6x | c6x*)
+- basic_machine=tic6x-unknown
+- os=-coff
+- ;;
+ tile*)
+- basic_machine=tile-unknown
++ basic_machine=$basic_machine-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1156,6 +1218,9 @@
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
++ xscale-* | xscalee[bl]-*)
++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+@@ -1253,11 +1318,11 @@
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+- # First match some system type aliases
+- # that might get confused with valid system types.
++ # First match some system type aliases
++ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+- -auroraux)
+- os=-auroraux
++ -auroraux)
++ os=-auroraux
+ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+@@ -1293,8 +1358,9 @@
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -mingw32* | -linux-gnu* | -linux-android* \
++ | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+@@ -1341,7 +1407,7 @@
+ -opened*)
+ os=-openedition
+ ;;
+- -os400*)
++ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+@@ -1390,7 +1456,7 @@
+ -sinix*)
+ os=-sysv4
+ ;;
+- -tpf*)
++ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+@@ -1435,6 +1501,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1457,10 +1525,10 @@
+ # system, and we'll never get to this point.
+
+ case $basic_machine in
+- score-*)
++ score-*)
+ os=-elf
+ ;;
+- spu-*)
++ spu-*)
+ os=-elf
+ ;;
+ *-acorn)
+@@ -1472,8 +1540,20 @@
+ arm*-semi)
+ os=-aout
+ ;;
+- c4x-* | tic4x-*)
+- os=-coff
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
++ hexagon-*)
++ os=-elf
++ ;;
++ tic54x-*)
++ os=-coff
++ ;;
++ tic55x-*)
++ os=-coff
++ ;;
++ tic6x-*)
++ os=-coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+@@ -1493,14 +1573,11 @@
+ ;;
+ m68000-sun)
+ os=-sunos3
+- # This also exists in the configure program, but was not the
+- # default.
+- # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+- mep-*)
++ mep-*)
+ os=-elf
+ ;;
+ mips*-cisco)
+@@ -1527,7 +1604,7 @@
+ *-ibm)
+ os=-aix
+ ;;
+- *-knuth)
++ *-knuth)
+ os=-mmixware
+ ;;
+ *-wec)
+diff -ru libgsf-1.14.26.old/configure libgsf-1.14.26/configure
+--- libgsf-1.14.26.old/configure 2013-02-27 23:41:14.000000000 +0100
++++ libgsf-1.14.26/configure 2013-03-03 15:18:32.000000000 +0100
+@@ -5026,7 +5026,8 @@
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len"; then
++ if test -n "$lt_cv_sys_max_cmd_len" && \
++ test undefined != "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+@@ -5424,10 +5425,6 @@
+ fi
+ ;;
+
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -5466,7 +5463,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -6561,7 +6558,14 @@
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+- LD="${LD-ld} -m elf_i386"
++ case `/usr/bin/file conftest.o` in
++ *x86-64*)
++ LD="${LD-ld} -m elf32_x86_64"
++ ;;
++ *)
++ LD="${LD-ld} -m elf_i386"
++ ;;
++ esac
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+@@ -8688,7 +8692,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -10858,17 +10862,6 @@
+ esac
+ ;;
+
+-gnu*)
+- version_type=linux # correct to gnu/linux during the next big refactor
+- 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
+- ;;
+-
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+@@ -10985,7 +10978,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+diff -ru libgsf-1.14.26.old/depcomp libgsf-1.14.26/depcomp
+--- libgsf-1.14.26.old/depcomp 2012-11-14 02:47:42.000000000 +0100
++++ libgsf-1.14.26/depcomp 2013-03-03 15:18:35.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2012-03-27.16; # UTC
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+-# Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
+
+ # 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
+@@ -28,7 +28,7 @@
+
+ case $1 in
+ '')
+- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
++ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+@@ -40,11 +40,11 @@
+
+ Environment variables:
+ depmode Dependency tracking mode.
+- source Source file read by `PROGRAMS ARGS'.
+- object Object file output by `PROGRAMS ARGS'.
++ source Source file read by 'PROGRAMS ARGS'.
++ object Object file output by 'PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+- tmpdepfile Temporary file to use when outputing dependencies.
++ tmpdepfile Temporary file to use when outputting dependencies.
+ libtool Whether libtool is used (yes/no).
+
+ Report bugs to <bug-automake gnu org>.
+@@ -57,6 +57,12 @@
+ ;;
+ esac
+
++# A tabulation character.
++tab=' '
++# A newline character.
++nl='
++'
++
+ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+@@ -90,10 +96,24 @@
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+- cygpath_u="sed s,\\\\\\\\,/,g"
++ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
+ fi
+
++if test "$depmode" = msvc7msys; then
++ # This is just like msvc7 but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvc7
++fi
++
++if test "$depmode" = xlc; then
++ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
++ gccflag=-qmakedep=gcc,-MF
++ depmode=gcc
++fi
++
+ case "$depmode" in
+ gcc3)
+ ## gcc 3 implements dependency tracking that does exactly what
+@@ -148,20 +168,21 @@
+ ## The second -e expression handles DOS-style file names with drive letters.
+ sed -e 's/^[^:]*: / /' \
+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+-## This next piece of magic avoids the `deleted header file' problem.
++## This next piece of magic avoids the "deleted header file" problem.
+ ## The problem is that when a header file which appears in a .P file
+ ## is deleted, the dependency causes make to die (because there is
+ ## typically no way to rebuild the header). We avoid this by adding
+ ## dummy dependencies for each header file. Too bad gcc doesn't do
+ ## this for us directly.
+- tr ' ' '
+-' < "$tmpdepfile" |
+-## Some versions of gcc put a space before the `:'. On the theory
++ tr ' ' "$nl" < "$tmpdepfile" |
++## Some versions of gcc put a space before the ':'. On the theory
+ ## that the space means something, we add a space to the output as
+-## well.
++## well. hp depmode also adds that space, but also prefixes the VPATH
++## to the object. Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++ | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -193,18 +214,15 @@
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+- # the IRIX cc adds comments like `#:fec' to the end of the
++ # the IRIX cc adds comments like '#:fec' to the end of the
+ # dependency line.
+- tr ' ' '
+-' < "$tmpdepfile" \
++ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+- tr '
+-' ' ' >> "$depfile"
++ tr "$nl" ' ' >> "$depfile"
+ echo >> "$depfile"
+
+ # The second pass generates a dummy entry for each header file.
+- tr ' ' '
+-' < "$tmpdepfile" \
++ tr ' ' "$nl" < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> "$depfile"
+ else
+@@ -216,10 +234,17 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++xlc)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+ # in a .u file. In older versions, this file always lives in the
+- # current directory. Also, the AIX compiler puts `$object:' at the
++ # current directory. Also, the AIX compiler puts '$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+@@ -249,12 +274,11 @@
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+- # Each line is of the form `foo.o: dependent.h'.
++ # Each line is of the form 'foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+- # `$object: dependent.h' and one to simply `dependent.h:'.
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a tab and a space in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+@@ -265,23 +289,26 @@
+ ;;
+
+ icc)
+- # Intel's C compiler understands `-MD -MF file'. However on
+- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
++ # However on
++ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+- # which is wrong. We want:
++ # which is wrong. We want
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+- # and will wrap long lines using \ :
++ # and will wrap long lines using '\':
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+-
++ # tcc 0.9.26 (FIXME still under development at the moment of writing)
++ # will emit a similar output, but also prepend the continuation lines
++ # with horizontal tabulation characters.
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+@@ -290,15 +317,21 @@
+ exit $stat
+ fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h',
+- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++ # Each line is of the form 'foo.o: dependent.h',
++ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+- # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- # Some versions of the HPUX 10.20 sed can't process this invocation
+- # correctly. Breaking it into two sed invocations is a workaround.
+- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+- sed -e 's/$/ :/' >> "$depfile"
++ # '$object: dependent.h' and one to simply 'dependent.h:'.
++ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
++ < "$tmpdepfile" > "$depfile"
++ sed '
++ s/[ '"$tab"'][ '"$tab"']*/ /g
++ s/^ *//
++ s/ *\\*$//
++ s/^[^:]*: *//
++ /^$/d
++ /:$/d
++ s/$/ :/
++ ' < "$tmpdepfile" >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -334,7 +367,7 @@
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+- # Add `dependent.h:' lines.
++ # Add 'dependent.h:' lines.
+ sed -ne '2,${
+ s/^ *//
+ s/ \\*$//
+@@ -349,9 +382,9 @@
+
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
++ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+- # dependencies in `foo.d' instead, so we check for that too.
++ # dependencies in 'foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+@@ -397,14 +430,59 @@
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a tab and a space in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
++msvc7)
++ if test "$libtool" = yes; then
++ showIncludes=-Wc,-showIncludes
++ else
++ showIncludes=-showIncludes
++ fi
++ "$@" $showIncludes > "$tmpdepfile"
++ stat=$?
++ grep -v '^Note: including file: ' "$tmpdepfile"
++ if test "$stat" = 0; then :
++ else
++ rm -f "$tmpdepfile"
++ exit $stat
++ fi
++ rm -f "$depfile"
++ echo "$object : \\" > "$depfile"
++ # The first sed program below extracts the file names and escapes
++ # backslashes for cygpath. The second sed program outputs the file
++ # name when reading, but also accumulates all include files in the
++ # hold buffer in order to output them again at the end. This only
++ # works with sed implementations that can handle large buffers.
++ sed < "$tmpdepfile" -n '
++/^Note: including file: *\(.*\)/ {
++ s//\1/
++ s/\\/\\\\/g
++ p
++}' | $cygpath_u | sort -u | sed -n '
++s/ /\\ /g
++s/\(.*\)/'"$tab"'\1 \\/p
++s/.\(.*\) \\/\1:/
++H
++$ {
++ s/.*/'"$tab"'/
++ G
++ p
++}' >> "$depfile"
++ rm -f "$tmpdepfile"
++ ;;
++
++msvc7msys)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ #nosideeffect)
+ # This comment above is used by automake to tell side-effect
+ # dependency tracking mechanisms from slower ones.
+@@ -422,7 +500,7 @@
+ shift
+ fi
+
+- # Remove `-o $object'.
++ # Remove '-o $object'.
+ IFS=" "
+ for arg
+ do
+@@ -442,15 +520,14 @@
+ done
+
+ test -z "$dashmflag" && dashmflag=-M
+- # Require at least two characters before searching for `:'
++ # Require at least two characters before searching for ':'
+ # in the target name. This is to cope with DOS-style filenames:
+- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+ "$@" $dashmflag |
+- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
++ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+- tr ' ' '
+-' < "$tmpdepfile" | \
++ tr ' ' "$nl" < "$tmpdepfile" | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+@@ -503,9 +580,10 @@
+ touch "$tmpdepfile"
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+- cat < "$tmpdepfile" > "$depfile"
+- sed '1,2d' "$tmpdepfile" | tr ' ' '
+-' | \
++ # makedepend may prepend the VPATH from the source file name to the object.
++ # No need to regex-escape $object, excess matching of '.' is harmless.
++ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
++ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+@@ -525,7 +603,7 @@
+ shift
+ fi
+
+- # Remove `-o $object'.
++ # Remove '-o $object'.
+ IFS=" "
+ for arg
+ do
+@@ -594,8 +672,8 @@
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+- echo " " >> "$depfile"
++ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
++ echo "$tab" >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+diff -ru libgsf-1.14.26.old/install-sh libgsf-1.14.26/install-sh
+--- libgsf-1.14.26.old/install-sh 2012-11-14 02:47:40.000000000 +0100
++++ libgsf-1.14.26/install-sh 2013-03-03 15:18:34.000000000 +0100
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2011-01-19.21; # UTC
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -156,6 +156,10 @@
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
+ shift;;
+
+ -T) no_target_directory=true;;
+@@ -186,6 +190,10 @@
+ fi
+ shift # arg
+ dst_arg=$arg
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
+ done
+ fi
+
+@@ -200,7 +208,11 @@
+ fi
+
+ if test -z "$dir_arg"; then
+- trap '(exit $?); exit' 1 2 13 15
++ do_exit='(exit $ret); exit $ret'
++ trap "ret=129; $do_exit" 1
++ trap "ret=130; $do_exit" 2
++ trap "ret=141; $do_exit" 13
++ trap "ret=143; $do_exit" 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+@@ -228,9 +240,9 @@
+
+ for src
+ do
+- # Protect names starting with `-'.
++ # Protect names problematic for `test' and other utilities.
+ case $src in
+- -*) src=./$src;;
++ -* | [=\(\)!]) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -252,12 +264,7 @@
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+-
+ dst=$dst_arg
+- # Protect names starting with `-'.
+- case $dst in
+- -*) dst=./$dst;;
+- esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+@@ -385,7 +392,7 @@
+
+ case $dstdir in
+ /*) prefix='/';;
+- -*) prefix='./';;
++ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
+ esac
+
+@@ -403,7 +410,7 @@
+
+ for d
+ do
+- test -z "$d" && continue
++ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+diff -ru libgsf-1.14.26.old/ltmain.sh libgsf-1.14.26/ltmain.sh
+--- libgsf-1.14.26.old/ltmain.sh 2013-02-27 23:41:09.000000000 +0100
++++ libgsf-1.14.26/ltmain.sh 2013-03-03 15:18:20.000000000 +0100
+@@ -70,7 +70,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
++# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -80,7 +80,7 @@
+
+ PROGRAM=libtool
+ PACKAGE=libtool
+-VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
++VERSION="2.4.2 Debian-2.4.2-1.2"
+ TIMESTAMP=""
+ package_revision=1.3337
+
+diff -ru libgsf-1.14.26.old/m4/libtool.m4 libgsf-1.14.26/m4/libtool.m4
+--- libgsf-1.14.26.old/m4/libtool.m4 2013-02-27 23:41:09.000000000 +0100
++++ libgsf-1.14.26/m4/libtool.m4 2013-03-03 15:18:20.000000000 +0100
+@@ -1324,7 +1324,14 @@
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+- LD="${LD-ld} -m elf_i386"
++ case `/usr/bin/file conftest.o` in
++ *x86-64*)
++ LD="${LD-ld} -m elf32_x86_64"
++ ;;
++ *)
++ LD="${LD-ld} -m elf_i386"
++ ;;
++ esac
+ ;;
+ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+@@ -1688,7 +1695,8 @@
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+- if test -n "$lt_cv_sys_max_cmd_len"; then
++ if test -n "$lt_cv_sys_max_cmd_len" && \
++ test undefined != "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+@@ -2512,17 +2520,6 @@
+ esac
+ ;;
+
+-gnu*)
+- version_type=linux # correct to gnu/linux during the next big refactor
+- 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
+- ;;
+-
+ haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+@@ -2639,7 +2636,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+@@ -3255,10 +3252,6 @@
+ fi
+ ;;
+
+-gnu*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+@@ -3297,7 +3290,7 @@
+ ;;
+
+ # This must be glibc/ELF.
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -4049,7 +4042,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4348,7 +4341,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -6241,9 +6234,6 @@
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ ;;
+
+- gnu*)
+- ;;
+-
+ haiku*)
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname
-o $lib'
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+@@ -6405,7 +6395,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+diff -ru libgsf-1.14.26.old/missing libgsf-1.14.26/missing
+--- libgsf-1.14.26.old/missing 2012-11-14 02:47:40.000000000 +0100
++++ libgsf-1.14.26/missing 2013-03-03 15:18:34.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2012-01-06.13; # UTC
+
+ # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+-# 2008, 2009 Free Software Foundation, Inc.
++# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard iro umontreal ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -84,7 +84,6 @@
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+- tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+@@ -122,15 +121,6 @@
+ # Not GNU programs, they don't have --version.
+ ;;
+
+- tar*)
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+- exit 1
+- fi
+- ;;
+-
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+@@ -226,7 +216,7 @@
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+- eval LASTARG="\${$#}"
++ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+@@ -256,7 +246,7 @@
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+- eval LASTARG="\${$#}"
++ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+@@ -318,41 +308,6 @@
+ touch $file
+ ;;
+
+- tar*)
+- shift
+-
+- # We have already tried tar in the generic part.
+- # Look for gnutar/gtar before invocation to avoid ugly error
+- # messages.
+- if (gnutar --version > /dev/null 2>&1); then
+- gnutar "$@" && exit 0
+- fi
+- if (gtar --version > /dev/null 2>&1); then
+- gtar "$@" && exit 0
+- fi
+- firstarg="$1"
+- if shift; then
+- case $firstarg in
+- *o*)
+- firstarg=`echo "$firstarg" | sed s/o//`
+- tar "$firstarg" "$@" && exit 0
+- ;;
+- esac
+- case $firstarg in
+- *h*)
+- firstarg=`echo "$firstarg" | sed s/h//`
+- tar "$firstarg" "$@" && exit 0
+- ;;
+- esac
+- fi
+-
+- echo 1>&2 "\
+-WARNING: I can't seem to be able to run \`tar' with the given arguments.
+- You may want to install GNU tar or Free paxutils, or check the
+- command line arguments."
+- exit 1
+- ;;
+-
+ *)
+ echo 1>&2 "\
+ WARNING: \`$1' is needed, and is $msg.
diff --git a/debian/patches/series b/debian/patches/series
index 1a401b0..374cd2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,7 @@
-po-from-git
-refresh-config-sub-guess-1.14.24-1
+f7d0442
+df7ab90
+c248f5a
+69bb2f0
+afd9445
+1eff4c3
+refresh-config-sub-guess-1.14.26-1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
