diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 2 | ||||
| -rw-r--r-- | libgphoto2_port/po/Makevars | 19 | ||||
| -rw-r--r-- | libgphoto2_port/po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/Makevars | 19 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
7 files changed, 45 insertions, 2 deletions
@@ -1,5 +1,8 @@ libgphoto2 2.5.29.1 development snapshot +general: +* fix parallel builds by requiring gettext 0.19.1 for builds from git (PR #797) + ------------------------------------------------------------------------------ libgphoto2 2.5.29 release diff --git a/configure.ac b/configure.ac index 9ff09a354..43540a6fe 100644 --- a/configure.ac +++ b/configure.ac @@ -283,7 +283,7 @@ GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2], [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}], [po]) AM_PO_SUBDIRS() -AM_GNU_GETTEXT_VERSION([0.18.3]) +AM_GNU_GETTEXT_VERSION([0.19.1]) AM_GNU_GETTEXT([external]) AM_ICONV() diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 674a3145c..cbf2e6f7f 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -122,7 +122,7 @@ GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT], [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}], [po]) AM_PO_SUBDIRS() -AM_GNU_GETTEXT_VERSION([0.18.3]) +AM_GNU_GETTEXT_VERSION([0.19.1]) AM_GNU_GETTEXT([external]) AM_ICONV() diff --git a/libgphoto2_port/po/Makevars b/libgphoto2_port/po/Makevars index 3dee2158f..83ccc129b 100644 --- a/libgphoto2_port/po/Makevars +++ b/libgphoto2_port/po/Makevars @@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # their copyright. COPYRIGHT_HOLDER = Lutz Mueller and others +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -51,3 +58,15 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/libgphoto2_port/po/POTFILES.in b/libgphoto2_port/po/POTFILES.in index ce2212ad3..628cf458c 100644 --- a/libgphoto2_port/po/POTFILES.in +++ b/libgphoto2_port/po/POTFILES.in @@ -1,3 +1,4 @@ +# List of source files which contain translatable strings. libgphoto2_port/gphoto2-port-info-list.c libgphoto2_port/gphoto2-port-log.c libgphoto2_port/gphoto2-port-result.c diff --git a/po/Makevars b/po/Makevars index fed054ec5..14db57126 100644 --- a/po/Makevars +++ b/po/Makevars @@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # their copyright. COPYRIGHT_HOLDER = The gPhoto Team +# This tells whether or not to prepend "GNU " prefix to the package +# name that gets inserted into the header of the $(DOMAIN).pot file. +# Possible values are "yes", "no", or empty. If it is empty, try to +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = no + # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -51,3 +58,15 @@ USE_MSGCTXT = no # --previous to keep previous msgids of translated messages, # --quiet to reduce the verbosity. MSGMERGE_OPTIONS = + +# This tells whether or not to regenerate a PO file when $(DOMAIN).pot +# has changed. Possible values are "yes" and "no". Set this to no if +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes + +# This tells whether or not to forcibly update $(DOMAIN).pot and +# regenerate PO files on "make dist". Possible values are "yes" and +# "no". Set this to no if the POT file and PO files are maintained +# externally. +DIST_DEPENDS_ON_UPDATE_PO = yes diff --git a/po/POTFILES.in b/po/POTFILES.in index 66b88feba..a67617e95 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +# List of source files which contain translatable strings. camlibs/adc65/adc65.c camlibs/agfa-cl20/agfa_cl20.c camlibs/aox/library.c |