[libgsf] Updated debianisation
- From: J.H.M. Dassen (Ray) <jdassen src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] Updated debianisation
- Date: Sun, 18 Nov 2012 16:21:16 +0000 (UTC)
commit e0cd8f740239aa0036909b9916be877b0ce93fea
Author: J.H.M. Dassen (Ray) <jdassen debian org>
Date: Sun Nov 18 17:21:05 2012 +0100
Updated debianisation
debian/changelog | 36 ++
debian/control | 69 +--
debian/gir1.2-libgsf-1.dirs | 2 +
debian/gir1.2-libgsf-1.install | 2 +
debian/libgsf-1-114.symbols | 25 +
debian/libgsf-1-dev.dirs | 1 +
debian/libgsf-bin.install | 2 +-
debian/patches/po-from-git | 554 ++++++++++++++++++++
....14.21-1 => refresh-config-sub-guess-1.14.24-1} | 384 ++++++++++----
debian/patches/series | 3 +-
debian/rules | 48 +-
11 files changed, 942 insertions(+), 184 deletions(-)
---
diff --git a/debian/changelog b/debian/changelog
index 2c5270c..fc2f0aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+libgsf (1.14.25-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #678456)
+ * [debian/patches/po-from-git, debian/patches/series] Incorporate
+ post-release translation updates.
+ * [debian/rules]
+ * Really harden build.
+ * Drop "--with-gnome-vfs" and Gnome package related bits.
+ * Add "build-arch" and "build-indep" targets.
+ * Enable building with introspection.
+ * Fix docs installation.
+ * Put PHONY target declaration near target.
+ * [debian/control]
+ * Bonobo and gnome-vfs use was dropped upstream; drop build dependencies
+ and the Gnome packages accordingly. Update descriptions as well.
+ * Add libgirepository1.0-dev and gobject-introspection build
+ dependencies.
+ * Add introspection package.
+ * Remove VCS fields. (Closes: #676832)
+ * Updated Standards-Version.
+ * [debian/gir1.2-libgsf-1*] New.
+ * [debian/libgsf-bin.install]
+ * There are no gconf schemas to install any more.
+ * Install thumbnailer desktop entry.
+ * [debian/libgsf-1-dev.install, debian/libgsf-1-dev.dirs] Update.
+ * [debian/libgsf-1-114.symbols] Updated.
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org> Sun, 18 Nov 2012 17:05:26 +0100
+
+libgsf (1.14.21-2) unstable; urgency=low
+
+ * [debian/control] Fix dependencies to allow binNMUs. Thanks Konstantinos
+ Margaritis <markos genesi-usa com>. (Closes: #636189)
+
+ -- J.H.M. Dassen (Ray) <jdassen debian org> Sun, 28 Aug 2011 11:33:34 +0200
+
libgsf (1.14.21-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index e0658e3..cdc453a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,50 +5,9 @@ Maintainer: J.H.M. Dassen (Ray) <jdassen debian org>
Build-Depends: debhelper (>= 7.0.0), dh-buildinfo, hardening-includes,
gtk-doc-tools (>= 1.2-1.2),
libglib2.0-dev (>= 2.16.1), libglib2.0-doc, libxml2-dev (>= 2.6.10),
- libgtk2.0-dev, libbonobo2-dev (>= 2.6.0-2), libgnomevfs2-dev (>= 2.6.1.1-3),
- libbz2-dev, zlib1g-dev
-Vcs-git: git://git.gnome.org/libgsf
-Vcs-Browser: http://git.gnome.org/cgit/libgsf/
-Standards-Version: 3.9.2
-
-Package: libgsf-gnome-1-dev
-Section: libdevel
-Architecture: any
-Depends: libgsf-gnome-1-114 (= ${binary:Version}), libgsf-1-dev, ${misc:Depends}
-Recommends: pkg-config
-Description: Structured File Library - development files for GNOME
- This package contains the development files used in building applications
- that use the GNOME Structured File Library.
- .
- The GNOME Structured File Library aims to provide an efficient
- extensible I/O abstraction for dealing with different structured file
- formats. It is actively being developed and its API is still likely to
- undergo significant changes (in particular, extensions).
- .
- This package supports the use of Bonobo, GNOME's CORBA-based component
- architecture and of GNOME-VFS, the GNOME virtual file-system.
-
-Package: libgsf-gnome-1-114-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libgsf-gnome-1-114 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: libgsf-1-114-dbg
-Description: Structured File Library - debugging files for GNOME
- This package contains the files for debugging (applications that use the)
- the GNOME extension parts of the GNOME Structured File Library.
-
-Package: libgsf-gnome-1-114
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Structured File Library - runtime version for GNOME
- The GNOME Structured File Library aims to provide an efficient
- extensible I/O abstraction for dealing with different structured file
- formats.
- .
- This version of libgsf makes use of Bonobo, GNOME's CORBA-based component
- architecture and of GNOME-VFS, the GNOME virtual file-system.
+ libgtk2.0-dev, libbz2-dev, zlib1g-dev,
+ gobject-introspection, libgirepository1.0-dev
+Standards-Version: 3.9.4
Package: libgsf-1-114-dbg
Section: debug
@@ -58,9 +17,6 @@ Depends: libgsf-1-114 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Structured File Library - debugging files (basic version)
This package contains the files for debugging (applications that use the)
the core parts of the GNOME Structured File Library.
- .
- To debug (applications that use the) GNOME extensions to this library,
- install libgsf-gnome-1-114-dbg as well.
Package: libgsf-1-dev
Section: libdevel
@@ -68,7 +24,7 @@ Architecture: any
Depends: libgsf-1-114 (= ${binary:Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev, ${misc:Depends}
Replaces: libgsf-gnome-1-dev (<= 1.14.8-1)
Recommends: pkg-config
-Description: Structured File Library - development files (basic version)
+Description: Structured File Library - development files
This package contains the development files used in building applications
that use the GNOME Structured File Library.
.
@@ -76,23 +32,26 @@ Description: Structured File Library - development files (basic version)
extensible I/O abstraction for dealing with different structured file
formats. It is actively being developed and its API is still likely to
undergo significant changes (in particular, extensions).
+
+Package: gir1.2-libgsf-1
+Section: introspection
+Architecture: any
+Depends: ${gir:Depends}, ${misc:Depends}
+Description: GObject introspection data for the Structured File Library
+ This package contains introspection data for the Structured File Library.
.
- This is the basic development package for the GNOME Structured File library.
- It is not GNOME-specific and thus does not depend on GNOME libraries.
- For GNOME-specific extensions, use libgsf-gnome-1-dev.
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
Package: libgsf-1-114
Section: libs
Architecture: any
-Depends: libgsf-1-common (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libgsf-1-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: gnumeric (<< 1.4.4)
Description: Structured File Library - runtime version
The GNOME Structured File Library aims to provide an efficient
extensible I/O abstraction for dealing with different structured file
formats.
- .
- This is the basic runtime version of libgsf. It does not provide
- GNOME-specific extensions.
Package: libgsf-1-common
Section: libs
diff --git a/debian/gir1.2-libgsf-1.dirs b/debian/gir1.2-libgsf-1.dirs
new file mode 100644
index 0000000..ab4acad
--- /dev/null
+++ b/debian/gir1.2-libgsf-1.dirs
@@ -0,0 +1,2 @@
+usr/share/gir-1.0
+usr/lib/girepository-1.0
diff --git a/debian/gir1.2-libgsf-1.install b/debian/gir1.2-libgsf-1.install
new file mode 100644
index 0000000..00d76df
--- /dev/null
+++ b/debian/gir1.2-libgsf-1.install
@@ -0,0 +1,2 @@
+usr/lib/girepository-*/Gsf-*.typelib
+usr/share/gir-1.0/Gsf-1.gir
diff --git a/debian/libgsf-1-114.symbols b/debian/libgsf-1-114.symbols
index 00bb11a..0995f7f 100644
--- a/debian/libgsf-1-114.symbols
+++ b/debian/libgsf-1-114.symbols
@@ -23,15 +23,21 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_doc_meta_data_insert Base 1.14.8
gsf_doc_meta_data_lookup Base 1.14.8
gsf_doc_meta_data_new Base 1.14.8
+ gsf_doc_meta_data_odf_subtree Base 1.14.24
+ gsf_doc_meta_data_read_from_msole Base 1.14.24
+ gsf_doc_meta_data_read_from_odf Base 1.14.24
gsf_doc_meta_data_remove Base 1.14.8
gsf_doc_meta_data_size Base 1.14.8
gsf_doc_meta_data_steal Base 1.14.8
gsf_doc_meta_data_store Base 1.14.8
+ gsf_doc_meta_data_write_to_msole Base 1.14.24
+ gsf_doc_meta_data_write_to_odf Base 1.14.24
gsf_doc_meta_dump Base 1.14.8
gsf_doc_prop_dump Base 1.14.8
gsf_doc_prop_free Base 1.14.8
gsf_doc_prop_get_link Base 1.14.8
gsf_doc_prop_get_name Base 1.14.8
+ gsf_doc_prop_get_type Base 1.14.24
gsf_doc_prop_get_val Base 1.14.8
gsf_doc_prop_new Base 1.14.8
gsf_doc_prop_set_link Base 1.14.8
@@ -136,6 +142,16 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_msole_lid_to_codepage_str Base 1.14.8
gsf_msole_metadata_read Base 1.14.8
gsf_msole_metadata_write Base 1.14.8
+ gsf_msole_sorting_key_cmp Base 1.14.22
+ gsf_msole_sorting_key_free Base 1.14.22
+ gsf_msole_sorting_key_get_type Base 1.14.24
+ gsf_msole_sorting_key_new Base 1.14.22
+ gsf_odf_get_ns Base 1.14.24
+ gsf_odf_get_version Base 1.14.24
+ gsf_odf_get_version_string Base 1.14.24
+ gsf_odf_out_get_type Base 1.14.23
+ gsf_odf_out_get_version Base 1.14.23
+ gsf_odf_out_get_version_string Base 1.14.23
gsf_ooo_ns Base 1.14.8
gsf_open_pkg_error_id Base 1.14.8
gsf_open_pkg_foreach_rel Base 1.14.9
@@ -237,9 +253,11 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_timestamp_from_string Base 1.14.12
gsf_timestamp_get_type Base 1.14.8
gsf_timestamp_hash Base 1.14.8
+ gsf_timestamp_load_from_string Base 1.14.24
gsf_timestamp_new Base 1.14.15
gsf_timestamp_parse Base 1.14.8
gsf_timestamp_set_time Base 1.14.15
+ gsf_timestamp_to_value Base 1.14.24
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
@@ -251,11 +269,13 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_xml_in_check_ns Base 1.14.8
gsf_xml_in_doc_add_nodes Base 1.14.9
gsf_xml_in_doc_free Base 1.14.8
+ gsf_xml_in_doc_get_type Base 1.14.24
gsf_xml_in_doc_new Base 1.14.8
gsf_xml_in_doc_parse Base 1.14.8
gsf_xml_in_doc_set_unknown_handler Base 1.14.8
gsf_xml_in_get_input Base 1.14.8
gsf_xml_in_namecmp Base 1.14.8
+ gsf_xml_in_ns_get_type Base 1.14.24
gsf_xml_in_push_state Base 1.14.8
gsf_xml_out_add_base64 Base 1.14.8
gsf_xml_out_add_bool Base 1.14.8
@@ -279,7 +299,12 @@ libgsf-1.so.114 libgsf-1-114 #MINVER#
gsf_xml_parser_context Base 1.14.8
gsf_xml_probe Base 1.14.11
gsf_zip_dirent_free Base 1.14.8
+ gsf_zip_dirent_get_type Base 1.14.24
gsf_zip_dirent_new Base 1.14.8
+ gsf_zip_vdir_add_child Base 1.14.24
+ gsf_zip_vdir_free Base 1.14.24
+ gsf_zip_vdir_get_type Base 1.14.24
+ gsf_zip_vdir_new Base 1.14.24
libgsf_major_version Base 1.14.8
libgsf_micro_version Base 1.14.8
libgsf_minor_version Base 1.14.8
diff --git a/debian/libgsf-1-dev.dirs b/debian/libgsf-1-dev.dirs
index 4418816..7fa55e3 100644
--- a/debian/libgsf-1-dev.dirs
+++ b/debian/libgsf-1-dev.dirs
@@ -1,2 +1,3 @@
usr/lib
usr/include
+usr/share/gir-1.0
diff --git a/debian/libgsf-bin.install b/debian/libgsf-bin.install
index 1cb9b18..cfe98e5 100644
--- a/debian/libgsf-bin.install
+++ b/debian/libgsf-bin.install
@@ -1,7 +1,7 @@
-etc/gconf/schemas/*.schemas
usr/bin/gsf
usr/bin/gsf-office-thumbnailer
usr/bin/gsf-vba-dump
usr/share/man/man1/gsf-office-thumbnailer.1
usr/share/man/man1/gsf-vba-dump.1
usr/share/man/man1/gsf.1
+usr/share/thumbnailers/gsf-office.thumbnailer
diff --git a/debian/patches/po-from-git b/debian/patches/po-from-git
new file mode 100644
index 0000000..5d3e605
--- /dev/null
+++ b/debian/patches/po-from-git
@@ -0,0 +1,554 @@
+diff --git a/po/cs.po b/po/cs.po
+index fe11dd3..efd2009 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -11,60 +11,60 @@ 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-03-31 18:40+0000\n"
+-"PO-Revision-Date: 2012-04-18 22:37+0200\n"
++"POT-Creation-Date: 2012-10-16 17:52+0000\n"
++"PO-Revision-Date: 2012-11-14 14:31+0200\n"
+ "Last-Translator: Marek Äernockà <marek manet cz>\n"
+ "Language-Team: Czech <gnome-cs-list gnome org>\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Language: cs\n"
+ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+-#: ../gsf/gsf-blob.c:111
++#: ../gsf/gsf-blob.c:115
+ #, c-format
+ msgid "Not enough memory to copy %s bytes of data"
+-msgstr "Nedostatek pamÄti pro kopÃrovÃnà %s bytÅ"
++msgstr "Nedostatek pamÄti pro kopÃrovÃnà %s bajtÅ"
+
+-#: ../gsf/gsf-clip-data.c:153
++#: ../gsf/gsf-clip-data.c:166
+ #, c-format
+ msgid "The clip_data is in %s, but it is smaller than at least %s bytes"
+-msgstr "Clip_data je ve %s, ale je menÅà neÅ potÅebnà %s byty."
++msgstr "Clip_data je ve %s, ale je menÅÃ neÅ potÅebnÃch %s bajtÅ"
+
+-#: ../gsf/gsf-clip-data.c:247
++#: ../gsf/gsf-clip-data.c:260
+ #, c-format
+ msgid ""
+ "The clip_data is in Windows clipboard format, but it is smaller than the "
+ "required 4 bytes."
+ msgstr ""
+-"Clip_data je ve formÃtu schrÃnky Windows, ale je menÅà neÅ potÅebnà 4 byty."
++"Clip_data je ve formÃtu schrÃnky Windows, ale je menÅà neÅ potÅebnà 4 bajty."
+
+-#: ../gsf/gsf-clip-data.c:258
++#: ../gsf/gsf-clip-data.c:271
+ msgid "Windows Metafile format"
+ msgstr "formÃtu Windows Metafile"
+
+ #. CF_BITMAP
+-#: ../gsf/gsf-clip-data.c:264
++#: ../gsf/gsf-clip-data.c:277
+ msgid "Windows DIB or BITMAP format"
+ msgstr "formÃtu Windows DIB nebo BITMAP"
+
+-#: ../gsf/gsf-clip-data.c:269
++#: ../gsf/gsf-clip-data.c:282
+ msgid "Windows Enhanced Metafile format"
+ msgstr "formÃtu Windows Enhanced Metafile"
+
+-#: ../gsf/gsf-libxml.c:1411
++#: ../gsf/gsf-libxml.c:1493
+ msgid "Pretty print"
+ msgstr "Hezkà vÃstup"
+
+-#: ../gsf/gsf-libxml.c:1412
++#: ../gsf/gsf-libxml.c:1494
+ msgid "Should the output auto-indent elements to make reading easier?"
+ msgstr "MÄl by mÃt vÃstup automaticky odsazenà prvky, aby byl lÃpe ÄitelnÃ?"
+
+-#: ../gsf/gsf-libxml.c:1418
++#: ../gsf/gsf-libxml.c:1500
+ msgid "Sink"
+ msgstr "CÃl"
+
+-#: ../gsf/gsf-libxml.c:1419
++#: ../gsf/gsf-libxml.c:1501
+ msgid "The destination for writes"
+ msgstr "CÃl pro zÃpisy"
+
+@@ -74,8 +74,8 @@ msgid ""
+ "Missing data when reading the %s property; got %s bytes, but %s bytes at "
+ "least are needed."
+ msgstr ""
+-"ChybÄjÃcà data pÅi Ätenà vlastnosti %s; pÅeÄteno %s bytÅ, ale alespoÅ %s "
+-"bytÅ je vyÅadovÃno."
++"ChybÄjÃcà data pÅi Ätenà vlastnosti %s; pÅeÄteno %s bajtÅ, ale alespoÅ %s "
++"bajtÅ je vyÅadovÃno."
+
+ #: ../gsf/gsf-msole-utils.c:366
+ #, c-format
+@@ -83,123 +83,138 @@ 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 ""
+-"PoÅkozenà data vlastnosti VT_CF; dÃlka dat schrÃnky musà bÃt aspoÅ 4 byty, "
+-"ale k dispozici je jen %s bytÅ."
++"PoÅkozenà data vlastnosti VT_CF; dÃlka dat schrÃnky musà bÃt aspoÅ 4 bajty, "
++"ale k dispozici je jen %s bajtÅ."
+
+-#: ../gsf/gsf-open-pkg-utils.c:351
++#: ../gsf/gsf-open-pkg-utils.c:355
+ #, c-format
+ msgid "Unable to find part id='%s' for '%s'"
+ msgstr "Nelze nalÃzt ÄÃst id=â%sâ pro â%sâ"
+
+-#: ../gsf/gsf-open-pkg-utils.c:379
++#: ../gsf/gsf-open-pkg-utils.c:383
+ #, c-format
+ msgid "Unable to find part with type='%s' for '%s'"
+ msgstr "Nelze nalÃzt ÄÃst s type=â%sâ pro â%sâ"
+
+-#: ../gsf/gsf-open-pkg-utils.c:409
++#: ../gsf/gsf-open-pkg-utils.c:413
+ #, c-format
+ msgid "Missing id for part in '%s'"
+ msgstr "Chybà id pro ÄÃst v â%sâ"
+
+-#: ../gsf/gsf-open-pkg-utils.c:418
++#: ../gsf/gsf-open-pkg-utils.c:422
+ #, c-format
+ msgid "Part '%s' in '%s' from '%s' is corrupt!"
+ msgstr "ÄÃst â%sâ v â%sâ z â%sâ je poÅkozena!"
+
+-#: ../gsf/gsf-opendoc-utils.c:290
++#: ../gsf/gsf-opendoc-utils.c:353
+ #, c-format
+ msgid "Property \"%s\" used for multiple types!"
+ msgstr "Vlastnost â%sâ pouÅità pro vÃce typÅ!"
+
+-#: ../gsf/gsf-opendoc-utils.c:742
++#: ../gsf/gsf-opendoc-utils.c:878
+ msgid "ODF version"
+ msgstr "Verze ODF"
+
+-#: ../gsf/gsf-opendoc-utils.c:743
++#: ../gsf/gsf-opendoc-utils.c:879
+ msgid "The ODF version this object is targeting as an integer like 100"
+ msgstr ""
+ "Verze ODF, v podobÄ celÃho ÄÃsla, na kterou je tento objekt zamÄÅen; napÅ. "
+ "100"
+
+-#: ../tools/gsf.c:22
++#: ../tools/gsf.c:27
+ msgid "Display program version"
+ msgstr "Zobrazit verzi aplikace"
+
+-#: ../tools/gsf.c:44
++#: ../tools/gsf.c:54
+ #, c-format
+ msgid "%s: Failed to open %s: %s\n"
+ msgstr "%s: NepodaÅilo se otevÅÃt %s: %s\n"
+
+-#: ../tools/gsf.c:65
++#: ../tools/gsf.c:75
+ #, c-format
+ msgid "%s: Failed to recognize %s as an archive\n"
+ msgstr "%s: Selhalo rozpoznÃnà %s jako archÃvu\n"
+
+-#: ../tools/gsf.c:102
++#: ../tools/gsf.c:112
+ #, c-format
+ msgid "Available subcommands are...\n"
+ msgstr "Dostupnà dÃlÄà pÅÃkazy jsouâ\n"
+
+-#: ../tools/gsf.c:103
++#: ../tools/gsf.c:113
+ #, c-format
+ msgid "* cat output one or more files in archive\n"
+-msgstr "* cat vÃstup jednoho Äi vÃce souborÅ v archÃvu\n"
++msgstr "* cat vÃpsat jeden Äi vÃce souborÅ z archÃvu\n"
+
+-#: ../tools/gsf.c:104
++#: ../tools/gsf.c:114
+ #, c-format
+ msgid "* dump dump one or more files in archive as hex\n"
+-msgstr "* dump ÅestnÃctkovà vÃstup jednoho Äi vÃce souborÅ v archÃvu\n"
++msgstr "* dump vypsat v ÅestnÃckovà podobÄ jeden Äi vÃce souborÅ z archÃvu\n"
+
+-#: ../tools/gsf.c:105
++#: ../tools/gsf.c:115
+ #, c-format
+ msgid "* help list subcommands\n"
+ msgstr "* help seznam dÃlÄÃch pÅÃkazÅ\n"
+
+-#: ../tools/gsf.c:106
++#: ../tools/gsf.c:116
+ #, c-format
+ msgid "* list list files in archive\n"
+-msgstr "* list seznam souborÅ v archÃvu\n"
++msgstr "* list vypsat seznam souborÅ v archÃvu\n"
+
+-#: ../tools/gsf.c:107
++#: ../tools/gsf.c:117
+ #, c-format
+ msgid "* listprops list document properties in archive\n"
+-msgstr "* listprops seznam vlastnostà dokumentu v archÃvu\n"
++msgstr "* listprops vypsat seznam vlastnostà dokumentu v archÃvu\n"
+
+-#: ../tools/gsf.c:108
++#: ../tools/gsf.c:118
+ #, c-format
+ msgid "* props print specified document properties\n"
+-msgstr "* props vytiskne vybranà vlastnosti dokumentu\n"
++msgstr "* props vypsat vlastnosti zadanÃho dokumentu\n"
++
++#: ../tools/gsf.c:119
++#, c-format
++msgid "* createole create OLE archive\n"
++msgstr "* createole vytvoÅit archiv OLE\n"
+
+-#: ../tools/gsf.c:291
++#: ../tools/gsf.c:120
++#, c-format
++msgid "* createzip create ZIP archive\n"
++msgstr "* createole vytvoÅit archiv ZIP\n"
++
++#: ../tools/gsf.c:303
+ #, c-format
+ msgid "No property named %s\n"
+ msgstr "ÅÃdnà poloÅka s nÃzvem %s\n"
+
+-#: ../tools/gsf.c:364
++#: ../tools/gsf.c:362
++#, c-format
++msgid "%s: Error processing file %s: %s\n"
++msgstr "%s: Chyba pÅi zpracovÃnà souboru %s: %s\n"
++
++#: ../tools/gsf.c:526
+ msgid "SUBCOMMAND ARCHIVE..."
+ msgstr "DÃLÄÃ_PÅÃKAZ ARCHÃVâ"
+
+-#: ../tools/gsf.c:371
++#: ../tools/gsf.c:533
+ #, c-format
+ msgid ""
+ "%s\n"
+ "Run '%s --help' to see a full list of available command line options.\n"
+ msgstr ""
+ "%s\n"
+-"SpusÅte â%s --helpâ pro zobrazenà seznamu dostupnÃch pÅepÃnaÄÅ pÅÃkazovÃho "
++"SpuÅtÄnÃm â%s --helpâ si zobrazÃte seznam dostupnÃch pÅepÃnaÄÅ pÅÃkazovÃho "
+ "ÅÃdku.\n"
+
+-#: ../tools/gsf.c:378
++#: ../tools/gsf.c:540
+ #, c-format
+ msgid "gsf version %d.%d.%d\n"
+ msgstr "gsf verze %d.%d.%d\n"
+
+-#: ../tools/gsf.c:384
++#: ../tools/gsf.c:546
+ #, c-format
+ msgid "Usage: %s %s\n"
+ msgstr "PouÅitÃ: %s %s\n"
+
+-#: ../tools/gsf.c:405
++#: ../tools/gsf.c:571
+ #, c-format
+ msgid "Run '%s help' to see a list subcommands.\n"
+-msgstr "SpuÅtÄnÃm â%s helpâ zobrazÃte seznam dÃlÄÃch pÅÃkazÅ\n"
++msgstr "SpuÅtÄnÃm â%s helpâ si zobrazÃte seznam dÃlÄÃch pÅÃkazÅ.\n"
+diff --git a/po/el.po b/po/el.po
+index 47dc356..2399d17 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -3,188 +3,223 @@
+ # This file is distributed under the same license as the libgsf package.
+ # cograss <cograss yahoo com>, 2012.
+ # surf <cograss yahoo com>, 2012.
++# Dimitris Spingos (ÎÎÎÎÏÏÎÏ ÎÏÎÎÎÎÏ) <dmtrs32 gmail com>, 2012.
+ 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-05-03 10:47+0000\n"
+-"PO-Revision-Date: 2012-07-13 10:35+0200\n"
+-"Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
+-"Language-Team: Greek Translation Team\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-11-14 11:46+0300\n"
++"Last-Translator: Dimitris Spingos (ÎÎÎÎÏÏÎÏ ÎÏÎÎÎÎÏ) <dmtrs32 gmail com>\n"
++"Language-Team: team gnome gr\n"
++"Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Language: el\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+-"X-Generator: Virtaal 0.7.0\n"
++"X-Generator: Virtaal 0.7.1\n"
+ "X-Project-Style: gnome\n"
+
+-#: ../gsf/gsf-blob.c:111
++#: ../gsf/gsf-blob.c:115
+ #, c-format
+ msgid "Not enough memory to copy %s bytes of data"
+-msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÎÏÎÎÏÎ ÎÎÎÎÎ ÎÎÎ ÏÎÎ ÎÎÏÎÎÏÎÏÎ %s bytes ÎÎÎÎÎÎÎÏÎ"
++msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÎÏÎÎÏÎ ÎÎÎÎÎ ÎÎÎ ÏÎÎ ÎÎÏÎÎÏÎÏÎ %s ÏÎÏÎÎÎÎÎÎÏÎ ÎÎÎÎÎÎÎÏÎ"
+
+-#: ../gsf/gsf-clip-data.c:153
++#: ../gsf/gsf-clip-data.c:166
+ #, c-format
+ msgid "The clip_data is in %s, but it is smaller than at least %s bytes"
+-msgstr "ÎÎ clip_data ÎÎÎÎÎ %s, ÎÎÎÎ ÎÎÎÎÎ ÎÎÎÏÏÏÎÏÎ ÎÏÏ ÏÎ ÎÎÎÏÎÏÏÎ %s bytes"
++msgstr ""
++"ÎÎ clip_data ÎÎÎÎÎ %s, ÎÎÎÎ ÎÎÎÎÎ ÎÎÎÏÏÏÎÏÎ ÎÏÏ ÏÎÏ ÎÎÎÏÎÏÏÎÏ %s ÏÎÏÎÎÎÎÎÎÎÏ"
+
+-#: ../gsf/gsf-clip-data.c:247
++#: ../gsf/gsf-clip-data.c:260
+ #, c-format
+-msgid "The clip_data is in Windows clipboard format, but it is smaller than the required 4 bytes."
+-msgstr "ÎÎ clip_data ÎÎÏÎÎ ÏÎ ÎÎÏÏÎ Windows Clipboard, ÎÎÎÎ ÎÎÎ ÎÎÎÎÎ ÏÎÏÎÎÏÎÏÏÎÎ 4 bytes."
++msgid ""
++"The clip_data is in Windows clipboard format, but it is smaller than the "
++"required 4 bytes."
++msgstr ""
++"ÎÎ clip_data ÎÎÏÎÎ ÏÎ ÎÎÏÏÎ ÏÏÎÏÎÎÏÎÏ Windows, ÎÎÎÎ ÎÎÎÎÎ ÎÎÎÏÏÏÎÏÎ ÎÏÏ ÏÎÏ "
++"ÎÏÎÎÏÎÏÎÎÎÎÏ 4 ÏÎÏÎÎÎÎÎÎÎÏ."
+
+-#: ../gsf/gsf-clip-data.c:258
++#: ../gsf/gsf-clip-data.c:271
+ msgid "Windows Metafile format"
+ msgstr "ÎÎÏÏÎ Windows Metafile"
+
+ #. CF_BITMAP
+-#: ../gsf/gsf-clip-data.c:264
++#: ../gsf/gsf-clip-data.c:277
+ msgid "Windows DIB or BITMAP format"
+ msgstr "ÎÎÏÏÎ Windows DIB Î BITMAP"
+
+-#: ../gsf/gsf-clip-data.c:269
++#: ../gsf/gsf-clip-data.c:282
+ msgid "Windows Enhanced Metafile format"
+ msgstr "ÎÎÏÏÎ Windows Enhanced Metafile"
+
+-#: ../gsf/gsf-libxml.c:1411
++#: ../gsf/gsf-libxml.c:1493
+ msgid "Pretty print"
+ msgstr "ÎÎÎÏÏÎ ÎÎÏÏÏÏÏÎ"
+
+-#: ../gsf/gsf-libxml.c:1412
++#: ../gsf/gsf-libxml.c:1494
+ msgid "Should the output auto-indent elements to make reading easier?"
+-msgstr "ÎÎ ÎÎÎÎÏÎ ÏÎÎ ÎÏÏÎÎÎÏÎÏÎÎÎÏÎ ÎÎÏÎÎÏ ÏÏÎÎÏÎÎÏÎ ÎÎÎ ÎÎ ÎÎÎÎÎ Î ÎÎÎÎÎÏÏÎ ÎÏÎÎÎÏÏÎÏÎ;"
++msgstr ""
++"ÎÎ ÎÎÎÎÏÎ ÏÎÎ ÎÏÏÎÎÎÏÎÏÎÎÎÏÎ ÎÎÏÎÎÏ ÏÏÎÎÏÎÎÏÎ ÎÏÎÏÎÏ ÎÎÎ ÎÎ ÎÎÎÎÎ Î ÎÎÎÎÎÏÏÎ "
++"ÎÏÎÎÎÏÏÎÏÎ;"
+
+-#: ../gsf/gsf-libxml.c:1418
++#: ../gsf/gsf-libxml.c:1500
+ msgid "Sink"
+-msgstr "ÎÎÎÎÎÏÏÎÏÎÏ"
++msgstr "ÎÎÎÏÎÏ"
+
+-#: ../gsf/gsf-libxml.c:1419
++#: ../gsf/gsf-libxml.c:1501
+ msgid "The destination for writes"
+ msgstr "Î ÏÏÎÎÏÎÏÎÏÏ ÎÎÎ ÏÎÏ ÎÎÎÏÎÏÎÏ"
+
+ #: ../gsf/gsf-msole-utils.c:315
+ #, c-format
+-msgid "Missing data when reading the %s property; got %s bytes, but %s bytes at least are needed."
+-msgstr "ÎÎÎÏÎÏÎ ÎÎÎÎÎÎÎÎ ÎÎÏÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÏÎÏ %s, ÎÎÏÎÎÏÎÎ %s bytes, ÎÎÎÎ ÏÏÎÎÎÎÎÎÏÎÎ ÏÎÏÎÎÏÎÏÏÎÎ %s bytes."
++msgid ""
++"Missing data when reading the %s property; got %s bytes, but %s bytes at "
++"least are needed."
++msgstr ""
++"ÎÎÎÏÎÏÎ ÎÎÎÎÎÎÎÎ ÎÎÏÎ ÏÎÎ ÎÎÎÎÎÏÏÎ ÏÎÏ %s ÎÎÎÏÎÎÏÎÎ %s ÏÎÏÎÎÎÎÎÎÎÏ, ÎÎÎÎ "
++"ÏÏÎÎÎÎÎÎÏÎÎ ÏÎÏÎÎÏÎÏÏÎÎ %s ÏÎÏÎÎÎÎÎÎÎÏ."
+
+ #: ../gsf/gsf-msole-utils.c:366
+ #, 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 "ÎÎÎÎÎÏÎÎÎÎ ÎÎÎÎÎÎÎÎ ÏÏÎÎ ÎÎÎÏÏÎÏÎ VT_CF.ÎÎ ÎÎÎÎÏ ÏÏÎÏÎÎÏÎÏ ÏÏÎ ÏÏÎÎÏÎÎÏÎ ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÎÏÎÎÏÎÏÏÎÎ 4 bytes, ÎÎÎÎ ÏÎ ÎÎÎÎÎÎÎÎ ÎÎÎÎ ÏÏÎ ÎÏÎÎ ÎÏÎÎ %s bytes ÎÎÎÎÎÏÎÎÎ."
++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 ""
++"ÎÎÎÎÎÏÎÎÎÎ ÎÎÎÎÎÎÎÎ ÏÏÎÎ ÎÎÎÏÏÎÏÎ VT_CFÂ ÏÎ ÎÎÎÎÏ ÎÎÎÎÎÎÎÏÎ ÏÎÏ ÏÏÎÏÎÎÏÎÏ "
++"ÏÏÎÏÎÎ ÎÎ ÎÎÎÎÎ ÏÎÏÎÎÏÎÏÏÎÎ 4 ÏÎÏÎÎÎÎÎÎÎÏ, ÎÎÎÎ ÏÎ ÎÎÎÎÎÎÎÎ ÎÎÎÎ ÏÏÎ ÎÏÎÎ "
++"ÎÏÎÎ %s ÎÎÎÎÎÏÎÎÎÏ ÏÎÏÎÎÎÎÎÎÎÏ."
+
+-#: ../gsf/gsf-open-pkg-utils.c:351
++#: ../gsf/gsf-open-pkg-utils.c:355
+ #, c-format
+ msgid "Unable to find part id='%s' for '%s'"
+ msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÎÎÎÏÎÏ id='%s' ÎÎÎ ÏÎ '%s'"
+
+-#: ../gsf/gsf-open-pkg-utils.c:379
++#: ../gsf/gsf-open-pkg-utils.c:383
+ #, c-format
+ msgid "Unable to find part with type='%s' for '%s'"
+-msgstr "AÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÎÎÎÏÎÏ ÎÎ type='%s' ÎÎÎ ÏÎ '%s'"
++msgstr "ÎÎÏÎÎÎÎÎ ÎÏÏÎÏÎÏ ÏÎÎÎÎÏÎÏ ÎÎ type='%s' ÎÎÎ ÏÎ '%s'"
+
+-#: ../gsf/gsf-open-pkg-utils.c:409
++#: ../gsf/gsf-open-pkg-utils.c:413
+ #, c-format
+ msgid "Missing id for part in '%s'"
+-msgstr "ÎÎÎ ÏÏÎÏÏÎÎ id ÎÎÎ ÏÎ ÏÎÎÎÎ ÏÏÎ '%s'"
++msgstr "ÎÎÎ ÏÏÎÏÏÎÎ ÏÎÏÏÏÏÎÏÎ ÎÎÎ ÏÎ ÏÎÎÎÎ ÏÏÎ '%s'"
+
+-#: ../gsf/gsf-open-pkg-utils.c:418
++#: ../gsf/gsf-open-pkg-utils.c:422
+ #, c-format
+ msgid "Part '%s' in '%s' from '%s' is corrupt!"
+ msgstr "ÎÎÎÎÎ ÎÎÎÎÎÏÎÎÎÎ ÏÎ ÏÎÎÎÎ '%s' ÏÏÎ '%s' ÎÏÏ ÏÎ '%s'!"
+
+-#: ../gsf/gsf-opendoc-utils.c:290
++#: ../gsf/gsf-opendoc-utils.c:353
+ #, c-format
+ msgid "Property \"%s\" used for multiple types!"
+ msgstr "Î ÎÎÎÏÏÎÏÎ \"%s\" ÏÏÎÏÎÎÎÏÎÎÎÎÏÎÎ ÎÎÎ ÏÎÎÎÎÏÏ ÏÏÏÎÏÏ!"
+
+-#: ../gsf/gsf-opendoc-utils.c:742
++#: ../gsf/gsf-opendoc-utils.c:878
+ msgid "ODF version"
+ msgstr "ÎÎÎÎÏÎ ODF"
+
+-#: ../gsf/gsf-opendoc-utils.c:743
++#: ../gsf/gsf-opendoc-utils.c:879
+ msgid "The ODF version this object is targeting as an integer like 100"
+-msgstr "Î ÎÎÎÎÏÎ ÏÎÏ ODF ÏÏÎÏÎÏÎÎ ÎÏÏÏ ÏÎ ÎÎÏÎÎÎÎÎÎÎÎ ÏÏ ÎÎÎ ÎÎÎÏÎÎÎ, ÏÏÏÏ ÏÎ 100"
++msgstr ""
++"Î ÎÎÎÎÏÎ ÏÎÏ ODF ÏÏÎÏÎÏÎÎ ÎÏÏÏ ÏÎ ÎÎÏÎÎÎÎÎÎÎÎ ÏÏ ÎÎÎ ÎÎÎÏÎÎÎ, ÏÏÏÏ ÏÎ 100"
+
+-#: ../tools/gsf.c:22
++#: ../tools/gsf.c:27
+ msgid "Display program version"
+ msgstr "ÎÎÏÎÎÎÏÎ ÎÎÎÎÏÎÏ ÏÎÏ ÏÏÎÎÏÎÎÎÎÏÎÏ"
+
+-#: ../tools/gsf.c:44
++#: ../tools/gsf.c:54
+ #, c-format
+ msgid "%s: Failed to open %s: %s\n"
+-msgstr "%s: AÏÎÏÏÏÎÎ ÎÎÎÎÎÎÎÏÎÏ ÏÎÏ %s: %s\n"
++msgstr "%s: ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÎÎÏÎÏ ÏÎÏ %s: %s\n"
+
+-#: ../tools/gsf.c:65
++#: ../tools/gsf.c:75
+ #, c-format
+ msgid "%s: Failed to recognize %s as an archive\n"
+-msgstr "%s: ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÏÎÏ ÏÎÏ %s ÏÏ ÏÏÎÏÎÎÏÎÎÎÎ\n"
++msgstr "%s: ÎÏÎÏÏÏÎÎ ÎÎÎÎÎÏÏÎÏÎÏ ÏÎÏ %s ÏÏ ÎÏÏÎÎÎÎÎÎÎ\n"
+
+-#: ../tools/gsf.c:102
++#: ../tools/gsf.c:112
+ #, c-format
+ msgid "Available subcommands are...\n"
+ msgstr "ÎÎ ÎÎÎÎÎÏÎÎÎÏ ÏÏÎÎÎÏÎÎÎÏ ÎÎÎÎÎ...\n"
+
+-#: ../tools/gsf.c:103
++#: ../tools/gsf.c:113
+ #, c-format
+ msgid "* cat output one or more files in archive\n"
+-msgstr "* cat ÎÎÏÏÎÎÏÏÏÎ ÎÎÏÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÏÏÎÎÏÎ ÏÏÎ ÏÏÎÏÎÎÏÎÎÎÎ\n"
++msgstr "* cat ÎÎÎÎÎÏ ÎÎÏÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÏÏÎÎÏÎ ÏÎ ÎÏÏÎÎÎÎÎÎÎ\n"
+
+-#: ../tools/gsf.c:104
++#: ../tools/gsf.c:114
+ #, c-format
+ msgid "* dump dump one or more files in archive as hex\n"
+-msgstr "* dump ÎÎÏÏÏÏÏÏÎ ÎÎÏÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÏÏÎÎÏÎ ÏÏÎ ÏÏÎÏÎÎÏÎÎÎÎ ÏÏ ÎÎÎÎÎÎÎÎÎÎÎ\n"
++msgstr "* dump ÎÏÎÏÏÏÏÏÎ ÎÎÏÏ Î ÏÎÏÎÏÏÎÏÎÏÏÎ ÎÏÏÎÎÏÎ ÏÎ ÎÏÏÎÎÎÎÎÎÎ ÏÏ "
++"ÎÎÎÎÎÎÎÎÎÎÎ\n"
+
+-#: ../tools/gsf.c:105
++#: ../tools/gsf.c:115
+ #, c-format
+ msgid "* help list subcommands\n"
+-msgstr "* help ÏÏÎÎÎÎÎ ÏÏÎÎÎÏÎÎÏÎ\n"
++msgstr "* help ÎÎÏÏÎ ÏÏÎÎÎÏÎÎÏÎ\n"
+
+-#: ../tools/gsf.c:106
++#: ../tools/gsf.c:116
+ #, c-format
+ msgid "* list list files in archive\n"
+-msgstr "* list ÏÏÎÎÎÎÎ ÎÏÏÎÎÏÎ ÏÎÏ ÏÏÎÏÎÎÏÎÎÎÎÏ\n"
++msgstr "* list ÎÎÏÏÎ ÎÏÏÎÎÏÎ ÏÎ ÎÏÏÎÎÎÎÎÎÎ\n"
+
+-#: ../tools/gsf.c:107
++#: ../tools/gsf.c:117
+ #, c-format
+ msgid "* listprops list document properties in archive\n"
+-msgstr "* listprops ÏÏÎÎÎÎÎ ÎÎÎÎÏÎÏÏÎ ÏÏÎ ÏÏÎÏÎÎÏÎÎÎÎ\n"
++msgstr "* listprops ÎÎÏÏÎ ÎÎÎÎÏÎÏÏÎ ÎÎÎÏÎÏÎÏ ÏÎ ÎÏÏÎÎÎÎÎÎÎ\n"
+
+-#: ../tools/gsf.c:108
++#: ../tools/gsf.c:118
+ #, c-format
+ msgid "* props print specified document properties\n"
+-msgstr "* props ÏÏÎÎÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÏÎ ÎÎÎÎÏÎÏÏÎ\n"
++msgstr "* props ÏÏÎÎÎÎÎ ÏÏÎÎÎÎÏÎÎÎÎÏÎ ÎÎÎÎÏÎÏÏÎ ÎÎÎÏÎÏÎÏ\n"
+
+-#: ../tools/gsf.c:291
++#: ../tools/gsf.c:119
++#, c-format
++msgid "* createole create OLE archive\n"
++msgstr "* createole ÎÎÎÎÎÏÏÎÎÎ ÎÏÏÎÎÎÎÎÎÎÏ OLE\n"
++
++#: ../tools/gsf.c:120
++#, c-format
++msgid "* createzip create ZIP archive\n"
++msgstr "* createzip ÎÎÎÎÎÏÏÎÎÎ ÎÏÏÎÎÎÎÎÎÎÏ ZIP\n"
++
++#: ../tools/gsf.c:303
+ #, c-format
+ msgid "No property named %s\n"
+ msgstr "ÎÎÎÎÎ ÎÎÎÏÏÎÏÎ ÎÎ ÏÎÎÎÎ %s\n"
+
+-#: ../tools/gsf.c:364
++#: ../tools/gsf.c:362
++#, c-format
++msgid "%s: Error processing file %s: %s\n"
++msgstr "%s: ÎÏÎÎÎÎ ÎÏÎÎÎÏÎÎÏÎÎÏ ÎÏÏÎÎÎÏ %s: %s\n"
++
++#: ../tools/gsf.c:526
+ msgid "SUBCOMMAND ARCHIVE..."
+ msgstr "ÎÎÎÎÎÎÎÎÎÎ ÎÎÎÎÎÎÎÎÎÎ..."
+
+-#: ../tools/gsf.c:371
++#: ../tools/gsf.c:533
+ #, c-format
+ msgid ""
+ "%s\n"
+ "Run '%s --help' to see a full list of available command line options.\n"
+ msgstr ""
+ "%s\n"
+-"ÎÏÎÎÏÎ: '%s --help' ÎÎÎ ÎÎ ÎÎÎÏÎ ÎÎÎ ÏÎÎÏÎ ÎÎÏÏÎ ÎÎ ÎÏÎÎÎÎÎÏ ÏÎÏ ÎÏÎÎÎÎÏ ÎÎÏÎÎÏÎ.\n"
++"ÎÏÎÎÏÎ: '%s --help' ÎÎÎ ÎÎ ÎÎÎÏÎ ÎÎÎ ÏÎÎÏÎ ÎÎÏÏÎ ÎÎ ÎÏÎÎÎÎÎÏ ÏÎÏ ÎÏÎÎÎÎÏ "
++"ÎÎÏÎÎÏÎ.\n"
+
+-#: ../tools/gsf.c:378
++#: ../tools/gsf.c:540
+ #, c-format
+ msgid "gsf version %d.%d.%d\n"
+ msgstr "ÎÎÎÎÏÎ gsf %d.%d.%d\n"
+
+-#: ../tools/gsf.c:384
++#: ../tools/gsf.c:546
+ #, c-format
+ msgid "Usage: %s %s\n"
+ msgstr "ÎÏÎÏÎ: %s %s\n"
+
+-#: ../tools/gsf.c:405
++#: ../tools/gsf.c:571
+ #, c-format
+ msgid "Run '%s help' to see a list subcommands.\n"
+ msgstr "ÎÏÎÎÏÎ '%s help' ÎÎÎ ÏÏÎÎÎÎÎ ÏÏÎ ÏÏÎÎÎÏÎÎÏÎ.\n"
+-
diff --git a/debian/patches/refresh-config-sub-guess-1.14.21-1 b/debian/patches/refresh-config-sub-guess-1.14.24-1
similarity index 80%
rename from debian/patches/refresh-config-sub-guess-1.14.21-1
rename to debian/patches/refresh-config-sub-guess-1.14.24-1
index aa1cdb8..4ad7f91 100644
--- a/debian/patches/refresh-config-sub-guess-1.14.21-1
+++ b/debian/patches/refresh-config-sub-guess-1.14.24-1
@@ -1,6 +1,6 @@
-diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
---- libgsf-1.14.21.old/config.guess 2011-03-25 00:33:50.000000000 +0100
-+++ libgsf-1.14.21/config.guess 2011-05-22 01:08:40.000000000 +0200
+diff -ru libgsf-1.14.24.old/config.guess libgsf-1.14.24/config.guess
+--- libgsf-1.14.24.old/config.guess 2012-09-03 20:35:09.000000000 +0200
++++ libgsf-1.14.24/config.guess 2012-10-28 13:56:12.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -8,26 +8,37 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
-# 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 Free Software Foundation, Inc.
++# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2009-11-20'
-+timestamp='2011-05-11'
++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
-@@ -56,8 +56,9 @@
+@@ -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 Free
-+Software Foundation, Inc.
++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,16 +140,6 @@
+@@ -139,22 +138,12 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
@@ -44,7 +55,14 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -190,7 +181,7 @@
+ *: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
;;
*)
@@ -53,7 +71,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
;;
esac
# The OS release
-@@ -213,19 +204,19 @@
+@@ -213,19 +202,19 @@
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
@@ -78,7 +96,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
-@@ -233,7 +224,7 @@
+@@ -233,7 +222,7 @@
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
*5.*)
@@ -87,7 +105,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -279,7 +270,10 @@
+@@ -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'`
@@ -99,7 +117,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
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 +284,13 @@
+@@ -290,13 +282,13 @@
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
@@ -116,7 +134,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
-@@ -305,13 +299,13 @@
+@@ -305,13 +297,13 @@
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
@@ -132,7 +150,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
-@@ -404,23 +398,23 @@
+@@ -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:*:*)
@@ -165,7 +183,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
-@@ -490,8 +484,8 @@
+@@ -490,8 +482,8 @@
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
@@ -176,7 +194,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -504,7 +498,7 @@
+@@ -504,7 +496,7 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -185,7 +203,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
exit ;;
-@@ -561,7 +555,7 @@
+@@ -561,7 +553,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
@@ -194,7 +212,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
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 +598,52 @@
+@@ -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`
@@ -224,6 +242,10 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
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>
@@ -255,10 +277,6 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
- }
- exit (0);
- }
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
@@ -288,7 +306,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
EOF
(CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -730,9 +724,9 @@
+@@ -730,9 +722,9 @@
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
@@ -300,7 +318,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
fi
exit ;;
parisc*:Lites*:*:*)
-@@ -740,22 +734,22 @@
+@@ -740,22 +732,22 @@
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
@@ -328,7 +346,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit ;;
-@@ -779,32 +773,32 @@
+@@ -779,32 +771,31 @@
exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -360,22 +378,27 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- case ${UNAME_MACHINE} in
- pc98)
+- case ${UNAME_MACHINE} in
+- pc98)
- echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ echo i386-unknown-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_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
-@@ -814,22 +808,22 @@
+@@ -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
@@ -401,7 +424,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-@@ -848,21 +842,21 @@
+@@ -848,25 +842,32 @@
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
@@ -428,7 +451,18 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
-@@ -876,23 +870,29 @@
+ 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 ;;
@@ -462,17 +496,23 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo cris-axis-linux-gnu
-@@ -901,7 +901,7 @@
- echo crisv32-axis-linux-gnu
+- 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 frv-unknown-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 +912,16 @@
+@@ -912,16 +922,16 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
@@ -493,7 +533,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
-@@ -940,51 +940,54 @@
+@@ -940,51 +950,54 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
@@ -502,7 +542,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
;;
or32:Linux:*:*)
- echo or32-${VENDOR}-linux-gnu
-+ echo or32-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
- echo sparc-${VENDOR}-linux-gnu
@@ -547,14 +587,14 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ tile*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-tilera-linux-gnu
++ 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 x86_64-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
@@ -562,7 +602,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-@@ -993,11 +996,11 @@
+@@ -993,11 +1006,11 @@
echo i386-sequent-sysv4
exit ;;
i*86:UNIX_SV:4.2MP:2.*)
@@ -578,7 +618,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit ;;
i*86:OS/2:*:*)
-@@ -1006,16 +1009,16 @@
+@@ -1006,16 +1019,16 @@
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
@@ -598,7 +638,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
-@@ -1029,13 +1032,13 @@
+@@ -1029,13 +1042,13 @@
fi
exit ;;
i*86:*:5:[678]*)
@@ -614,7 +654,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
-@@ -1057,13 +1060,13 @@
+@@ -1057,13 +1070,13 @@
exit ;;
pc:*:*:*)
# Left here for compatibility:
@@ -631,7 +671,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
Intel:Mach:3*:*)
echo i386-pc-mach3
exit ;;
-@@ -1074,7 +1077,7 @@
+@@ -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.
@@ -640,7 +680,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
fi
exit ;;
mini*:CTIX:SYS*5:*)
-@@ -1098,8 +1101,8 @@
+@@ -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:*)
@@ -651,7 +691,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
NCR*:*:4.2:* | MPRAS*:*:4.2:*)
OS_REL='.3'
test -r /etc/.relid \
-@@ -1111,19 +1114,19 @@
+@@ -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*:*)
@@ -675,7 +715,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
-@@ -1142,10 +1145,10 @@
+@@ -1142,10 +1155,10 @@
echo ns32k-sni-sysv
fi
exit ;;
@@ -690,7 +730,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes openmarket com>.
# How about differentiating between stratus architectures? -djm
-@@ -1171,11 +1174,11 @@
+@@ -1171,11 +1184,11 @@
exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
@@ -705,7 +745,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit ;;
-@@ -1240,6 +1243,9 @@
+@@ -1240,6 +1253,9 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit ;;
@@ -715,7 +755,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit ;;
-@@ -1264,13 +1270,13 @@
+@@ -1264,13 +1280,13 @@
else
UNAME_MACHINE="$cputype"
fi
@@ -732,7 +772,7 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
-@@ -1279,19 +1285,19 @@
+@@ -1279,19 +1295,19 @@
echo pdp10-xkl-tops20
exit ;;
*:TOPS-20:*:*)
@@ -757,7 +797,17 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
case "${UNAME_MACHINE}" in
A*) echo alpha-dec-vms ; exit ;;
I*) echo ia64-dec-vms ; exit ;;
-@@ -1331,11 +1337,11 @@
+@@ -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
@@ -772,9 +822,9 @@ diff -ru libgsf-1.14.21.old/config.guess libgsf-1.14.21/config.guess
#endif
#endif
-diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
---- libgsf-1.14.21.old/config.sub 2011-03-25 00:33:50.000000000 +0100
-+++ libgsf-1.14.21/config.sub 2011-05-22 01:08:40.000000000 +0200
+diff -ru libgsf-1.14.24.old/config.sub libgsf-1.14.24/config.sub
+--- libgsf-1.14.24.old/config.sub 2012-09-03 20:35:09.000000000 +0200
++++ libgsf-1.14.24/config.sub 2012-10-28 13:56:12.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -782,26 +832,37 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
-# 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 Free Software Foundation, Inc.
++# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2009-11-20'
-+timestamp='2011-03-23'
++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
-@@ -75,8 +75,9 @@
+@@ -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 Free
-+Software Foundation, Inc.
++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,8 +124,9 @@
+@@ -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
@@ -813,7 +874,16 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
-@@ -156,8 +158,8 @@
+ 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
;;
@@ -824,7 +894,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
;;
-sim | -cisco | -oki | -wec | -winbond)
os=
-@@ -173,10 +175,10 @@
+@@ -173,10 +177,10 @@
os=-chorusos
basic_machine=$1
;;
@@ -838,7 +908,43 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
-hiux*)
os=-hiuxwe2
;;
-@@ -281,11 +283,13 @@
+@@ -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 \
@@ -851,9 +957,10 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+- | rx \
++ | rl78 | rx \
| score \
-@@ -293,15 +297,24 @@
+ | 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 \
@@ -862,13 +969,16 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
+ | spu \
+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+- | 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
+ ;;
@@ -878,17 +988,21 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
+ c6x)
+ basic_machine=tic6x-unknown
+ ;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
-@@ -313,6 +326,18 @@
+ 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
+ ;;
@@ -900,16 +1014,34 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
-@@ -333,7 +358,7 @@
+@@ -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-* \
-@@ -367,25 +392,28 @@
+ | 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-* \
@@ -922,7 +1054,8 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+- | 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-* \
@@ -933,17 +1066,19 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+ | tahoe-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tile-* | tilegx-* \
++ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+- | 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 +438,7 @@
+@@ -410,7 +458,7 @@
basic_machine=a29k-amd
os=-udi
;;
@@ -952,7 +1087,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
basic_machine=abacus-unknown
;;
adobe68k)
-@@ -480,11 +508,20 @@
+@@ -480,11 +528,20 @@
basic_machine=powerpc-ibm
os=-cnk
;;
@@ -974,7 +1109,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
basic_machine=arm-unknown
os=-cegcc
;;
-@@ -516,7 +553,7 @@
+@@ -516,7 +573,7 @@
basic_machine=craynv-cray
os=-unicosmp
;;
@@ -983,7 +1118,15 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
basic_machine=cr16-unknown
os=-elf
;;
-@@ -732,7 +769,7 @@
+@@ -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
;;
@@ -992,7 +1135,26 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
basic_machine=microblaze-xilinx
;;
mingw32)
-@@ -839,6 +876,12 @@
+@@ -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
;;
@@ -1005,7 +1167,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
nsr-tandem)
basic_machine=nsr-tandem
;;
-@@ -921,9 +964,10 @@
+@@ -921,9 +991,10 @@
;;
power) basic_machine=power-ibm
;;
@@ -1018,7 +1180,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
-@@ -1017,6 +1061,9 @@
+@@ -1017,6 +1088,9 @@
basic_machine=i860-stratus
os=-sysv4
;;
@@ -1028,7 +1190,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
sun2)
basic_machine=m68000-sun
;;
-@@ -1073,17 +1120,10 @@
+@@ -1073,20 +1147,8 @@
basic_machine=t90-cray
os=-unicos
;;
@@ -1043,14 +1205,14 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
-+ # This must be matched before tile*.
-+ tilegx*)
-+ basic_machine=tilegx-unknown
-+ os=-linux-gnu
- ;;
+- ;;
tile*)
- basic_machine=tile-unknown
-@@ -1156,6 +1196,9 @@
+- basic_machine=tile-unknown
++ basic_machine=$basic_machine-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1156,6 +1218,9 @@
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1060,7 +1222,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
ymp)
basic_machine=ymp-cray
os=-unicos
-@@ -1253,11 +1296,11 @@
+@@ -1253,11 +1318,11 @@
if [ x"$os" != x"" ]
then
case $os in
@@ -1076,17 +1238,19 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1294,7 +1337,8 @@
+@@ -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* \
+- | -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 +1385,7 @@
+@@ -1341,7 +1407,7 @@
-opened*)
os=-openedition
;;
@@ -1095,7 +1259,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
os=-os400
;;
-wince*)
-@@ -1390,7 +1434,7 @@
+@@ -1390,7 +1456,7 @@
-sinix*)
os=-sysv4
;;
@@ -1104,7 +1268,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
os=-tpf
;;
-triton*)
-@@ -1435,6 +1479,8 @@
+@@ -1435,6 +1501,8 @@
-dicos*)
os=-dicos
;;
@@ -1113,7 +1277,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
-none)
;;
*)
-@@ -1457,10 +1503,10 @@
+@@ -1457,10 +1525,10 @@
# system, and we'll never get to this point.
case $basic_machine in
@@ -1126,7 +1290,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
os=-elf
;;
*-acorn)
-@@ -1472,8 +1518,17 @@
+@@ -1472,8 +1540,20 @@
arm*-semi)
os=-aout
;;
@@ -1135,6 +1299,9 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
++ hexagon-*)
++ os=-elf
++ ;;
+ tic54x-*)
+ os=-coff
+ ;;
@@ -1146,7 +1313,14 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
;;
# This must come before the *-dec entry.
pdp10-*)
-@@ -1500,7 +1555,7 @@
+@@ -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
;;
@@ -1155,7 +1329,7 @@ diff -ru libgsf-1.14.21.old/config.sub libgsf-1.14.21/config.sub
os=-elf
;;
mips*-cisco)
-@@ -1527,7 +1582,7 @@
+@@ -1527,7 +1604,7 @@
*-ibm)
os=-aix
;;
diff --git a/debian/patches/series b/debian/patches/series
index 0daae23..1a401b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-refresh-config-sub-guess-1.14.21-1
+po-from-git
+refresh-config-sub-guess-1.14.24-1
diff --git a/debian/rules b/debian/rules
index 599fefe..e7be3dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
#export DH_VERBOSE=1
include /usr/share/hardening-includes/hardening.make
+CFLAGS += $(HARDENING_CFLAGS)
+LDFLAGS += $(HARDENING_LDFLAGS)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -50,13 +52,11 @@ so_version_major=$(shell expr $(gsf_version_major) '*' 100 '+' $(gsf_version_min
# Package names
p_libgsf=libgsf-1-$(so_version_major)
-p_libgsf_gnome=libgsf-gnome-1-$(so_version_major)
p_libgsf_common=libgsf-1-common
p_libgsf_bin=libgsf-bin
p_libgsf_dev=libgsf-1-dev
-p_libgsf_gnome_dev=libgsf-gnome-1-dev
p_libgsf_dbg=libgsf-1-$(so_version_major)-dbg
-p_libgsf_gnome_dbg=libgsf-gnome-1-$(so_version_major)-dbg
+p_libgsf_gir=gir1.2-libgsf-1
# Build up the options for "./configure"
confflags := -v
@@ -73,7 +73,7 @@ confflags += --enable-compile-warnings=maximum
# Features
confflags += --with-bz2 --enable-gtk-doc --without-python \
- --with-gio --with-gnome-vfs
+ --with-gio --enable-introspection=yes
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -84,6 +84,7 @@ endif
DPKG_GENSYMBOLS_CHECK_LEVEL ?= 4
export DPKG_GENSYMBOLS_CHECK_LEVEL
+.PHONY: source-updates
source-updates:
# Update files/links generated by autotools
env srcdir=`pwd` NOCONFIGURE=1 sh autogen.sh
@@ -97,6 +98,7 @@ source-updates:
done
rm -rf autom4te.cache
+.PHONY: configure
configure: config-stamp
config-stamp:
dh_testdir
@@ -115,6 +117,7 @@ config-stamp:
touch config-stamp
+.PHONY: build
build: build-stamp
build-stamp: config-stamp
dh_testdir
@@ -124,6 +127,13 @@ build-stamp: config-stamp
touch build-stamp
+.PHONY: build-arch
+build-arch: build-stamp
+
+.PHONY: build-indep
+build-indep: build-stamp
+
+.PHONY: clean
clean:
dh_testdir
dh_testroot
@@ -149,6 +159,7 @@ clean:
dh_clean
+.PHONY: install
install: build
dh_testdir
dh_testroot
@@ -160,14 +171,6 @@ install: build
DESTDIR=$(CURDIR)/debian/tmp \
install
- @if ! test -r $(CURDIR)/debian/tmp/usr/lib/libgsf-gnome-1.so ; then \
- echo "" ; \
- echo "libgsf-gnome-1 didn't get installed properly" ; \
- echo "Perhaps ltmain.sh needs to be regenerated using a libtool package patched" ; \
- echo "with the \"inst-prefix\" patch?" ; \
- exit 1; \
- fi
-
rm -f $(CURDIR)/debian/tmp/usr/lib/libgsf-*.la
mkdir -p $(CURDIR)/debian/tmp/usr/lib/debug
@@ -177,7 +180,7 @@ install: build
ifeq ($(oldlibs_build),1)
# Delete files and directories that belong to packages we don't build
- cat debian/$(p_libgsf_common).install debian/$(p_libgsf_bin).install debian/$(p_libgsf_dev).install debian/$(p_libgsf_gnome_dev).install debian/$(p_libgsf_dbg).install debian/$(p_libgsf_gnome_dbg).install | while read pattern ; do \
+ cat debian/$(p_libgsf_common).install debian/$(p_libgsf_bin).install debian/$(p_libgsf_dev).install debian/$(p_libgsf_dbg).install | while read pattern ; do \
(cd debian/tmp && rm -vrf $$pattern) ; \
done
# Basically all remaining files and directories should belong to a
@@ -194,6 +197,7 @@ endif
# affect _all_ packages. Anything that should only affect one package
# should be put in another target (such as the install target) or be put
# into conditional constructs.
+.PHONY: binary-common
binary-common:
dh_testdir
dh_testroot
@@ -202,15 +206,13 @@ ifeq ($(DH_OPTIONS),-s)
# The -dbg packages don't have separate documentation; link to the
# corresponding runtime packages' documentation.
rm -rvf $(CURDIR)/debian/$(p_libgsf_dbg)/usr/share/doc/$(p_libgsf_dbg)
- rm -rvf $(CURDIR)/debian/$(p_libgsf_gnome_dbg)/usr/share/doc/$(p_libgsf_gnome_dbg)
- # Unfortunately, "-s" overrides "-p" for dh_link messes things up.
+ # Unfortunately, "-s" overriding "-p" for dh_link messes things up.
env -u DH_OPTIONS dh_link -p$(p_libgsf_dbg) /usr/share/doc/$(p_libgsf)/ /usr/share/doc/$(p_libgsf_dbg)
- env -u DH_OPTIONS dh_link -p$(p_libgsf_gnome_dbg) /usr/share/doc/$(p_libgsf)/ /usr/share/doc/$(p_libgsf_gnome_dbg)
# Make the documentation accessible through devhelp.
env -u DH_OPTIONS dh_link -p$(p_libgsf_dev) /usr/share/doc/$(p_libgsf_dev)/html/gsf/ /usr/share/gtk-doc/html/gsf
endif
- dh_installdocs
+ dh_installdocs -N$(p_libgsf_dbg)
dh_installexamples
dh_installmenu
# dh_installdebconf
@@ -237,28 +239,30 @@ ifeq ($(DH_OPTIONS),-s)
# on all architecture-dependent packages we would get wrong shlibs
# here, so we need to undo the "-s".
env -u DH_OPTIONS dh_makeshlibs -p$(p_libgsf) -V '$(p_libgsf) (>= $(upstreamversion))'
- env -u DH_OPTIONS dh_makeshlibs -p$(p_libgsf_gnome) -V '$(p_libgsf_gnome) (>= $(upstreamversion))'
- dh_shlibdeps -s -l debian/$(p_libgsf)/usr/lib/ -L $(p_libgsf) \
- -l debian/$(p_libgsf_gnome)/usr/lib/ -L $(p_libgsf_gnome)
+ dh_shlibdeps -s -l debian/$(p_libgsf)/usr/lib/ -L $(p_libgsf)
endif
+ dh_girepository -p$(p_libgsf_gir)
dh_fixperms
dh_installdeb
dh_gencontrol
dh_md5sums
dh_builddeb
-# Build architecture independant packages using the common target.
+# Build architecture independent packages using the common target.
+.PHONY: binary-indep
binary-indep: build install
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
# Build architecture dependant packages using the common target.
+.PHONY: binary-arch
binary-arch: build install
$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
## Any other binary targets build just one binary package at a time.
+#.PHONY: binary-%
#binary-%: build install
# make -f debian/rules binary-common DH_OPTIONS=-p$*
+.PHONY: binary
binary: binary-indep binary-arch
-.PHONY: source-updates configure build clean binary-indep binary-arch binary-common binary install
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
