[Debian-l10n-commits] poedit branch upstream updated. upstream/1.8.7-1-g257089b
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Tue Feb 23 13:18:26 UTC 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "poedit".
The branch, upstream has been updated
via 257089bc458211a9bbbd42a676a85d9051beef24 (commit)
from 38bd80e344feb435db8114f3c75b3b41e14c590a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
configure | 26 +++++++++++++-------------
configure.ac | 8 ++++----
docs/poedit.1 | 4 ++--
src/utility.cpp | 7 +++++--
src/version.h | 2 +-
5 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
index 94b87af..15e2382 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for poedit 1.8.7.
+# Generated by GNU Autoconf 2.68 for poedit 1.8.7.1.
#
# Report bugs to <help at poedit.net>.
#
@@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poedit'
PACKAGE_TARNAME='poedit'
-PACKAGE_VERSION='1.8.7'
-PACKAGE_STRING='poedit 1.8.7'
+PACKAGE_VERSION='1.8.7.1'
+PACKAGE_STRING='poedit 1.8.7.1'
PACKAGE_BUGREPORT='help at poedit.net'
PACKAGE_URL=''
@@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poedit 1.8.7 to adapt to many kinds of systems.
+\`configure' configures poedit 1.8.7.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1401,7 +1401,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poedit 1.8.7:";;
+ short | recursive ) echo "Configuration of poedit 1.8.7.1:";;
esac
cat <<\_ACEOF
@@ -1529,7 +1529,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poedit configure 1.8.7
+poedit configure 1.8.7.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1936,7 +1936,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poedit $as_me 1.8.7, which was
+It was created by poedit $as_me 1.8.7.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2284,7 +2284,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-PACKAGE_SHORT_VERSION=1.8.7
+PACKAGE_SHORT_VERSION=1.8.7.1
ac_aux_dir=
@@ -2828,7 +2828,7 @@ fi
# Define the identity of the package.
PACKAGE='poedit'
- VERSION='1.8.7'
+ VERSION='1.8.7.1'
cat >>confdefs.h <<_ACEOF
@@ -5201,7 +5201,7 @@ _ACEOF
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcpprest >= 2.5" >&5
$as_echo_n "checking for libcpprest >= 2.5... " >&6; }
old_LIBS="$LIBS"
- LIBS="-lcpprest $LIBS"
+ LIBS="-lcpprest -lboost_system -lssl -lcrypto $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5364,7 +5364,7 @@ if test "x$have_cpprest" = "xyes"; then :
$as_echo "#define HAVE_HTTP_CLIENT 1" >>confdefs.h
- CPPREST_LIBS="-lcpprest"
+ CPPREST_LIBS="-lcpprest -lboost_system -lssl -lcrypto"
pkg_failed=no
@@ -7270,7 +7270,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poedit $as_me 1.8.7, which was
+This file was extended by poedit $as_me 1.8.7.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7327,7 +7327,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poedit config.status 1.8.7
+poedit config.status 1.8.7.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 9ea9ed9..74cbc7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([poedit], [1.8.7], [help at poedit.net])
-PACKAGE_SHORT_VERSION=1.8.7
+AC_INIT([poedit], [1.8.7.1], [help at poedit.net])
+PACKAGE_SHORT_VERSION=1.8.7.1
AC_SUBST(PACKAGE_SHORT_VERSION)
AC_CONFIG_AUX_DIR([admin])
@@ -73,7 +73,7 @@ AS_IF([test "x$with_cpprest" != "xno"],
[
AC_MSG_CHECKING([for libcpprest >= 2.5])
old_LIBS="$LIBS"
- LIBS="-lcpprest $LIBS"
+ LIBS="-lcpprest -lboost_system -lssl -lcrypto $LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM(
[
#include <cpprest/version.h>
@@ -96,7 +96,7 @@ AS_IF([test "x$with_cpprest" != "xno"],
AS_IF([test "x$have_cpprest" = "xyes"],
[
AC_DEFINE([HAVE_HTTP_CLIENT])
- CPPREST_LIBS="-lcpprest"
+ CPPREST_LIBS="-lcpprest -lboost_system -lssl -lcrypto"
AC_SUBST(CPPREST_LIBS)
PKG_CHECK_MODULES([LIBSECRET], [libsecret-1], [
CXXFLAGS="$CXXFLAGS $LIBSECRET_CFLAGS"
diff --git a/docs/poedit.1 b/docs/poedit.1
index 841ff16..070260f 100644
--- a/docs/poedit.1
+++ b/docs/poedit.1
@@ -2,12 +2,12 @@
.\" Title: poedit
.\" Author: Vaclav Slavik <vaclav at slavik.io>
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 02/02/2016
+.\" Date: 02/23/2016
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "POEDIT" "1" "02/02/2016" "\ \&" "\ \&"
+.TH "POEDIT" "1" "02/23/2016" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/src/utility.cpp b/src/utility.cpp
index 8f83c5c..1bbed25 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -263,8 +263,11 @@ bool TempOutputFileFor::ReplaceFile(const wxString& temp, const wxString& dest)
return false;
#ifdef __UNIX__
- chown(destPath, st.st_uid, st.st_gid);
- chmod(destPath, st.st_mode);
+ if (overwrite)
+ {
+ chown(destPath, st.st_uid, st.st_gid);
+ chmod(destPath, st.st_mode);
+ }
#endif
return true;
diff --git a/src/version.h b/src/version.h
index a40bf79..9666b15 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
-#define POEDIT_VERSION "1.8.7"
+#define POEDIT_VERSION "1.8.7.1"
#define POEDIT_VERSION_WIN 1,8,7
#endif // _VERSION_H_
-----------------------------------------------------------------------
hooks/post-receive
--
poedit
More information about the Debian-l10n-commits
mailing list