aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-03-21 12:45:36 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-03-21 12:45:36 -0500
commit4c91eb5b9deaa92f67af5aedec0abbdeabb92b8f (patch)
tree23b5590d357a88debc9ef641cb489d8410ec6390
parentfdf4d4cc63de1f4151d98bc060a6bf18860d6b6e (diff)
parentaec01584f15604fc49c7b0d4b111dade78f17216 (diff)
downloadayatana-indicator-power-4c91eb5b9deaa92f67af5aedec0abbdeabb92b8f.tar.gz
ayatana-indicator-power-4c91eb5b9deaa92f67af5aedec0abbdeabb92b8f.tar.bz2
ayatana-indicator-power-4c91eb5b9deaa92f67af5aedec0abbdeabb92b8f.zip
Import upstream version 1.93
-rw-r--r--ChangeLog12
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rw-r--r--po/Makevars2
4 files changed, 24 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index b7fe16c..9bb1bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
# Generated by Makefile. Do not edit.
+2012-03-21 Charles Kerr <charles.kerr@canonical.com>
+
+ 1.93
+
+2012-03-17 Charles Kerr <charles.kerr@canonical.com>
+
+ merge lp:~kelemeng/indicator-power/bug957542 to fix extracting translatable strings from ipower (Bug #957542)
+
+2012-03-17 Gabor Kelemen <kelemeng@ubuntu.com>
+
+ Add g_dngettext to the list of known keywords. LP: #957542
+
2012-03-14 Charles Kerr <charles.kerr@canonical.com>
1.91
diff --git a/configure b/configure
index ab60dc0..0e91fa4 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 indicator-power 1.92.
+# Generated by GNU Autoconf 2.68 for indicator-power 1.93.
#
# Report bugs to <http://bugs.launchpad.net/indicator-power>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-power'
PACKAGE_TARNAME='indicator-power'
-PACKAGE_VERSION='1.92'
-PACKAGE_STRING='indicator-power 1.92'
+PACKAGE_VERSION='1.93'
+PACKAGE_STRING='indicator-power 1.93'
PACKAGE_BUGREPORT='http://bugs.launchpad.net/indicator-power'
PACKAGE_URL='http://launchpad.net/indicator-power'
@@ -1384,7 +1384,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 indicator-power 1.92 to adapt to many kinds of systems.
+\`configure' configures indicator-power 1.93 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1454,7 +1454,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-power 1.92:";;
+ short | recursive ) echo "Configuration of indicator-power 1.93:";;
esac
cat <<\_ACEOF
@@ -1586,7 +1586,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-power configure 1.92
+indicator-power configure 1.93
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1864,7 +1864,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 indicator-power $as_me 1.92, which was
+It was created by indicator-power $as_me 1.93, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2688,7 +2688,7 @@ fi
# Define the identity of the package.
PACKAGE='indicator-power'
- VERSION='1.92'
+ VERSION='1.93'
cat >>confdefs.h <<_ACEOF
@@ -15494,7 +15494,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 indicator-power $as_me 1.92, which was
+This file was extended by indicator-power $as_me 1.93, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15561,7 +15561,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="\\
-indicator-power config.status 1.92
+indicator-power config.status 1.93
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 9f2b839..477709b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([indicator-power],
- [1.92],
+ [1.93],
[http://bugs.launchpad.net/indicator-power],
[indicator-power],
[http://launchpad.net/indicator-power])
diff --git a/po/Makevars b/po/Makevars
index 9516d97..383662d 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
top_builddir = ..
# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=g_dngettext:2,3
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding