Merge lp:~noskcaj/ubuntu/utopic/gnome-weather/3.12 into lp:ubuntu/utopic/gnome-weather

[Jackson Doak]

New upstream release

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

3. By Jackson Doak on 2014-06-14

* New upstream release.
  - Updates translations. LP: #1313416
* Add extra build-depends needed for tests, but don't enable tests yet

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2014-06-14 06:35:06 +0000
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+

+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+

+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+

+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+

+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+

+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

=== modified file 'Makefile.am'
--- Makefile.am	2014-02-04 06:31:27 +0000
+++ Makefile.am	2014-06-14 06:35:06 +0000
@@ -1,6 +1,7 @@
-ACLOCAL_AMFLAGS = -I m4 -I libgd
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --disable-dogtail
 
-SUBDIRS = po data libgd src
+SUBDIRS = po data libgd src tests
 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
@@ -17,8 +18,35 @@
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs
 
-GITIGNOREFILES = m4/
+GITIGNOREFILES = \
+	.anjuta \
+	.anjuta_sym_db.db \
+	m4/intltool.m4 \
+	m4/libtool.m4 \
+	m4/lt* \
+	rpms/
 
 distdir = $(PACKAGE_TARNAME)-$(VERSION)
 
--include $(top_srcdir)/git.mk
+rpmdefines = \
+	--define "_name $(PACKAGE_NAME)" \
+	--define "_version $(PACKAGE_VERSION)" \
+	--define "_distdir $(PACKAGE_TARNAME)" \
+	--define "_sourcedir $(abs_builddir)" \
+	--define "_specdir $(abs_srcdir)" \
+	--define "_builddir $(abs_builddir)/rpms" \
+	--define "_srcrpmdir $(abs_builddir)/rpms" \
+	--define "_rpmdir $(abs_builddir)/rpms"
+
+rpm: dist
+	@rm -fR $(builddir)/rpms
+	@mkdir $(builddir)/rpms
+	env -i PATH=/usr/bin/:/bin SHELL=$(SHELL) HOSTNAME=$${HOSTNAME} HOME=$${HOME} \
+	rpmbuild $(rpmdefines) -ba $(srcdir)/$(PACKAGE_NAME).spec
+
+clean-local:
+	rm -fR $(builddir)/rpms
+
+EXTRA_DIST = $(PACKAGE_NAME).spec
+
+include $(top_srcdir)/git.mk

=== modified file 'Makefile.in'
--- Makefile.in	2014-02-04 06:31:27 +0000
+++ Makefile.in	2014-06-14 06:35:06 +0000
@@ -13,6 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011 Behdad Esfahbod
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# is permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The latest version of this file can be downloaded from:
+#   https://raw.github.com/behdad/git.mk/master/git.mk
+# Bugs, etc, should be reported upstream at:
+#   https://github.com/behdad/git.mk
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk".  This modifies all Makefile.am files in
+# your project to -include git.mk.  Remember to add that line to new
+# Makefile.am files you create in your project, or just rerun the
+# "make -f git.mk".
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local make targets.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved and I'll diagnose.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# Makefile.am.sample in the git.mk git repo.
+#
+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
+# not tarballs.  It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
+#
+# This makefile provides the following targets:
+#
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -77,17 +143,18 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+DIST_COMMON = $(top_srcdir)/git.mk $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/config.h.in COPYING NEWS \
+	compile config.guess config.sub depcomp install-sh missing \
+	ltmain.sh
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in NEWS compile config.guess config.sub \
-	depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -187,9 +254,9 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
 GZIP_ENV = --best
-DIST_TARGETS = dist-xz dist-gzip
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -223,6 +290,7 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GJS = @GJS@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
@@ -251,6 +319,7 @@
 INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
@@ -329,6 +398,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+installed_test_metadir = @installed_test_metadir@
+installed_testdir = @installed_testdir@
 intltool__v_merge_options_ = @intltool__v_merge_options_@
 intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
@@ -350,8 +421,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I m4 -I libgd
-SUBDIRS = po data libgd src
+ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS}
+DISTCHECK_CONFIGURE_FLAGS = --disable-dogtail
+SUBDIRS = po data libgd src tests
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
@@ -367,15 +439,33 @@
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs
 
-GITIGNOREFILES = m4/
+GITIGNOREFILES = \
+	.anjuta \
+	.anjuta_sym_db.db \
+	m4/intltool.m4 \
+	m4/libtool.m4 \
+	m4/lt* \
+	rpms/
+
 distdir = $(PACKAGE_TARNAME)-$(VERSION)
+rpmdefines = \
+	--define "_name $(PACKAGE_NAME)" \
+	--define "_version $(PACKAGE_VERSION)" \
+	--define "_distdir $(PACKAGE_TARNAME)" \
+	--define "_sourcedir $(abs_builddir)" \
+	--define "_specdir $(abs_srcdir)" \
+	--define "_builddir $(abs_builddir)/rpms" \
+	--define "_srcrpmdir $(abs_builddir)/rpms" \
+	--define "_rpmdir $(abs_builddir)/rpms"
+
+EXTRA_DIST = $(PACKAGE_NAME).spec
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/git.mk $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -398,6 +488,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
+$(top_srcdir)/git.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -756,7 +847,7 @@
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -804,10 +895,6 @@
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
@@ -828,23 +915,191 @@
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
-	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
-
-
--include $(top_srcdir)/git.mk
+	clean-libtool clean-local cscope cscopelist-am ctags ctags-am \
+	dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+rpm: dist
+	@rm -fR $(builddir)/rpms
+	@mkdir $(builddir)/rpms
+	env -i PATH=/usr/bin/:/bin SHELL=$(SHELL) HOSTNAME=$${HOSTNAME} HOME=$${HOME} \
+	rpmbuild $(rpmdefines) -ba $(srcdir)/$(PACKAGE_NAME).spec
+
+clean-local:
+	rm -fR $(builddir)/rpms
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; \
+		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
+		if grep 'include .*/git.mk' $$x >/dev/null; then \
+			echo $$x already includes git.mk; \
+		else \
+			failed=; \
+			echo "Updating $$x"; \
+			{ cat $$x; \
+			  echo ''; \
+			  echo '-include $$(top_srcdir)/git.mk'; \
+			} > $$x.tmp || failed=1; \
+			if test x$$failed = x; then \
+				mv $$x.tmp $$x || failed=1; \
+			fi; \
+			if test x$$failed = x; then : else \
+				echo Failed updating $$x; >&2 \
+				any_failed=1; \
+			fi; \
+	fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	$(AM_V_GEN) \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for lc in $(DOC_LINGUAS); do \
+				for x in \
+					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+					$(DOC_PAGES) \
+					$(DOC_INCLUDES) \
+				; do echo /$$lc/$$x; done; \
+			done; \
+			for x in \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_MOFILES) \
+				$(DOC_H_FILE) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+			for lc in $(HELP_LINGUAS); do \
+				for x in \
+					$(HELP_FILES) \
+					"$$lc.stamp" \
+					"$$lc.mo" \
+				; do echo /$$lc/$$x; done; \
+			done; \
+		fi; \
+		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+			for x in \
+				$(gsettings_SCHEMAS:.xml=.valid) \
+				$(gsettings__enum_file) \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				po/$(GETTEXT_PACKAGE).pot \
+				intltool-extract.in \
+				intltool-merge.in \
+				intltool-update.in \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/configure; then \
+			for x in \
+				autom4te.cache \
+				configure \
+				config.h \
+				stamp-h1 \
+				libtool \
+				config.lt \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DEJATOOL)" = x; then :; else \
+			for x in \
+				$(DEJATOOL) \
+			; do echo /$$x.sum; echo /$$x.log; done; \
+			echo /site.exp; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
+			so_locations \
+			.libs _libs \
+			$(MOSTLYCLEANFILES) \
+			"*.$(OBJEXT)" \
+			"*.lo" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+			".dirstamp" \
+		; do echo /$$x; done; \
+	} | \
+	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LC_ALL=C sort | uniq > $@.tmp && \
+	mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+gitignore-recurse-maybe:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	    test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \
+	done
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'NEWS'
--- NEWS	2014-02-04 06:31:27 +0000
+++ NEWS	2014-06-14 06:35:06 +0000
@@ -1,3 +1,67 @@
+3.12.1
+======
+* Translation updates
+
+3.12.0
+======
+* Translation updates
+
+3.11.92
+=======
+* Fix alignment of placeholder text for first run [#721732]
+* Build fixes [Shivani Poddar, #725942]
+* Translation updates
+
+3.11.91
+=======
+* Fix problem loading the app without network connectivity
+* Fix running tests with a11y disabled [Vadim Rutkovsky, #725152]
+* Fix running tests against old pygobject+glib [Shivani Poddar, #725398]
+* Fix automake requirement [Pranav Kant, #725427]
+* Translation updates
+
+3.11.90
+=======
+* Fixed a crash at shutdown, caused by a destroy vfunc
+* Added coverage reports for tests
+* Updated for unstable GTK+ API changes (GtkActionBox)
+* Fixed the sensitivity of Add in new location dialog
+  [Saurabh_P, #724416]
+* Once again, changes to the build and deployment infrastructure...
+* Translation updates
+
+3.11.5
+======
+* JS sources are now loaded from a GResource, which should
+  improve startup times as it requires fewer seeks on disk
+* All dialogs were converted to use a header bar
+* A new infrastructure for application tests exists, and
+  minimal automated testing for the world view is included
+* Translation updates
+
+3.11.4
+======
+* Fixes for RTL layouts [Yosef Or Boczko, #721123]
+* Updates to the packaging system
+* Added the ability to build an RPM from the upstream tarball.
+* Replaced GtkHeaderBar with GtkActionBar (and gtk+ dependency
+  raised)
+* Fixed the .desktop file for legacy environments (not using
+  GIO to launch the application)
+* Translation updates
+
+3.11.3
+======
+* Always show a title in the header bar [#720322]
+* CityView is now consistent with other apps wrt the back
+  button [#720321]
+* We now follow the HIGs for standard items in the app menu
+* The sidebar can show forecast for today and tomorrow at
+  all times
+* We no longer show the night before the day, which was reported
+  as confusing
+* Translation updates
+
 3.10.1
 ======
 * Translation updates and fixes

=== modified file 'aclocal.m4'
--- aclocal.m4	2014-02-04 06:31:27 +0000
+++ aclocal.m4	2014-06-14 06:35:06 +0000
@@ -20,435 +20,6 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <[e-mail]>, 1995-2000.
-dnl   Bruno Haible <[e-mail]>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <[e-mail]>.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes ],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
-        ])
-elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-        ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
-    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-    [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
-    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
-    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-    [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
-dnl GLIB_GSETTINGS
-dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
-dnl the schema should be compiled
-dnl
-
-AC_DEFUN([GLIB_GSETTINGS],
-[
-  m4_pattern_allow([AM_V_GEN])
-  AC_ARG_ENABLE(schemas-compile,
-                AS_HELP_STRING([--disable-schemas-compile],
-                               [Disable regeneration of gschemas.compiled on install]),
-                [case ${enableval} in
-                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
-                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
-                 esac])
-  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
-  PKG_PROG_PKG_CONFIG([0.16])
-  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
-  if test x$cross_compiling != xyes; then
-    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
-  else
-    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
-  fi
-  AC_SUBST(GLIB_COMPILE_SCHEMAS)
-  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
-    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
-  else
-    ifelse([$1],,[:],[$1])
-  fi
-
-  GSETTINGS_RULES='
-.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-
-mostlyclean-am: clean-gsettings-schemas
-
-gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-
-%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
-
-all-am: $(gsettings_SCHEMAS:.xml=.valid)
-uninstall-am: uninstall-gsettings-schemas
-install-data-am: install-gsettings-schemas
-
-.SECONDARY: $(gsettings_SCHEMAS)
-
-install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-	fi
-
-uninstall-gsettings-schemas:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
-	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-
-clean-gsettings-schemas:
-	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
-
-ifdef gsettings_ENUM_NAMESPACE
-$(gsettings__enum_file): $(gsettings_ENUM_FILES)
-	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
-endif
-'
-  _GSETTINGS_SUBST(GSETTINGS_RULES)
-])
-
-dnl _GSETTINGS_SUBST(VARIABLE)
-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-AC_DEFUN([_GSETTINGS_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-	dnl Canonicalize enable_introspection
-	enable_introspection=$found_introspection
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
-
 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1515,7 +1086,437 @@
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <[e-mail]>, 1995-2000.
+dnl   Bruno Haible <[e-mail]>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <[e-mail]>.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AS_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+dnl -*- mode: autoconf -*-
+dnl Copyright 2009 Johan Dahlin
+dnl
+dnl This file is free software; the author(s) gives unlimited
+dnl permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+
+# serial 1
+
+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+[
+    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
+
+    dnl enable/disable introspection
+    m4_if([$2], [require],
+    [dnl
+        enable_introspection=yes
+    ],[dnl
+        AC_ARG_ENABLE(introspection,
+                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+                                 [Enable introspection for this build]),, 
+                                 [enable_introspection=auto])
+    ])dnl
+
+    AC_MSG_CHECKING([for gobject-introspection])
+
+    dnl presence/version checking
+    AS_CASE([$enable_introspection],
+    [no], [dnl
+        found_introspection="no (disabled, use --enable-introspection to enable)"
+    ],dnl
+    [yes],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
+                         found_introspection=yes,
+                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+    ],dnl
+    [auto],[dnl
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+	dnl Canonicalize enable_introspection
+	enable_introspection=$found_introspection
+    ],dnl
+    [dnl	
+        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+    ])dnl
+
+    AC_MSG_RESULT([$found_introspection])
+
+    INTROSPECTION_SCANNER=
+    INTROSPECTION_COMPILER=
+    INTROSPECTION_GENERATE=
+    INTROSPECTION_GIRDIR=
+    INTROSPECTION_TYPELIBDIR=
+    if test "x$found_introspection" = "xyes"; then
+       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+    fi
+    AC_SUBST(INTROSPECTION_SCANNER)
+    AC_SUBST(INTROSPECTION_COMPILER)
+    AC_SUBST(INTROSPECTION_GENERATE)
+    AC_SUBST(INTROSPECTION_GIRDIR)
+    AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
+
+    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+])
+
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
+
+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
+])
+
+dnl Usage:
+dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
+
+
+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
+[
+  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
+])
+
 m4_include([libgd/libgd.m4])
+m4_include([m4/glibtests.m4])
 m4_include([m4/intltool.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])

=== modified file 'configure'
--- configure	2014-02-04 06:31:27 +0000
+++ configure	2014-06-14 06:35:06 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for org.gnome.Weather.Application 3.10.1.
+# Generated by GNU Autoconf 2.69 for org.gnome.Weather.Application 3.12.1.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-weather>.
 #
@@ -591,10 +591,10 @@
 # Identity of this package.
 PACKAGE_NAME='org.gnome.Weather.Application'
 PACKAGE_TARNAME='gnome-weather'
-PACKAGE_VERSION='3.10.1'
-PACKAGE_STRING='org.gnome.Weather.Application 3.10.1'
+PACKAGE_VERSION='3.12.1'
+PACKAGE_STRING='org.gnome.Weather.Application 3.12.1'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-weather'
-PACKAGE_URL='https://live.gnome.org/Design/Apps/Weather'
+PACKAGE_URL='https://wiki.gnome.org/Apps/Weather'
 
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -637,6 +637,18 @@
 LTLIBOBJS
 LIBOBJS
 GLIB_COMPILE_RESOURCES
+installed_testdir
+installed_test_metadir
+ENABLE_ALWAYS_BUILD_TESTS_FALSE
+ENABLE_ALWAYS_BUILD_TESTS_TRUE
+ENABLE_INSTALLED_TESTS_FALSE
+ENABLE_INSTALLED_TESTS_TRUE
+ENABLE_COVERAGE_FALSE
+ENABLE_COVERAGE_TRUE
+GENHTML
+LCOV
+ENABLE_DOGTAIL_FALSE
+ENABLE_DOGTAIL_TRUE
 GJS
 DEPS_LIBS
 DEPS_CFLAGS
@@ -858,6 +870,10 @@
 with_sysroot
 enable_libtool_lock
 enable_schemas_compile
+enable_dogtail
+enable_coverage
+enable_installed_tests
+enable_always_build_tests
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1415,7 +1431,7 @@
   # 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 org.gnome.Weather.Application 3.10.1 to adapt to many kinds of systems.
+\`configure' configures org.gnome.Weather.Application 3.12.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1485,7 +1501,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of org.gnome.Weather.Application 3.10.1:";;
+     short | recursive ) echo "Configuration of org.gnome.Weather.Application 3.12.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1507,6 +1523,12 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
+  --enable-dogtail        test using dogtail [default=yes]
+  --enable-coverage       enable code coverage
+  --enable-installed-tests
+                          Enable installation of some test cases
+  --enable-always-build-tests
+                          Enable always building tests during 'make all'
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1541,7 +1563,7 @@
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-weather>.
-org.gnome.Weather.Application home page: <https://live.gnome.org/Design/Apps/Weather>.
+org.gnome.Weather.Application home page: <https://wiki.gnome.org/Apps/Weather>.
 _ACEOF
 ac_status=$?
 fi
@@ -1604,7 +1626,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-org.gnome.Weather.Application configure 3.10.1
+org.gnome.Weather.Application configure 3.12.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1882,7 +1904,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by org.gnome.Weather.Application $as_me 3.10.1, which was
+It was created by org.gnome.Weather.Application $as_me 3.12.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2750,7 +2772,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-weather'
- VERSION='3.10.1'
+ VERSION='3.12.1'
 
 
 # Some tools Automake needs.
@@ -7722,7 +7744,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -7740,7 +7762,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -7759,7 +7784,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -13854,7 +13882,7 @@
 gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
 
 %.gschema.valid: %.gschema.xml $(gsettings__enum_file)
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@
 
 all-am: $(gsettings_SCHEMAS:.xml=.valid)
 uninstall-am: uninstall-gsettings-schemas
@@ -13981,7 +14009,7 @@
 
 
 
-
+GJS_MIN_VERSION=1.39.91
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5
@@ -13996,14 +14024,16 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= \$GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdk-3.0
                            gdk-pixbuf-2.0
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -14013,7 +14043,8 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -14031,14 +14062,16 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= \$GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdk-3.0
                            gdk-pixbuf-2.0
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -14048,7 +14081,8 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -14075,7 +14109,8 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5" 2>&1`
         else
 	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-3.0
@@ -14083,7 +14118,8 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -14094,7 +14130,8 @@
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5) were not met:
 
 $DEPS_PKG_ERRORS
@@ -14169,10 +14206,297 @@
 
 
 
+# Check whether --enable-dogtail was given.
+if test "${enable_dogtail+set}" = set; then :
+  enableval=$enable_dogtail;
+else
+  enable_dogtail=yes
+fi
+
+ if test "$enable_dogtail" != no; then
+  ENABLE_DOGTAIL_TRUE=
+  ENABLE_DOGTAIL_FALSE='#'
+else
+  ENABLE_DOGTAIL_TRUE='#'
+  ENABLE_DOGTAIL_FALSE=
+fi
+
+# coverage
+# Check whether --enable-coverage was given.
+if test "${enable_coverage+set}" = set; then :
+  enableval=$enable_coverage;
+else
+  enable_coverage=no
+fi
+
+if test x$enable_coverage = xyes; then
+    if test x$GCC != xyes; then
+        as_fn_error $? "GCC is required for --enable-coverage" "$LINENO" 5
+    fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lcov", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lcov; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_LCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $LCOV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_LCOV="$LCOV" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_LCOV="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+LCOV=$ac_cv_path_LCOV
+if test -n "$LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5
+$as_echo "$LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_LCOV"; then
+  ac_pt_LCOV=$LCOV
+  # Extract the first word of "lcov", so it can be a program name with args.
+set dummy lcov; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_LCOV+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_LCOV in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_LCOV="$ac_pt_LCOV" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_LCOV="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_LCOV=$ac_cv_path_ac_pt_LCOV
+if test -n "$ac_pt_LCOV"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_LCOV" >&5
+$as_echo "$ac_pt_LCOV" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_LCOV" = x; then
+    LCOV=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LCOV=$ac_pt_LCOV
+  fi
+else
+  LCOV="$ac_cv_path_LCOV"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}genhtml", so it can be a program name with args.
+set dummy ${ac_tool_prefix}genhtml; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GENHTML+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GENHTML in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GENHTML="$GENHTML" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GENHTML="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GENHTML=$ac_cv_path_GENHTML
+if test -n "$GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5
+$as_echo "$GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_GENHTML"; then
+  ac_pt_GENHTML=$GENHTML
+  # Extract the first word of "genhtml", so it can be a program name with args.
+set dummy genhtml; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_GENHTML+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_GENHTML in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_GENHTML="$ac_pt_GENHTML" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_GENHTML="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_GENHTML=$ac_cv_path_ac_pt_GENHTML
+if test -n "$ac_pt_GENHTML"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GENHTML" >&5
+$as_echo "$ac_pt_GENHTML" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_GENHTML" = x; then
+    GENHTML=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    GENHTML=$ac_pt_GENHTML
+  fi
+else
+  GENHTML="$ac_cv_path_GENHTML"
+fi
+
+
+    if test x$LCOV = x || test x$GENHTML = x; then
+        as_fn_error $? "lcov and genhtml are required for --enable-coverage" "$LINENO" 5
+    fi
+
+    # only enable these if we ever want code coverage for libgd
+    # (which we don't)
+    #CFLAGS="$CFLAGS -g -O0 --coverage"
+    #CXXFLAGS="$CXXFLAGS -g -O0 --coverage"
+    #LIBS="$LIBS -lgcov"
+fi
+ if test x$enable_coverage = xyes; then
+  ENABLE_COVERAGE_TRUE=
+  ENABLE_COVERAGE_FALSE='#'
+else
+  ENABLE_COVERAGE_TRUE='#'
+  ENABLE_COVERAGE_FALSE=
+fi
+
+
+
+  # Check whether --enable-installed-tests was given.
+if test "${enable_installed_tests+set}" = set; then :
+  enableval=$enable_installed_tests; case ${enableval} in
+                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
+                  no)  ENABLE_INSTALLED_TESTS="" ;;
+                  *) as_fn_error $? "bad value ${enableval} for --enable-installed-tests" "$LINENO" 5 ;;
+                 esac
+fi
+
+   if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+  ENABLE_INSTALLED_TESTS_TRUE=
+  ENABLE_INSTALLED_TESTS_FALSE='#'
+else
+  ENABLE_INSTALLED_TESTS_TRUE='#'
+  ENABLE_INSTALLED_TESTS_FALSE=
+fi
+
+  # Check whether --enable-always-build-tests was given.
+if test "${enable_always_build_tests+set}" = set; then :
+  enableval=$enable_always_build_tests; case ${enableval} in
+                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
+                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
+                  *) as_fn_error $? "bad value ${enableval} for --enable-always-build-tests" "$LINENO" 5 ;;
+                 esac
+fi
+
+   if test "$ENABLE_ALWAYS_BUILD_TESTS" = "1"; then
+  ENABLE_ALWAYS_BUILD_TESTS_TRUE=
+  ENABLE_ALWAYS_BUILD_TESTS_FALSE='#'
+else
+  ENABLE_ALWAYS_BUILD_TESTS_TRUE='#'
+  ENABLE_ALWAYS_BUILD_TESTS_FALSE=
+fi
+
+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+    installed_test_metadir=${datadir}/installed-tests/org.gnome.Weather.Application
+
+    installed_testdir=${libexecdir}/installed-tests/org.gnome.Weather.Application
+
+  fi
+
+
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile libgd/Makefile src/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile data/Makefile data/icons/Makefile libgd/Makefile src/Makefile tests/Makefile po/Makefile.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14387,6 +14711,22 @@
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_DOGTAIL_TRUE}" && test -z "${ENABLE_DOGTAIL_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_DOGTAIL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_COVERAGE_TRUE}" && test -z "${ENABLE_COVERAGE_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_COVERAGE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_INSTALLED_TESTS_TRUE}" && test -z "${ENABLE_INSTALLED_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_INSTALLED_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_ALWAYS_BUILD_TESTS_TRUE}" && test -z "${ENABLE_ALWAYS_BUILD_TESTS_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_ALWAYS_BUILD_TESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -14784,7 +15124,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by org.gnome.Weather.Application $as_me 3.10.1, which was
+This file was extended by org.gnome.Weather.Application $as_me 3.12.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14845,13 +15185,13 @@
 $config_commands
 
 Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-weather>.
-org.gnome.Weather.Application home page: <https://live.gnome.org/Design/Apps/Weather>."
+org.gnome.Weather.Application home page: <https://wiki.gnome.org/Apps/Weather>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-org.gnome.Weather.Application config.status 3.10.1
+org.gnome.Weather.Application config.status 3.12.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15265,6 +15605,7 @@
     "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
     "libgd/Makefile") CONFIG_FILES="$CONFIG_FILES libgd/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 

=== modified file 'configure.ac'
--- configure.ac	2014-02-04 06:31:27 +0000
+++ configure.ac	2014-06-14 06:35:06 +0000
@@ -1,13 +1,13 @@
 AC_PREREQ(2.63)
-AC_INIT([org.gnome.Weather.Application],[3.10.1],
+AC_INIT([org.gnome.Weather.Application],[3.12.1],
 	[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-weather],
 	[gnome-weather],
-	[https://live.gnome.org/Design/Apps/Weather])
+	[https://wiki.gnome.org/Apps/Weather])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.11 dist-xz foreign tar-ustar no-define -Wno-portability])
+AM_INIT_AUTOMAKE([1.12 dist-xz no-dist-gzip foreign tar-ustar no-define serial-tests -Wno-portability])
 # revert automake using PACKAGE_TARNAME instead of PACKAGE_NAME
 AC_SUBST([PACKAGE], [$PACKAGE_NAME])
 
@@ -29,17 +29,50 @@
 
 GLIB_GSETTINGS
 GOBJECT_INTROSPECTION_REQUIRE([1.35.9])
-
+GJS_MIN_VERSION=1.39.91
 PKG_CHECK_MODULES([DEPS], [gdk-3.0
                            gdk-pixbuf-2.0
                            gio-2.0
                            glib-2.0
                            gobject-2.0
-                           gtk+-3.0 >= 3.9.4
+                           gtk+-3.0 >= 3.11.4
+                           gjs-1.0 >= $GJS_MIN_VERSION
                            gweather-3.0 >= 3.9.5])
 
 AC_PATH_PROG([GJS],[gjs])
 
+AC_ARG_ENABLE(dogtail,
+              [AS_HELP_STRING([--enable-dogtail],
+                              [test using dogtail [default=yes]])],,
+              enable_dogtail=yes)
+AM_CONDITIONAL(ENABLE_DOGTAIL, test "$enable_dogtail" != no)
+# coverage
+AC_ARG_ENABLE([coverage],
+              [AS_HELP_STRING([--enable-coverage],
+                              [enable code coverage])],
+              , [enable_coverage=no])
+if test x$enable_coverage = xyes; then
+    if test x$GCC != xyes; then
+        AC_MSG_ERROR([GCC is required for --enable-coverage])
+    fi
+
+    AC_PATH_TOOL([LCOV], [lcov])
+    AC_PATH_TOOL([GENHTML], [genhtml])
+
+    if test x$LCOV = x || test x$GENHTML = x; then
+        AC_MSG_ERROR([lcov and genhtml are required for --enable-coverage])
+    fi
+
+    # only enable these if we ever want code coverage for libgd
+    # (which we don't)
+    #CFLAGS="$CFLAGS -g -O0 --coverage"
+    #CXXFLAGS="$CXXFLAGS -g -O0 --coverage"
+    #LIBS="$LIBS -lgcov"
+fi
+AM_CONDITIONAL([ENABLE_COVERAGE], [test x$enable_coverage = xyes])
+
+GLIB_TESTS
+
 GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
@@ -49,6 +82,7 @@
   data/icons/Makefile
   libgd/Makefile
   src/Makefile
+  tests/Makefile
   po/Makefile.in
 ])
 AC_OUTPUT

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-02-04 06:31:27 +0000
+++ data/Makefile.am	2014-06-14 06:35:06 +0000
@@ -2,12 +2,12 @@
 # 5 different directory declarations
 SUBDIRS = icons
 
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$(PACKAGE_NAME).gresource.xml)
-$(PACKAGE_NAME).gresource: $(PACKAGE_NAME).gresource.xml $(resource_files)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$(PACKAGE_NAME).data.gresource.xml)
+$(PACKAGE_NAME).data.gresource: $(PACKAGE_NAME).data.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 
 resourcedir = $(pkgdatadir)
-resource_DATA = $(PACKAGE_NAME).gresource
+resource_DATA = $(PACKAGE_NAME).data.gresource
 
 appsdir = $(datadir)/applications
 apps_DATA = $(PACKAGE_NAME).desktop
@@ -30,12 +30,6 @@
 		-e "s|[@]pkglibdir@|$(pkglibdir)|g" \
 		$< > $@
 
-$(PACKAGE_NAME).desktop.in: $(PACKAGE_NAME).desktop.in.in
-	$(AM_V_GEN) sed \
-		-e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-		-e "s|[@]pkgdatadir@|$(pkgdatadir)|g" \
-		-e "s|[@]pkglibdir@|$(pkglibdir)|g" \
-		$< > $@
 
 servicedir = $(datadir)/dbus-1/services
 service_DATA = $(PACKAGE_NAME).service
@@ -45,18 +39,17 @@
 
 EXTRA_DIST = \
 	CREDITS \
-	$(PACKAGE_NAME).desktop.in.in \
+	$(PACKAGE_NAME).desktop.in \
 	$(PACKAGE_NAME).service.in \
-	$(PACKAGE_NAME).gresource.xml \
+	$(PACKAGE_NAME).data.gresource.xml \
 	$(gsettings_SCHEMAS) \
 	$(PACKAGE_NAME).appdata.xml.in \
 	$(resource_files) \
 	$(NULL)
 
 CLEANFILES = \
-	$(PACKAGE_NAME).desktop.in \
 	$(PACKAGE_NAME).service \
-	$(PACKAGE_NAME).gresource \
+	$(PACKAGE_NAME).data.gresource \
 	$(PACKAGE_NAME).appdata.xml \
 	$(apps_DATA) \
 	*.valid \

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2014-02-04 06:31:27 +0000
+++ data/Makefile.in	2014-06-14 06:35:06 +0000
@@ -83,10 +83,10 @@
 	$(dist_searchprovider_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -235,6 +235,7 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GJS = @GJS@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
@@ -263,6 +264,7 @@
 INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
@@ -341,6 +343,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+installed_test_metadir = @installed_test_metadir@
+installed_testdir = @installed_testdir@
 intltool__v_merge_options_ = @intltool__v_merge_options_@
 intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
@@ -366,9 +370,9 @@
 # I chose to use recursive automake so I can use nobase_ and avoid
 # 5 different directory declarations
 SUBDIRS = icons
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$(PACKAGE_NAME).gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/$(PACKAGE_NAME).data.gresource.xml)
 resourcedir = $(pkgdatadir)
-resource_DATA = $(PACKAGE_NAME).gresource
+resource_DATA = $(PACKAGE_NAME).data.gresource
 appsdir = $(datadir)/applications
 apps_DATA = $(PACKAGE_NAME).desktop
 gsettings_SCHEMAS = $(PACKAGE_NAME).gschema.xml
@@ -380,18 +384,17 @@
 dist_searchprovider_DATA = org.gnome.Weather.Application.search-provider.ini
 EXTRA_DIST = \
 	CREDITS \
-	$(PACKAGE_NAME).desktop.in.in \
+	$(PACKAGE_NAME).desktop.in \
 	$(PACKAGE_NAME).service.in \
-	$(PACKAGE_NAME).gresource.xml \
+	$(PACKAGE_NAME).data.gresource.xml \
 	$(gsettings_SCHEMAS) \
 	$(PACKAGE_NAME).appdata.xml.in \
 	$(resource_files) \
 	$(NULL)
 
 CLEANFILES = \
-	$(PACKAGE_NAME).desktop.in \
 	$(PACKAGE_NAME).service \
-	$(PACKAGE_NAME).gresource \
+	$(PACKAGE_NAME).data.gresource \
 	$(PACKAGE_NAME).appdata.xml \
 	$(apps_DATA) \
 	*.valid \
@@ -826,7 +829,7 @@
 	uninstall-dist_searchproviderDATA uninstall-resourceDATA \
 	uninstall-serviceDATA
 
-$(PACKAGE_NAME).gresource: $(PACKAGE_NAME).gresource.xml $(resource_files)
+$(PACKAGE_NAME).data.gresource: $(PACKAGE_NAME).data.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
 
 @INTLTOOL_DESKTOP_RULE@
@@ -842,13 +845,6 @@
 		-e "s|[@]pkglibdir@|$(pkglibdir)|g" \
 		$< > $@
 
-$(PACKAGE_NAME).desktop.in: $(PACKAGE_NAME).desktop.in.in
-	$(AM_V_GEN) sed \
-		-e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
-		-e "s|[@]pkgdatadir@|$(pkgdatadir)|g" \
-		-e "s|[@]pkglibdir@|$(pkglibdir)|g" \
-		$< > $@
-
 # For uninstalled use
 all-local:
 	$(GLIB_COMPILE_SCHEMAS) $(builddir)

=== modified file 'data/app-menu.ui'
--- data/app-menu.ui	2014-02-04 06:31:27 +0000
+++ data/app-menu.ui	2014-06-14 06:35:06 +0000
@@ -23,7 +23,7 @@
     <section>
       <item>
         <attribute name="action">win.about</attribute>
-        <attribute name="label" translatable="yes">About Weather</attribute>
+        <attribute name="label" translatable="yes">About</attribute>
       </item>
       <item>
         <attribute name="action">app.quit</attribute>

=== modified file 'data/city.ui'
--- data/city.ui	2014-02-04 06:31:27 +0000
+++ data/city.ui	2014-06-14 06:35:06 +0000
@@ -29,6 +29,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="column_spacing">20</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="conditions-grid-a11y">
+                        <property name="accessible-name" translatable="yes">Current conditions</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkImage" id="conditions-image">
                         <property name="name">conditions-image</property>
@@ -110,11 +115,16 @@
               <class name="image-button"/>
               <class name="osd"/>
             </style>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="reveal-button-a11y">
+                <property name="accessible-name" translatable="yes">Detailed forecast</property>
+                <property name="accessible-role">7</property><!-- check_box -->
+              </object>
+            </child>
             <child>
               <object class="GtkImage" id="reveal-button-image">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="icon-name">go-previous-symbolic</property>
                 <property name="icon-size">1</property>
               </object>
             </child>

=== modified file 'data/icons/Makefile.in'
--- data/icons/Makefile.in	2014-02-04 06:31:27 +0000
+++ data/icons/Makefile.in	2014-06-14 06:35:06 +0000
@@ -82,10 +82,10 @@
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -171,6 +171,7 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GJS = @GJS@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
@@ -199,6 +200,7 @@
 INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
@@ -277,6 +279,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+installed_test_metadir = @installed_test_metadir@
+installed_testdir = @installed_testdir@
 intltool__v_merge_options_ = @intltool__v_merge_options_@
 intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@

=== modified file 'data/new-location-dialog.ui'
--- data/new-location-dialog.ui	2014-02-04 06:31:27 +0000
+++ data/new-location-dialog.ui	2014-06-14 06:35:06 +0000
@@ -8,22 +8,12 @@
     <property name="type_hint">dialog</property>
     <property name="transient-for">parent-window</property>
     <property name="title" translatable="yes">New Location</property>
+    <property name="use-header-bar">1</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkGrid" id="location-dialog-content">
             <property name="visible">True</property>

=== added file 'data/org.gnome.Weather.Application.data.gresource.xml'
--- data/org.gnome.Weather.Application.data.gresource.xml	1970-01-01 00:00:00 +0000
+++ data/org.gnome.Weather.Application.data.gresource.xml	2014-06-14 06:35:06 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Weather/Application">
+    <file preprocess="xml-stripblanks">app-menu.ui</file>
+    <file preprocess="xml-stripblanks">window.ui</file>
+    <file preprocess="xml-stripblanks">new-location-dialog.ui</file>
+    <file preprocess="xml-stripblanks">city.ui</file>
+    <file>application.css</file>
+    <file>weather-clear.jpg</file>
+    <file>weather-clear-night.jpg</file>
+    <file>weather-few-clouds.jpg</file>
+    <file>weather-few-clouds-night.jpg</file>
+    <file>weather-fog.jpg</file>
+    <file>weather-overcast.jpg</file>
+    <file>weather-showers.jpg</file>
+    <file>weather-snow.jpg</file>
+    <file>weather-storm.jpg</file>
+  </gresource>
+  <gresource prefix="/org/gnome/shell">
+    <file>ShellSearchProvider2.xml</file>
+  </gresource>
+</gresources>

=== added file 'data/org.gnome.Weather.Application.desktop.in'
--- data/org.gnome.Weather.Application.desktop.in	1970-01-01 00:00:00 +0000
+++ data/org.gnome.Weather.Application.desktop.in	2014-06-14 06:35:06 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+_Name=Weather
+_Comment=Show weather conditions and forecast
+Icon=org.gnome.Weather.Application
+Exec=gapplication launch org.gnome.Weather.Application
+DBusActivatable=true
+StartupNotify=true
+Categories=GNOME;GTK;Utility;Core;

=== removed file 'data/org.gnome.Weather.Application.desktop.in.in'
--- data/org.gnome.Weather.Application.desktop.in.in	2014-02-04 06:31:27 +0000
+++ data/org.gnome.Weather.Application.desktop.in.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=Weather
-_Comment=Show weather conditions and forecast
-Icon=@PACKAGE_NAME@
-Exec=@pkgdatadir@/@PACKAGE_NAME@
-DBusActivatable=true
-StartupNotify=true

=== removed file 'data/org.gnome.Weather.Application.gresource.xml'
--- data/org.gnome.Weather.Application.gresource.xml	2014-02-04 06:31:27 +0000
+++ data/org.gnome.Weather.Application.gresource.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/weather">
-    <file preprocess="xml-stripblanks">app-menu.ui</file>
-    <file preprocess="xml-stripblanks">window.ui</file>
-    <file preprocess="xml-stripblanks">new-location-dialog.ui</file>
-    <file preprocess="xml-stripblanks">city.ui</file>
-    <file>application.css</file>
-    <file>weather-clear.jpg</file>
-    <file>weather-clear-night.jpg</file>
-    <file>weather-few-clouds.jpg</file>
-    <file>weather-few-clouds-night.jpg</file>
-    <file>weather-fog.jpg</file>
-    <file>weather-overcast.jpg</file>
-    <file>weather-showers.jpg</file>
-    <file>weather-snow.jpg</file>
-    <file>weather-storm.jpg</file>
-  </gresource>
-  <gresource prefix="/org/gnome/shell">
-    <file>ShellSearchProvider2.xml</file>
-  </gresource>
-</gresources>

=== modified file 'data/org.gnome.Weather.Application.service.in'
--- data/org.gnome.Weather.Application.service.in	2014-02-04 06:31:27 +0000
+++ data/org.gnome.Weather.Application.service.in	2014-06-14 06:35:06 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=@PACKAGE_NAME@
-Exec=@pkgdatadir@/@PACKAGE_NAME@
\ No newline at end of file
+Exec=@pkgdatadir@/@PACKAGE_NAME@ --gapplication-service

=== modified file 'data/window.ui'
--- data/window.ui	2014-02-04 06:31:27 +0000
+++ data/window.ui	2014-06-14 06:35:06 +0000
@@ -76,11 +76,23 @@
       <object class="GtkButton" id="world-button">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="label" translatable="yes">World Weather</property>
+        <property name="action-name">win.go-world</property>
         <property name="valign">center</property>
         <style>
-          <class name="text-button"/>
+          <class name="image-button"/>
         </style>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="world-button-a11y">
+            <property name="accessible-name" translatable="yes">Back</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkImage" id="world-button-image">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon-size">1</property>
+          </object>
+        </child>
       </object>
       <packing>
         <property name="pack_type">start</property>
@@ -96,6 +108,11 @@
         <style>
           <class name="image-button"/>
         </style>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="select-button-a11y">
+            <property name="accessible-name" translatable="yes">Select</property>
+          </object>
+        </child>
         <child>
           <object class="GtkImage" id="select-button-image">
             <property name="visible">True</property>
@@ -133,8 +150,13 @@
         <property name="action-name">win.refresh</property>
         <property name="valign">center</property>
         <style>
-              <class name="image-button"/>
+          <class name="image-button"/>
         </style>
+        <child internal-child="accessible">
+          <object class="AtkObject" id="refresh-button-a11y">
+            <property name="accessible-name" translatable="yes">Refresh</property>
+          </object>
+        </child>
         <child>
           <object class="GtkImage" id="refresh-button-image">
             <property name="visible">True</property>
@@ -171,30 +193,25 @@
       </packing>
     </child>
     <child>
-      <object class="GtkRevealer" id="selection-bar-revealer">
+      <object class="GtkActionBar" id="selection-bar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="no-show-all">True</property>
         <child>
-          <object class="GtkHeaderBar" id="selection-bar">
+          <object class="GtkButton" id="delete-button">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkButton" id="delete-button">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="label" translatable="yes">Delete</property>
-                <property name="action-name">win.delete-selected</property>
-                <property name="valign">center</property>
-                <style>
-                  <class name="text-button"/>
-                </style>
-              </object>
-              <packing>
-                <property name="pack_type">end</property>
-              </packing>
-            </child>
+            <property name="sensitive">False</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">Delete</property>
+            <property name="action-name">win.delete-selected</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="text-button"/>
+            </style>
           </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
         </child>
       </object>
       <packing>

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-04 06:31:27 +0000
+++ debian/changelog	2014-06-14 06:35:06 +0000
@@ -1,3 +1,11 @@
+gnome-weather (3.12.1-0ubuntu1) utopic; urgency=medium
+
+  * New upstream release.
+    - Updates translations. LP: #1313416
+  * Add extra build-depends needed for tests, but don't enable tests yet
+
+ -- Jackson Doak <[e-mail]>  Sat, 14 Jun 2014 12:48:12 +1000
+
 gnome-weather (3.10.1-0ubuntu1) trusty; urgency=low
 
   [ Jackson Doak ]

=== modified file 'debian/control'
--- debian/control	2014-02-04 06:31:27 +0000
+++ debian/control	2014-06-14 06:35:06 +0000
@@ -8,9 +8,13 @@
                intltool (>= 0.26),
                pkg-config,
                libgirepository1.0-dev (>= 1.35.9),
+               libgjs-dev,
                libgtk-3-dev (>= 3.9.4),
                libgweather-3-dev (>= 3.9.5),
-               gjs
+               gjs,
+               python-gi-dev,
+               python-dogtail,
+               libatk1.0-dev
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/experimental/gnome-weather
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/experimental/gnome-weather/

=== modified file 'debian/rules'
--- debian/rules	2014-02-04 06:31:27 +0000
+++ debian/rules	2014-06-14 06:35:06 +0000
@@ -6,3 +6,5 @@
 override_dh_auto_install:
 	dh_auto_install
 	rm -f debian/gnome-weather/usr/lib/*/gnome-weather/*.la
+
+override_dh_auto_test:
\ No newline at end of file

=== added file 'git.mk'
--- git.mk	1970-01-01 00:00:00 +0000
+++ git.mk	2014-06-14 06:35:06 +0000
@@ -0,0 +1,227 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Copyright 2010,2011 Behdad Esfahbod
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# is permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The latest version of this file can be downloaded from:
+#   https://raw.github.com/behdad/git.mk/master/git.mk
+# Bugs, etc, should be reported upstream at:
+#   https://github.com/behdad/git.mk
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk".  This modifies all Makefile.am files in
+# your project to -include git.mk.  Remember to add that line to new
+# Makefile.am files you create in your project, or just rerun the
+# "make -f git.mk".
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local make targets.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved and I'll diagnose.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# Makefile.am.sample in the git.mk git repo.
+#
+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
+# not tarballs.  It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
+#
+# This makefile provides the following targets:
+#
+# - all: "make all" will build all gitignore files.
+# - gitignore: makes all gitignore files in the current dir and subdirs.
+# - .gitignore: make gitignore file for the current dir.
+# - gitignore-recurse: makes all gitignore files in the subdirs.
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; \
+		find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
+		if grep 'include .*/git.mk' $$x >/dev/null; then \
+			echo $$x already includes git.mk; \
+		else \
+			failed=; \
+			echo "Updating $$x"; \
+			{ cat $$x; \
+			  echo ''; \
+			  echo '-include $$(top_srcdir)/git.mk'; \
+			} > $$x.tmp || failed=1; \
+			if test x$$failed = x; then \
+				mv $$x.tmp $$x || failed=1; \
+			fi; \
+			if test x$$failed = x; then : else \
+				echo Failed updating $$x; >&2 \
+				any_failed=1; \
+			fi; \
+	fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	$(AM_V_GEN) \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for lc in $(DOC_LINGUAS); do \
+				for x in \
+					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
+					$(DOC_PAGES) \
+					$(DOC_INCLUDES) \
+				; do echo /$$lc/$$x; done; \
+			done; \
+			for x in \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_MOFILES) \
+				$(DOC_H_FILE) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
+			for lc in $(HELP_LINGUAS); do \
+				for x in \
+					$(HELP_FILES) \
+					"$$lc.stamp" \
+					"$$lc.mo" \
+				; do echo /$$lc/$$x; done; \
+			done; \
+		fi; \
+		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
+			for x in \
+				$(gsettings_SCHEMAS:.xml=.valid) \
+				$(gsettings__enum_file) \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				po/$(GETTEXT_PACKAGE).pot \
+				intltool-extract.in \
+				intltool-merge.in \
+				intltool-update.in \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/configure; then \
+			for x in \
+				autom4te.cache \
+				configure \
+				config.h \
+				stamp-h1 \
+				libtool \
+				config.lt \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DEJATOOL)" = x; then :; else \
+			for x in \
+				$(DEJATOOL) \
+			; do echo /$$x.sum; echo /$$x.log; done; \
+			echo /site.exp; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
+			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
+			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
+			so_locations \
+			.libs _libs \
+			$(MOSTLYCLEANFILES) \
+			"*.$(OBJEXT)" \
+			"*.lo" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+			".dirstamp" \
+		; do echo /$$x; done; \
+	} | \
+	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LC_ALL=C sort | uniq > $@.tmp && \
+	mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+gitignore-recurse-maybe:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	    test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \
+	done
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe

=== added file 'glib-tap.mk'
--- glib-tap.mk	1970-01-01 00:00:00 +0000
+++ glib-tap.mk	2014-06-14 06:35:06 +0000
@@ -0,0 +1,134 @@
+# GLIB - Library of useful C routines
+
+TESTS_ENVIRONMENT= \
+	G_TEST_SRCDIR="$(abs_srcdir)" 		\
+	G_TEST_BUILDDIR="$(abs_builddir)" 	\
+	G_DEBUG=gc-friendly 			\
+	MALLOC_CHECK_=2 			\
+	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
+LOG_COMPILER = $(top_srcdir)/tap-test
+
+NULL =
+
+# initialize variables for unconditional += appending
+BUILT_SOURCES =
+BUILT_EXTRA_DIST =
+CLEANFILES = *.log *.trs
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+TESTS =
+
+installed_test_LTLIBRARIES =
+installed_test_PROGRAMS =
+installed_test_SCRIPTS =
+nobase_installed_test_DATA =
+
+noinst_LTLIBRARIES =
+noinst_PROGRAMS =
+noinst_SCRIPTS =
+noinst_DATA =
+
+check_LTLIBRARIES =
+check_PROGRAMS =
+check_SCRIPTS =
+check_DATA =
+
+# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
+# will belong in exactly one of the following variables.
+#
+# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
+#
+#   test_programs, test_scripts, test_data, test_ltlibraries
+#
+# The above are used to list files that are involved in both uninstalled and installed testing.  The
+# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
+# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
+# installed in the same way as it appears in the package layout.
+#
+# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
+# like so:
+#
+#   installed_test_programs, uninstalled_test_programs
+#   installed_test_scripts, uninstalled_test_scripts
+#   installed_test_data, uninstalled_test_data
+#   installed_test_ltlibraries, uninstalled_test_ltlibraries
+#
+# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
+# that should not themselves be run as testcases (but exist to be used from other testcases):
+#
+#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
+#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
+#
+# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
+# file automatically end up in the tarball.
+#
+#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
+#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
+#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
+#
+# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
+# standard automake convention of not disting programs scripts or data by default.
+#
+# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
+# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
+# gtester.  That's a bit strange for scripts, but it's possible.
+
+TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
+         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
+
+# Note: build even the installed-only targets during 'make check' to ensure that they still work.
+# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
+# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
+# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
+all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
+                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
+all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
+                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
+all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
+                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
+all_test_scripts     += $(all_dist_test_scripts)
+EXTRA_DIST           += $(all_dist_test_scripts)
+all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
+all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
+all_test_data        += $(all_dist_test_data)
+EXTRA_DIST           += $(all_dist_test_data)
+all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
+
+if ENABLE_ALWAYS_BUILD_TESTS
+noinst_LTLIBRARIES += $(all_test_ltlibs)
+noinst_PROGRAMS += $(all_test_programs)
+noinst_SCRIPTS += $(all_test_scripts)
+noinst_DATA += $(all_test_data)
+else
+check_LTLIBRARIES += $(all_test_ltlibs)
+check_PROGRAMS += $(all_test_programs)
+check_SCRIPTS += $(all_test_scripts)
+check_DATA += $(all_test_data)
+endif
+
+if ENABLE_INSTALLED_TESTS
+installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
+                          $(test_extra_programs) $(installed_test_extra_programs)
+installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
+                          $(test_extra_scripts) $(test_installed_extra_scripts)
+installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
+                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
+nobase_installed_test_DATA += $(test_data) $(installed_test_data)
+nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
+installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
+installed_testcases = $(test_programs) $(installed_test_programs) \
+                      $(test_scripts) $(installed_test_scripts) \
+                      $(dist_test_scripts) $(dist_installed_test_scripts)
+
+installed_test_meta_DATA = $(installed_testcases:=.test)
+
+%.test: %$(EXEEXT) Makefile
+	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
+	echo 'Type=session-exclusive' >> $@.tmp; \
+	echo 'Exec=$(installed_testdir)/$(notdir $<)' >> $@.tmp; \
+	mv $@.tmp $@)
+
+CLEANFILES += $(installed_test_meta_DATA)
+endif

=== modified file 'libgd/Makefile.am'
--- libgd/Makefile.am	2014-02-04 06:31:27 +0000
+++ libgd/Makefile.am	2014-06-14 06:35:06 +0000
@@ -199,6 +199,15 @@
 
 nodist_libgd_la_SOURCES += $(tagged_entry_sources)
 EXTRA_DIST += $(tagged_entry_sources)
+
+noinst_PROGRAMS += test-tagged-entry
+test_tagged_entry_SOURCES =				\
+	test-tagged-entry.c				\
+	$(NULL)
+test_tagged_entry_LDADD =				\
+	$(LIBGD_LIBS)				\
+	libgd.la				\
+	$(NULL)
 endif
 
 if LIBGD_GIR

=== modified file 'libgd/Makefile.in'
--- libgd/Makefile.in	2014-02-04 06:31:27 +0000
+++ libgd/Makefile.in	2014-06-14 06:35:06 +0000
@@ -80,7 +80,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
+noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+	$(am__EXEEXT_4)
 @LIBGD_GTK_HACKS_TRUE@am__append_1 = $(gtk_hacks_sources)
 @LIBGD_GTK_HACKS_TRUE@am__append_2 = $(gtk_hacks_sources)
 @LIBGD__VIEW_COMMON_TRUE@am__append_3 = $(view_common_sources)
@@ -110,22 +111,23 @@
 @LIBGD_STACK_TRUE@am__append_27 = test-stack
 @LIBGD_TAGGED_ENTRY_TRUE@am__append_28 = $(tagged_entry_sources)
 @LIBGD_TAGGED_ENTRY_TRUE@am__append_29 = $(tagged_entry_sources)
-@LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_30 = $(srcdir)/Gd-1.0.gir
+@LIBGD_TAGGED_ENTRY_TRUE@am__append_30 = test-tagged-entry
 @LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_31 = $(srcdir)/Gd-1.0.gir
 @LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_32 = $(srcdir)/Gd-1.0.gir
-@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@am__append_33 = $(gir_DATA) $(typelib_DATA)
-@LIBGD_VAPI_TRUE@am__append_34 = $(VAPIS)
+@LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_33 = $(srcdir)/Gd-1.0.gir
+@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@am__append_34 = $(gir_DATA) $(typelib_DATA)
 @LIBGD_VAPI_TRUE@am__append_35 = $(VAPIS)
 @LIBGD_VAPI_TRUE@am__append_36 = $(VAPIS)
+@LIBGD_VAPI_TRUE@am__append_37 = $(VAPIS)
 subdir = libgd
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/intltool.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -226,6 +228,7 @@
 @LIBGD_HEADER_BAR_TRUE@am__EXEEXT_1 = test-header-bar$(EXEEXT)
 @LIBGD_REVEALER_TRUE@am__EXEEXT_2 = test-revealer$(EXEEXT)
 @LIBGD_STACK_TRUE@am__EXEEXT_3 = test-stack$(EXEEXT)
+@LIBGD_TAGGED_ENTRY_TRUE@am__EXEEXT_4 = test-tagged-entry$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 am__test_header_bar_SOURCES_DIST = test-header-bar.c
 @LIBGD_HEADER_BAR_TRUE@am_test_header_bar_OBJECTS =  \
@@ -248,6 +251,14 @@
 test_stack_OBJECTS = $(am_test_stack_OBJECTS)
 @LIBGD_STACK_TRUE@test_stack_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @LIBGD_STACK_TRUE@	libgd.la $(am__DEPENDENCIES_1)
+am__test_tagged_entry_SOURCES_DIST = test-tagged-entry.c
+@LIBGD_TAGGED_ENTRY_TRUE@am_test_tagged_entry_OBJECTS =  \
+@LIBGD_TAGGED_ENTRY_TRUE@	test-tagged-entry.$(OBJEXT) \
+@LIBGD_TAGGED_ENTRY_TRUE@	$(am__objects_1)
+test_tagged_entry_OBJECTS = $(am_test_tagged_entry_OBJECTS)
+@LIBGD_TAGGED_ENTRY_TRUE@test_tagged_entry_DEPENDENCIES =  \
+@LIBGD_TAGGED_ENTRY_TRUE@	$(am__DEPENDENCIES_1) libgd.la \
+@LIBGD_TAGGED_ENTRY_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -284,10 +295,11 @@
 am__v_CCLD_1 = 
 SOURCES = $(libgd_la_SOURCES) $(nodist_libgd_la_SOURCES) \
 	$(test_header_bar_SOURCES) $(test_revealer_SOURCES) \
-	$(test_stack_SOURCES)
+	$(test_stack_SOURCES) $(test_tagged_entry_SOURCES)
 DIST_SOURCES = $(libgd_la_SOURCES) $(am__test_header_bar_SOURCES_DIST) \
 	$(am__test_revealer_SOURCES_DIST) \
-	$(am__test_stack_SOURCES_DIST)
+	$(am__test_stack_SOURCES_DIST) \
+	$(am__test_tagged_entry_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -343,6 +355,7 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GJS = @GJS@
 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
@@ -371,6 +384,7 @@
 INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBGD_CFLAGS = @LIBGD_CFLAGS@
@@ -449,6 +463,8 @@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+installed_test_metadir = @installed_test_metadir@
+installed_testdir = @installed_testdir@
 intltool__v_merge_options_ = @intltool__v_merge_options_@
 intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
@@ -471,15 +487,15 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-CLEANFILES = $(am__append_33)
-MAINTAINERCLEANFILES = $(am__append_32) $(am__append_36)
+CLEANFILES = $(am__append_34)
+MAINTAINERCLEANFILES = $(am__append_33) $(am__append_37)
 EXTRA_DIST = $(catalog_sources) $(am__append_2) $(am__append_4) \
 	$(am__append_6) $(am__append_8) $(am__append_10) \
 	$(am__append_12) $(am__append_14) $(am__append_17) \
 	$(am__append_19) $(am__append_21) $(am__append_23) \
-	$(am__append_26) $(am__append_29) $(am__append_31) \
-	$(am__append_35)
-noinst_DATA = $(am__append_30) $(am__append_34)
+	$(am__append_26) $(am__append_29) $(am__append_32) \
+	$(am__append_36)
+noinst_DATA = $(am__append_31) $(am__append_35)
 AM_CPPFLAGS = \
         -I$(top_srcdir)				\
         -DPREFIX=\"$(prefix)\"			\
@@ -606,6 +622,15 @@
 @LIBGD_TAGGED_ENTRY_TRUE@	libgd/gd-tagged-entry.h			\
 @LIBGD_TAGGED_ENTRY_TRUE@	$(NULL)
 
+@LIBGD_TAGGED_ENTRY_TRUE@test_tagged_entry_SOURCES = \
+@LIBGD_TAGGED_ENTRY_TRUE@	test-tagged-entry.c				\
+@LIBGD_TAGGED_ENTRY_TRUE@	$(NULL)
+
+@LIBGD_TAGGED_ENTRY_TRUE@test_tagged_entry_LDADD = \
+@LIBGD_TAGGED_ENTRY_TRUE@	$(LIBGD_LIBS)				\
+@LIBGD_TAGGED_ENTRY_TRUE@	libgd.la				\
+@LIBGD_TAGGED_ENTRY_TRUE@	$(NULL)
+
 @LIBGD_GIR_TRUE@INTROSPECTION_GIRS = Gd-1.0.gir
 @LIBGD_GIR_TRUE@Gd_1_0_gir_NAMESPACE = Gd
 @LIBGD_GIR_TRUE@Gd_1_0_gir_VERSION = 1.0
@@ -730,6 +755,10 @@
 	@rm -f test-stack$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(test_stack_OBJECTS) $(test_stack_LDADD) $(LIBS)
 
+test-tagged-entry$(EXEEXT): $(test_tagged_entry_OBJECTS) $(test_tagged_entry_DEPENDENCIES) $(EXTRA_test_tagged_entry_DEPENDENCIES) 
+	@rm -f test-tagged-entry$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(test_tagged_entry_OBJECTS) $(test_tagged_entry_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -758,6 +787,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-header-bar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-revealer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stack.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-tagged-entry.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

=== modified file 'libgd/libgd/gd-main-icon-view.c'
--- libgd/libgd/gd-main-icon-view.c	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-main-icon-view.c	2014-06-14 06:35:06 +0000
@@ -26,6 +26,7 @@
 
 #include <math.h>
 #include <glib/gi18n.h>
+#include <cairo-gobject.h>
 
 #define VIEW_ITEM_WIDTH 140
 #define VIEW_ITEM_WRAP_WIDTH 128
@@ -34,6 +35,7 @@
 
 struct _GdMainIconViewPrivate {
   GtkCellRenderer *pixbuf_cell;
+  GtkCellRenderer *text_cell;
   gboolean selection_mode;
 };
 
@@ -56,6 +58,40 @@
 }
 
 static void
+set_attributes_from_model (GdMainIconView *self)
+{
+  GtkTreeModel *model = gtk_icon_view_get_model (GTK_ICON_VIEW (self));
+  GtkCellLayout *layout = GTK_CELL_LAYOUT (self);
+  GType icon_gtype;
+
+  if (!model)
+    return;
+
+  gtk_cell_layout_clear_attributes (layout, self->priv->pixbuf_cell);
+  gtk_cell_layout_clear_attributes (layout, self->priv->text_cell);
+
+  gtk_cell_layout_add_attribute (layout, self->priv->pixbuf_cell,
+                                 "active", GD_MAIN_COLUMN_SELECTED);
+  gtk_cell_layout_add_attribute (layout, self->priv->pixbuf_cell,
+                                 "pulse", GD_MAIN_COLUMN_PULSE);
+
+  icon_gtype = gtk_tree_model_get_column_type (model, GD_MAIN_COLUMN_ICON);
+  if (icon_gtype == GDK_TYPE_PIXBUF)
+    gtk_cell_layout_add_attribute (layout, self->priv->pixbuf_cell,
+				   "pixbuf", GD_MAIN_COLUMN_ICON);
+  else if (icon_gtype == CAIRO_GOBJECT_TYPE_SURFACE)
+    gtk_cell_layout_add_attribute (layout, self->priv->pixbuf_cell,
+				   "surface", GD_MAIN_COLUMN_ICON);
+  else
+    g_assert_not_reached ();
+
+  gtk_cell_layout_add_attribute (layout, self->priv->text_cell,
+                                 "text", GD_MAIN_COLUMN_PRIMARY_TEXT);
+  gtk_cell_layout_add_attribute (layout, self->priv->text_cell,
+                                 "line-two", GD_MAIN_COLUMN_SECONDARY_TEXT);
+}
+
+static void
 gd_main_icon_view_drag_data_get (GtkWidget *widget,
                                  GdkDragContext *drag_context,
                                  GtkSelectionData *data,
@@ -100,14 +136,9 @@
                 "xalign", 0.5,
                 "yalign", 0.5,
                 NULL);
-
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE);
-  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self), cell,
-                                 "active", GD_MAIN_COLUMN_SELECTED);
-  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self), cell,
-                                 "pixbuf", GD_MAIN_COLUMN_ICON);
 
-  cell = gd_two_lines_renderer_new ();
+  self->priv->text_cell = cell = gd_two_lines_renderer_new ();
   g_object_set (cell,
                 "xalign", 0.5,
                 "alignment", PANGO_ALIGN_CENTER,
@@ -116,10 +147,8 @@
                 "text-lines", 3,
                 NULL);
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), cell, FALSE);
-  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self), cell,
-                                 "text", GD_MAIN_COLUMN_PRIMARY_TEXT);
-  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (self), cell,
-                                 "line-two", GD_MAIN_COLUMN_SECONDARY_TEXT);
+
+  set_attributes_from_model (self);
 
   gtk_icon_view_enable_model_drag_source (GTK_ICON_VIEW (self),
                                           GDK_BUTTON1_MASK,
@@ -332,6 +361,9 @@
 gd_main_icon_view_init (GdMainIconView *self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_MAIN_ICON_VIEW, GdMainIconViewPrivate);
+
+  g_signal_connect (self, "notify::model",
+		    G_CALLBACK (set_attributes_from_model), NULL);
 }
 
 static GtkTreePath *

=== modified file 'libgd/libgd/gd-main-list-view.c'
--- libgd/libgd/gd-main-list-view.c	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-main-list-view.c	2014-06-14 06:35:06 +0000
@@ -23,11 +23,14 @@
 #include "gd-main-view-generic.h"
 #include "gd-two-lines-renderer.h"
 
+#include <cairo-gobject.h>
 #include <glib/gi18n.h>
 
 struct _GdMainListViewPrivate {
   GtkTreeViewColumn *tree_col;
+  GtkCellRenderer *pixbuf_cell;
   GtkCellRenderer *selection_cell;
+  GtkCellRenderer *text_cell;
 
   gboolean selection_mode;
 };
@@ -53,6 +56,40 @@
 }
 
 static void
+set_attributes_from_model (GdMainListView *self)
+{
+  GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+  GType icon_gtype;
+
+
+  if (!model)
+    return;
+
+  gtk_tree_view_column_clear_attributes (self->priv->tree_col, self->priv->pixbuf_cell);
+  gtk_tree_view_column_clear_attributes (self->priv->tree_col, self->priv->selection_cell);
+  gtk_tree_view_column_clear_attributes (self->priv->tree_col, self->priv->text_cell);
+
+
+  gtk_tree_view_column_add_attribute (self->priv->tree_col, self->priv->selection_cell,
+                                      "active", GD_MAIN_COLUMN_SELECTED);
+
+  icon_gtype = gtk_tree_model_get_column_type (model, GD_MAIN_COLUMN_ICON);
+  if (icon_gtype == GDK_TYPE_PIXBUF)
+    gtk_tree_view_column_add_attribute (self->priv->tree_col, self->priv->pixbuf_cell,
+					"pixbuf", GD_MAIN_COLUMN_ICON);
+  else if (icon_gtype == CAIRO_GOBJECT_TYPE_SURFACE)
+    gtk_tree_view_column_add_attribute (self->priv->tree_col, self->priv->pixbuf_cell,
+					"surface", GD_MAIN_COLUMN_ICON);
+  else
+    g_assert_not_reached ();
+
+  gtk_tree_view_column_add_attribute (self->priv->tree_col, self->priv->text_cell,
+                                      "text", GD_MAIN_COLUMN_PRIMARY_TEXT);
+  gtk_tree_view_column_add_attribute (self->priv->tree_col, self->priv->text_cell,
+                                      "line-two", GD_MAIN_COLUMN_SECONDARY_TEXT);
+}
+
+static void
 gd_main_list_view_drag_data_get (GtkWidget *widget,
                                  GdkDragContext *drag_context,
                                  GtkSelectionData *data,
@@ -106,10 +143,8 @@
                 "xalign", 1.0,
                 NULL);
   gtk_tree_view_column_pack_start (self->priv->tree_col, cell, FALSE);
-  gtk_tree_view_column_add_attribute (self->priv->tree_col, cell,
-                                      "active", GD_MAIN_COLUMN_SELECTED);
 
-  cell = gtk_cell_renderer_pixbuf_new ();
+  self->priv->pixbuf_cell = cell = gtk_cell_renderer_pixbuf_new ();
   g_object_set (cell,
                 "xalign", 0.5,
                 "yalign", 0.5,
@@ -117,10 +152,8 @@
                 "ypad", 2,
                 NULL);
   gtk_tree_view_column_pack_start (self->priv->tree_col, cell, FALSE);
-  gtk_tree_view_column_add_attribute (self->priv->tree_col, cell,
-                                      "pixbuf", GD_MAIN_COLUMN_ICON);
 
-  cell = gd_two_lines_renderer_new ();
+  self->priv->text_cell = cell = gd_two_lines_renderer_new ();
   g_object_set (cell,
                 "xalign", 0.0,
                 "wrap-mode", PANGO_WRAP_WORD_CHAR,
@@ -128,10 +161,8 @@
                 "text-lines", 2,
                 NULL);
   gtk_tree_view_column_pack_start (self->priv->tree_col, cell, TRUE);
-  gtk_tree_view_column_add_attribute (self->priv->tree_col, cell,
-                                      "text", GD_MAIN_COLUMN_PRIMARY_TEXT);
-  gtk_tree_view_column_add_attribute (self->priv->tree_col, cell,
-                                      "line-two", GD_MAIN_COLUMN_SECONDARY_TEXT);
+
+  set_attributes_from_model (self);
 
   gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (self),
                                           GDK_BUTTON1_MASK,
@@ -181,6 +212,9 @@
 gd_main_list_view_init (GdMainListView *self)
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_MAIN_LIST_VIEW, GdMainListViewPrivate);
+
+  g_signal_connect (self, "notify::model",
+		    G_CALLBACK (set_attributes_from_model), NULL);
 }
 
 static GtkTreePath *

=== modified file 'libgd/libgd/gd-main-view-generic.c'
--- libgd/libgd/gd-main-view-generic.c	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-main-view-generic.c	2014-06-14 06:35:06 +0000
@@ -230,9 +230,18 @@
 {
   gboolean selection = GPOINTER_TO_INT (user_data);
 
-  gtk_list_store_set (GTK_LIST_STORE (model), iter,
-                      GD_MAIN_COLUMN_SELECTED, selection,
-                      -1);
+  if (GTK_IS_LIST_STORE (model))
+    {
+      gtk_list_store_set (GTK_LIST_STORE (model), iter,
+                          GD_MAIN_COLUMN_SELECTED, selection,
+                          -1);
+    }
+  else
+    {
+      gtk_tree_store_set (GTK_TREE_STORE (model), iter,
+                          GD_MAIN_COLUMN_SELECTED, selection,
+                          -1);
+    }
 
   return FALSE;
 }

=== modified file 'libgd/libgd/gd-main-view-generic.h'
--- libgd/libgd/gd-main-view-generic.h	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-main-view-generic.h	2014-06-14 06:35:06 +0000
@@ -36,6 +36,7 @@
   GD_MAIN_COLUMN_ICON,
   GD_MAIN_COLUMN_MTIME,
   GD_MAIN_COLUMN_SELECTED,
+  GD_MAIN_COLUMN_PULSE,
 
   GD_MAIN_COLUMN_LAST
 } GdMainColumns;

=== modified file 'libgd/libgd/gd-main-view.c'
--- libgd/libgd/gd-main-view.c	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-main-view.c	2014-06-14 06:35:06 +0000
@@ -343,6 +343,7 @@
   GtkTreeModel *model;
   GtkTreeModelFilter *filter;
   GtkTreeIter my_iter, child_iter;
+  GtkTreePath *path;
 
   model = self->priv->model;
   my_iter = *iter;
@@ -355,9 +356,26 @@
       my_iter = child_iter;
     }
 
-  gtk_list_store_set (GTK_LIST_STORE (model), &my_iter,
-                      GD_MAIN_COLUMN_SELECTED, value,
-                      -1);
+  if (GTK_IS_LIST_STORE (model))
+    {
+      gtk_list_store_set (GTK_LIST_STORE (model), &my_iter,
+                          GD_MAIN_COLUMN_SELECTED, value,
+                          -1);
+    }
+  else
+    {
+      gtk_tree_store_set (GTK_TREE_STORE (model), &my_iter,
+                          GD_MAIN_COLUMN_SELECTED, value,
+                          -1);
+    }
+
+  /* And tell the view model that something changed */
+  path = gtk_tree_model_get_path (self->priv->model, iter);
+  if (path)
+    {
+      gtk_tree_model_row_changed (self->priv->model, path, iter);
+      gtk_tree_path_free (path);
+    }
 }
 
 static void
@@ -603,6 +621,11 @@
 	{
 	  if (!self->priv->selection_mode)
 	    g_signal_emit (self, signals[SELECTION_MODE_REQUEST], 0);
+	  if (!self->priv->selection_mode)
+	    {
+	      res = FALSE;
+	      goto out;
+	    }
 
 	  start_path = gtk_tree_path_copy (self->priv->rubberband_select_first_path);
 	  end_path = gtk_tree_path_copy (self->priv->rubberband_select_last_path);
@@ -655,7 +678,12 @@
       if (event_triggers_selection_mode (event))
         {
           g_signal_emit (self, signals[SELECTION_MODE_REQUEST], 0);
-          selection_mode = TRUE;
+          if (!self->priv->selection_mode)
+            {
+              res = FALSE;
+              goto out;
+            }
+          selection_mode = self->priv->selection_mode;
         }
     }
 

=== modified file 'libgd/libgd/gd-toggle-pixbuf-renderer.c'
--- libgd/libgd/gd-toggle-pixbuf-renderer.c	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-toggle-pixbuf-renderer.c	2014-06-14 06:35:06 +0000
@@ -26,6 +26,7 @@
 enum {
   PROP_ACTIVE = 1,
   PROP_TOGGLE_VISIBLE,
+  PROP_PULSE,
   NUM_PROPERTIES
 };
 
@@ -34,38 +35,29 @@
 struct _GdTogglePixbufRendererPrivate {
   gboolean active;
   gboolean toggle_visible;
+
+  guint pulse;
 };
 
 static void
-gd_toggle_pixbuf_renderer_render (GtkCellRenderer      *cell,
-                                  cairo_t              *cr,
-                                  GtkWidget            *widget,
-                                  const GdkRectangle   *background_area,
-                                  const GdkRectangle   *cell_area,
-                                  GtkCellRendererState  flags)
+render_check (GdTogglePixbufRenderer *self,
+              cairo_t                *cr,
+              GtkWidget              *widget,
+              const GdkRectangle     *cell_area,
+              gint                    icon_size,
+              gint                    xpad,
+              gint                    ypad)
 {
-  gint icon_size = -1;
-  gint check_x, check_y, x_offset, xpad, ypad;
   GtkStyleContext *context;
-  GdTogglePixbufRenderer *self = GD_TOGGLE_PIXBUF_RENDERER (cell);
+  gint check_x, check_y, x_offset;
   GtkTextDirection direction;
 
-  GTK_CELL_RENDERER_CLASS (gd_toggle_pixbuf_renderer_parent_class)->render
-    (cell, cr, widget,
-     background_area, cell_area, flags);
+  context = gtk_widget_get_style_context (widget);
 
   if (!self->priv->toggle_visible)
     return;
 
-  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
   direction = gtk_widget_get_direction (widget);
-  gtk_widget_style_get (widget,
-                        "check-icon-size", &icon_size,
-                        NULL);
-
-  if (icon_size == -1)
-    icon_size = 40;
-
   if (direction == GTK_TEXT_DIR_RTL)
     x_offset = xpad;
   else
@@ -74,7 +66,6 @@
   check_x = cell_area->x + x_offset;
   check_y = cell_area->y + cell_area->height - icon_size - ypad;
 
-  context = gtk_widget_get_style_context (widget);
   gtk_style_context_save (context);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_CHECK);
 
@@ -84,11 +75,68 @@
   gtk_render_check (context, cr,
                     check_x, check_y,
                     icon_size, icon_size);
-
   gtk_style_context_restore (context);
 }
 
 static void
+render_activity (GdTogglePixbufRenderer *self,
+                 cairo_t                *cr,
+                 GtkWidget              *widget,
+                 const GdkRectangle     *cell_area,
+                 gint                    icon_size,
+                 gint                    xpad,
+                 gint                    ypad)
+{
+  gint x, y, width, height;
+
+  if (self->priv->pulse == 0)
+    return;
+
+  width = cell_area->width / 4;
+  height = cell_area->height / 4;
+
+  x = cell_area->x + (cell_area->width / 2) - (width / 2) - xpad;
+  y = cell_area->y + (cell_area->height / 2) - (height / 2) - ypad;
+
+  gtk_paint_spinner (gtk_widget_get_style (widget),
+                     cr,
+                     GTK_STATE_FLAG_ACTIVE,
+                     widget,
+                     NULL,
+                     (guint) self->priv->pulse - 1,
+                     x, y,
+                     width, height);
+}
+
+static void
+gd_toggle_pixbuf_renderer_render (GtkCellRenderer      *cell,
+                                  cairo_t              *cr,
+                                  GtkWidget            *widget,
+                                  const GdkRectangle   *background_area,
+                                  const GdkRectangle   *cell_area,
+                                  GtkCellRendererState  flags)
+{
+  gint icon_size = -1;
+  GdTogglePixbufRenderer *self = GD_TOGGLE_PIXBUF_RENDERER (cell);
+  gint xpad, ypad;
+
+  GTK_CELL_RENDERER_CLASS (gd_toggle_pixbuf_renderer_parent_class)->render
+    (cell, cr, widget,
+     background_area, cell_area, flags);
+
+  gtk_cell_renderer_get_padding (cell, &xpad, &ypad);
+  gtk_widget_style_get (widget,
+                        "check-icon-size", &icon_size,
+                        NULL);
+
+  if (icon_size == -1)
+    icon_size = 40;
+
+  render_activity (self, cr, widget, cell_area, icon_size, xpad, ypad);
+  render_check (self, cr, widget, cell_area, icon_size, xpad, ypad);
+}
+
+static void
 gd_toggle_pixbuf_renderer_get_size (GtkCellRenderer *cell,
                                     GtkWidget       *widget,
                                     const GdkRectangle *cell_area,
@@ -126,6 +174,9 @@
     case PROP_TOGGLE_VISIBLE:
       g_value_set_boolean (value, self->priv->toggle_visible);
       break;
+    case PROP_PULSE:
+      g_value_set_uint (value, self->priv->pulse);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -148,6 +199,9 @@
     case PROP_TOGGLE_VISIBLE:
       self->priv->toggle_visible = g_value_get_boolean (value);
       break;
+    case PROP_PULSE:
+      self->priv->pulse = g_value_get_uint (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -179,6 +233,16 @@
                           FALSE,
                           G_PARAM_READWRITE |
                           G_PARAM_STATIC_STRINGS);
+  properties[PROP_PULSE] =
+    g_param_spec_uint ("pulse",
+		       "Pulse",
+		       "Set to any value other than 0 to display a "
+		       "spinner on top of the pixbuf.",
+		       0,
+		       G_MAXUINT,
+		       0,
+		       G_PARAM_READWRITE |
+		       G_PARAM_STATIC_STRINGS);
 
   g_type_class_add_private (klass, sizeof (GdTogglePixbufRendererPrivate));
   g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
@@ -189,6 +253,7 @@
 {
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_TOGGLE_PIXBUF_RENDERER,
                                             GdTogglePixbufRendererPrivate);
+  self->priv->pulse = 0;
 }
 
 GtkCellRenderer *

=== modified file 'libgd/libgd/gd-types-catalog.c'
--- libgd/libgd/gd-types-catalog.c	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd-types-catalog.c	2014-06-14 06:35:06 +0000
@@ -26,12 +26,12 @@
 #ifdef LIBGD__VIEW_COMMON
 # include "gd-main-view-generic.h"
 # include "gd-styled-text-renderer.h"
-# include "gd-toggle-pixbuf-renderer.h"
 # include "gd-two-lines-renderer.h"
 #endif
 
 #ifdef LIBGD_MAIN_ICON_VIEW
 # include "gd-main-icon-view.h"
+# include "gd-toggle-pixbuf-renderer.h"
 #endif
 
 #ifdef LIBGD_MAIN_LIST_VIEW
@@ -87,12 +87,12 @@
 #ifdef LIBGD__VIEW_COMMON
   g_type_ensure (GD_TYPE_MAIN_VIEW_GENERIC);
   g_type_ensure (GD_TYPE_STYLED_TEXT_RENDERER);
-  g_type_ensure (GD_TYPE_TOGGLE_PIXBUF_RENDERER);
   g_type_ensure (GD_TYPE_TWO_LINES_RENDERER);
 #endif
 
 #ifdef LIBGD_MAIN_ICON_VIEW
   g_type_ensure (GD_TYPE_MAIN_ICON_VIEW);
+  g_type_ensure (GD_TYPE_TOGGLE_PIXBUF_RENDERER);
 #endif
 
 #ifdef LIBGD_MAIN_LIST_VIEW

=== modified file 'libgd/libgd/gd.h'
--- libgd/libgd/gd.h	2014-02-04 06:31:27 +0000
+++ libgd/libgd/gd.h	2014-06-14 06:35:06 +0000
@@ -38,12 +38,12 @@
 #ifdef LIBGD__VIEW_COMMON
 # include <libgd/gd-main-view-generic.h>
 # include <libgd/gd-styled-text-renderer.h>
-# include <libgd/gd-toggle-pixbuf-renderer.h>
 # include <libgd/gd-two-lines-renderer.h>
 #endif
 
 #ifdef LIBGD_MAIN_ICON_VIEW
 # include <libgd/gd-main-icon-view.h>
+# include <libgd/gd-toggle-pixbuf-renderer.h>
 #endif
 
 #ifdef LIBGD_MAIN_LIST_VIEW

=== added file 'libgd/test-tagged-entry.c'
--- libgd/test-tagged-entry.c	1970-01-01 00:00:00 +0000
+++ libgd/test-tagged-entry.c	2014-06-14 06:35:06 +0000
@@ -0,0 +1,111 @@
+#include <gtk/gtk.h>
+#include <libgd/gd-tagged-entry.h>
+
+static GdTaggedEntryTag *toggle_tag;
+
+static void
+on_tag_clicked (GdTaggedEntry *entry,
+                GdTaggedEntryTag *tag,
+                gpointer useless)
+{
+  g_print ("tag clicked: %s\n", gd_tagged_entry_tag_get_label (tag));
+}
+
+static void
+on_tag_button_clicked (GdTaggedEntry *entry,
+                       GdTaggedEntryTag *tag,
+                       gpointer useless)
+{
+  g_print ("tag button clicked: %s\n", gd_tagged_entry_tag_get_label (tag));
+}
+
+static void
+on_toggle_visible (GtkButton *button,
+                   GtkWidget *entry)
+{
+  gboolean active;
+
+  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+
+  g_print ("%s tagged entry\n", active ? "show" : "hide");
+  gtk_widget_set_visible (entry, active);
+}
+
+static void
+on_toggle_tag (GtkButton *button,
+               GdTaggedEntry *entry)
+{
+  gboolean active;
+
+  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+
+  if (active)
+    {
+      g_print ("adding tag 'Toggle Tag'\n");
+      gd_tagged_entry_insert_tag (entry, toggle_tag, 0);
+    }
+  else
+    {
+      g_print ("removing tag 'Toggle Tag'\n");
+      gd_tagged_entry_remove_tag (entry, toggle_tag);
+    }
+}
+
+gint
+main (gint argc,
+      gchar ** argv)
+{
+  GtkWidget *window, *box, *entry, *toggle_visible_button, *toggle_tag_button;
+  GdTaggedEntryTag *tag;
+
+  gtk_init (&argc, &argv);
+
+  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_widget_set_size_request (window, 300, 0);
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_container_add (GTK_CONTAINER (window), box);
+
+  entry = GTK_WIDGET (gd_tagged_entry_new ());
+  g_signal_connect(entry, "tag-clicked",
+                   G_CALLBACK (on_tag_clicked), NULL);
+  g_signal_connect(entry, "tag-button-clicked",
+                   G_CALLBACK (on_tag_button_clicked), NULL);
+  gtk_container_add (GTK_CONTAINER (box), entry);
+
+  tag = gd_tagged_entry_tag_new ("Blah1");
+  gd_tagged_entry_add_tag (GD_TAGGED_ENTRY (entry), tag);
+  g_object_unref (tag);
+
+  tag = gd_tagged_entry_tag_new ("Blah2");
+  gd_tagged_entry_tag_set_has_close_button (tag, FALSE);
+  gd_tagged_entry_insert_tag (GD_TAGGED_ENTRY (entry), tag, -1);
+  g_object_unref (tag);
+
+  tag = gd_tagged_entry_tag_new ("Blah3");
+  gd_tagged_entry_tag_set_has_close_button (tag, FALSE);
+  gd_tagged_entry_insert_tag (GD_TAGGED_ENTRY (entry), tag, 0);
+  g_object_unref (tag);
+
+  toggle_visible_button = gtk_toggle_button_new_with_label ("Visible");
+  gtk_widget_set_vexpand (toggle_visible_button, TRUE);
+  gtk_widget_set_valign (toggle_visible_button, GTK_ALIGN_END);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_visible_button), TRUE);
+  g_signal_connect (toggle_visible_button, "toggled",
+                    G_CALLBACK (on_toggle_visible), entry);
+  gtk_container_add (GTK_CONTAINER (box), toggle_visible_button);
+
+  toggle_tag = gd_tagged_entry_tag_new ("Toggle Tag");
+
+  toggle_tag_button = gtk_toggle_button_new_with_label ("Toggle Tag");
+  g_signal_connect (toggle_tag_button, "toggled",
+                    G_CALLBACK (on_toggle_tag), entry);
+  gtk_container_add (GTK_CONTAINER (box), toggle_tag_button);
+
+  gtk_widget_show_all (window);
+  gtk_main ();
+
+  gtk_widget_destroy (window);
+
+  return 0;
+}

=== added file 'm4/glibtests.m4'
--- m4/glibtests.m4	1970-01-01 00:00:00 +0000
+++ m4/glibtests.m4	2014-06-14 06:35:06 +0000
@@ -0,0 +1,28 @@
+dnl GLIB_TESTS
+dnl
+
+AC_DEFUN([GLIB_TESTS],
+[
+  AC_ARG_ENABLE(installed-tests,
+                AS_HELP_STRING([--enable-installed-tests],
+                               [Enable installation of some test cases]),
+                [case ${enableval} in
+                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
+                  no)  ENABLE_INSTALLED_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
+  AC_ARG_ENABLE(always-build-tests,
+                AS_HELP_STRING([--enable-always-build-tests],
+                               [Enable always building tests during 'make all']),
+                [case ${enableval} in
+                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
+                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
+                 esac])
+  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
+  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
+    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
+    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
+  fi
+])

=== modified file 'm4/libtool.m4'
--- m4/libtool.m4	2014-02-04 06:31:27 +0000
+++ m4/libtool.m4	2014-06-14 06:35:06 +0000
@@ -1312,7 +1312,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1345,7 +1348,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)

=== added file 'org.gnome.Weather.Application.spec'
--- org.gnome.Weather.Application.spec	1970-01-01 00:00:00 +0000
+++ org.gnome.Weather.Application.spec	2014-06-14 06:35:06 +0000
@@ -0,0 +1,58 @@
+Name:		%{_name}
+Version:	%{_version}
+Release:	1%{?dist}
+Summary:	GNOME Weather
+
+License:	GPLv2+ and LGPLv2+ and MIT and CC-BY and CC-BY-SA
+URL:		http://wiki.gnome.org/Apps/Weather
+Source0:        %{_distdir}-%{version}.tar.xz
+BuildArch:      x86_64 i686
+
+%description
+A small application that allows you to monitor the current weather
+conditions for your city, or anywhere in the world and to access
+updated forecasts, up to 7 days, provided by various internet services.
+
+%prep
+%setup -q -n %{_distdir}-%{version}
+
+%build
+%configure --disable-static
+make %{?_smp_mflags}
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+rm -fR $RPM_BUILD_ROOT/%{_bindir}
+desktop-file-edit $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop \
+    --set-key=X-AppInstall-Package --set-value=%{name}
+
+%find_lang %{name}
+
+%check
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+%files -f %{name}.lang
+%doc NEWS COPYING
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/dbus-1/services/%{name}.service
+%{_datadir}/glib-2.0/schemas/%{name}.gschema.xml
+%{_datadir}/gnome-shell/search-providers/%{name}.search-provider.ini
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/%{name}/
+%{_libdir}/%{name}/

=== modified file 'po/LINGUAS'
--- po/LINGUAS	2014-02-04 06:31:27 +0000
+++ po/LINGUAS	2014-06-14 06:35:06 +0000
@@ -1,6 +1,8 @@
 # Please keep this list sorted alphabetically
 #
+ar
 as
+be
 ca
 ca@valencia
 cs
@@ -8,6 +10,7 @@
 de
 el
 en_GB
+eo
 es
 et
 eu
@@ -16,12 +19,15 @@
 fr
 fur
 ga
+gd
 gl
 he
 hu
 id
 it
 ja
+kk
+kn
 ko
 lt
 lv
@@ -37,6 +43,8 @@
 sl
 sr
 sr@latin
+sv
+te
 tg
 th
 tr

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-02-04 06:31:27 +0000
+++ po/POTFILES.in	2014-06-14 06:35:06 +0000
@@ -1,6 +1,6 @@
 [type: gettext/glade]data/app-menu.ui
 [type: gettext/glade]data/city.ui
-data/org.gnome.Weather.Application.desktop.in.in
+data/org.gnome.Weather.Application.desktop.in
 data/org.gnome.Weather.Application.appdata.xml.in
 [type: gettext/glade]data/new-location-dialog.ui
 data/org.gnome.Weather.Application.gschema.xml

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2014-02-04 06:31:27 +0000
+++ po/POTFILES.skip	2014-06-14 06:35:06 +0000
@@ -1,1 +0,0 @@
-data/org.gnome.Weather.Application.desktop.in

=== added file 'po/ar.po'
--- po/ar.po	1970-01-01 00:00:00 +0000
+++ po/ar.po	2014-06-14 06:35:06 +0000
@@ -0,0 +1,368 @@
+# Arabic translation for gnome-weather.
+# Copyright (C) 2014 gnome-weather's COPYRIGHT HOLDER
+# This file is distributed under the same license as the gnome-weather package.
+# Ibrahim Saed <[e-mail]>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-weather master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"weather&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2014-03-28 09:40+0000\n"
+"PO-Revision-Date: 2014-03-28 15:30+0200\n"
+"Last-Translator: Ibrahim Saed <[e-mail]>\n"
+"Language-Team: Arabic <[e-mail]>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
+
+#: ../data/app-menu.ui.h:1
+msgid "_New"
+msgstr "_جديد"
+
+#: ../data/app-menu.ui.h:2
+msgid "Temperature unit"
+msgstr "وحدة الحرارة"
+
+#: ../data/app-menu.ui.h:3
+msgid "Celsius"
+msgstr "مئوية"
+
+#: ../data/app-menu.ui.h:4
+msgid "Fahrenheit"
+msgstr "فهرنهايت"
+
+#: ../data/app-menu.ui.h:5
+msgid "About"
+msgstr "عن"
+
+#: ../data/app-menu.ui.h:6
+msgid "Quit"
+msgstr ""
+
+#: ../data/city.ui.h:1
+msgid "Current conditions"
+msgstr "الظروف الحالية"
+
+#: ../data/city.ui.h:2
+msgid "Detailed forecast"
+msgstr "توقعات مُفصّلة"
+
+#: ../data/org.gnome.Weather.Application.desktop.in.h:1 ../src/main.js:56
+#: ../src/window.js:319
+msgid "Weather"
+msgstr "الطقس"
+
+#: ../data/org.gnome.Weather.Application.desktop.in.h:2
+msgid "Show weather conditions and forecast"
+msgstr "عرض ظروف الطقس والتوقعات"
+
+#: ../data/org.gnome.Weather.Application.appdata.xml.in.h:1
+msgid ""
+"A small application that allows you to monitor the current weather "
+"conditions for your city, or anywhere in the world and to access updated "
+"forecasts, up to 7 days, provided by various internet services."
+msgstr ""
+"تطبيق صغير يتيح لك مراقبة حالات الطقس الحالية لمدينتك أو أي مدينة تريدها في "
+"العالم والوصول لتوقعات مُحدّثة حتى 7 أيام قادمة، من خلال خدمات مختلفة على "
+"الإنترنت."
+
+#: ../data/new-location-dialog.ui.h:1
+msgid "New Location"
+msgstr "منطقة جديدة"
+
+#: ../data/new-location-dialog.ui.h:2
+msgid "Search for a city:"
+msgstr "ابحث عن مدينة:"
+
+#: ../data/org.gnome.Weather.Application.gschema.xml.h:1
+msgid "Configured cities to show weather for"
+msgstr ""
+
+#: ../data/org.gnome.Weather.Application.gschema.xml.h:2
+msgid ""
+"The locations shown in the world view of gnome-weather. Each value is a "
+"GVariant returned by gweather_location_serialize()."
+msgstr ""
+
+#: ../data/window.ui.h:1
+msgid "Select All"
+msgstr "اختر الكل"
+
+#: ../data/window.ui.h:2
+msgid "Select None"
+msgstr "لا تختر شيء"
+
+#: ../data/window.ui.h:3 ../src/window.js:208
+msgid "Click on locations to select them"
+msgstr "انقر على المناطق لاختيارها"
+
+#: ../data/window.ui.h:4
+msgid "New"
+msgstr "جديد"
+
+#: ../data/window.ui.h:5
+msgid "Back"
+msgstr ""
+
+#: ../data/window.ui.h:6
+msgid "Select"
+msgstr "اختر"
+
+#: ../data/window.ui.h:7
+msgid "Cancel"
+msgstr "ألغِ"
+
+#: ../data/window.ui.h:8
+msgid "Refresh"
+msgstr "حدّث"
+
+#: ../data/window.ui.h:9
+msgid "Delete"
+msgstr "احذف"
+
+#: ../src/city.js:125
+msgid "City view"
+msgstr "مشهد مدينة"
+
+#: ../src/city.js:134
+msgid "Loading…"
+msgstr "يُحمّل…"
+
+#: ../src/forecast.js:41
+msgid "Forecast"
+msgstr "التوقعات"
+
+#: ../src/forecast.js:128 ../src/forecast.js:413
+msgid "Today"
+msgstr "اليوم"
+
+#: ../src/forecast.js:134 ../src/forecast.js:295 ../src/forecast.js:380
+#: ../src/forecast.js:415
+msgid "Tomorrow"
+msgstr "غدًا"
+
+#: ../src/forecast.js:151
+#, javascript-format
+msgid "%s / %s"
+msgstr "%s / %s"
+
+#: ../src/forecast.js:197 ../src/forecast.js:291
+msgid "More…"
+msgstr "المزيد…"
+
+#: ../src/forecast.js:318
+msgid "%l∶%M %p"
+msgstr ""
+
+#: ../src/forecast.js:321
+msgid "%R"
+msgstr ""
+
+#: ../src/forecast.js:352
+msgid "Forecast for Tomorrow"
+msgstr "التوقعات ليوم غد"
+
+#: ../src/forecast.js:354
+msgid "Forecast for Today"
+msgstr "التوقعات لليوم"
+
+#: ../src/forecast.js:356
+msgid "%B %d"
+msgstr ""
+
+#: ../src/searchProvider.js:169
+#, javascript-format
+msgid "%s, %s"
+msgstr ""
+
+#: ../src/strings.js:22
+msgid "Monday night"
+msgstr "ليلة الإثنين"
+
+#: ../src/strings.js:22
+msgid "Monday morning"
+msgstr "صباح الإثنين"
+
+#: ../src/strings.js:22
+msgid "Monday afternoon"
+msgstr "ظهر الإثنين"
+
+#: ../src/strings.js:22
+msgid "Monday evening"
+msgstr "مساء الإثنين"
+
+#: ../src/strings.js:23
+msgid "Tuesday night"
+msgstr "ليلة الثلاثاء"
+
+#: ../src/strings.js:23
+msgid "Tuesday morning"
+msgstr "صباح الثلاثاء"
+
+#: ../src/strings.js:23
+msgid "Tuesday afternoon"
+msgstr "ظهر الثلاثاء"
+
+#: ../src/strings.js:23
+msgid "Tuesday evening"
+msgstr "مساء الثلاثاء"
+
+#: ../src/strings.js:24
+msgid "Wednesday night"
+msgstr "ليلة الأربعاء"
+
+#: ../src/strings.js:24
+msgid "Wednesday morning"
+msgstr "صباح الأربعاء"
+
+#: ../src/strings.js:24
+msgid "Wednesday afternoon"
+msgstr "ظهر الأربعاء"
+
+#: ../src/strings.js:24
+msgid "Wednesday evening"
+msgstr "مساء الأربعاء"
+
+#: ../src/strings.js:25
+msgid "Thursday night"
+msgstr "ليلة الخميس"
+
+#: ../src/strings.js:25
+msgid "Thursday morning"
+msgstr "صباح الخميس"
+
+#: ../src/strings.js:25
+msgid "Thursday afternoon"
+msgstr "ظهر الخميس"
+
+#: ../src/strings.js:25
+msgid "Thursday evening"
+msgstr "مساء الخميس"
+
+#: ../src/strings.js:26
+msgid "Friday night"
+msgstr "ليلة الجمعة"
+
+#: ../src/strings.js:26
+msgid "Friday morning"
+msgstr "صباح الجمعة"
+
+#: ../src/strings.js:26
+msgid "Friday afternoon"
+msgstr "ظهر الجمعة"
+
+#: ../src/strings.js:26
+msgid "Friday evening"
+msgstr "مساء الجمعة"
+
+#: ../src/strings.js:27
+msgid "Saturday night"
+msgstr "ليلة السبت"
+
+#: ../src/strings.js:27
+msgid "Saturday morning"
+msgstr "صباح السبت"
+
+#: ../src/strings.js:27
+msgid "Saturday afternoon"
+msgstr "ظهر السبت"
+
+#: ../src/strings.js:27
+msgid "Saturday evening"
+msgstr "مساء السبت"
+
+#: ../src/strings.js:28
+msgid "Sunday night"
+msgstr "ليلة الأحد"
+
+#: ../src/strings.js:28
+msgid "Sunday morning"
+msgstr "صباح الأحد"
+
+#: ../src/strings.js:28
+msgid "Sunday afternoon"
+msgstr "ظهر الأحد"
+
+#: ../src/strings.js:28
+msgid "Sunday evening"
+msgstr "مساء الأحد"
+
+#: ../src/strings.js:31
+msgid "Tonight"
+msgstr "الليلة"
+
+#: ../src/strings.js:31
+msgid "This morning"
+msgstr "هذا الصباح"
+
+#: ../src/strings.js:31
+msgid "This afternoon"
+msgstr "ظهر اليوم"
+
+#: ../src/strings.js:31
+msgid "This evening"
+msgstr "هذا المساء"
+
+#: ../src/strings.js:32
+msgid "Tomorrow night"
+msgstr "ليلة الغد"
+
+#: ../src/strings.js:32
+msgid "Tomorrow morning"
+msgstr "صباح الغد"
+
+#: ../src/strings.js:32
+msgid "Tomorrow afternoon"
+msgstr "ظهر الغد"
+
+#: ../src/strings.js:32
+msgid "Tomorrow evening"
+msgstr "مساء الغد"
+
+#: ../src/window.js:203
+#, javascript-format
+msgid "%d selected"
+msgid_plural "%d selected"
+msgstr[0] "لا عناصر مختارة (%d)"
+msgstr[1] "عنصر واحد مختار (%d)"
+msgstr[2] "عنصران مختاران (%d)"
+msgstr[3] "%d عناصر مختارة"
+msgstr[4] "%d عنصرًا مختارًا"
+msgstr[5] "%d عنصر مختار"
+
+#: ../src/window.js:229
+msgid "World Weather"
+msgstr "طقس العالم"
+
+#: ../src/window.js:318
+msgid "translator-credits"
+msgstr ""
+"فريق عربآيز للترجمة http://www.arabeyes.org :\n"
+"إبراهيم سعيد\t<[e-mail]>"
+
+#: ../src/window.js:320
+msgid "A weather application"
+msgstr "تطبيق الطقس الجوي"
+
+#: ../src/world.js:214
+msgid "Cities"
+msgstr "المُدن"
+
+#: ../src/world.js:231
+msgid "World view"
+msgstr "مشهد العالم"
+
+#: ../src/world.js:259
+msgid "Add locations"
+msgstr "أضف مناطق"
+
+#: ../src/world.js:262
+msgid "Use the <b>New</b> button on the toolbar to add more world locations"
+msgstr ""
+"استخدم زرّ <b>جديد</b> الموجود في شريط الأدوات لإضافة المزيد من المناطق في "
+"العالم"

=== modified file 'po/as.po'
--- po/as.po	2014-02-04 06:31:27 +0000
+++ po/as.po	2014-06-14 06:35:06 +0000
@@ -2,14 +2,14 @@
 # Copyright (C) 2013 gnome-weather's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-weather package.
 #
-# ngoswami <[e-mail]>, 2013.
+# ngoswami <[e-mail]>, 2013, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-weather master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "weather&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-19 00:02+0000\n"
-"PO-Revision-Date: 2013-09-20 15:51+0530\n"
+"POT-Creation-Date: 2014-02-12 09:11+0000\n"
+"PO-Revision-Date: 2014-02-12 15:41+0630\n"
 "Last-Translator: Nilamdyuti Goswami <[e-mail]>\n"
 "Language-Team: Assamese <[e-mail]>\n"
 "Language: as\n"
@@ -36,19 +36,27 @@
 msgstr "Fahrenheit"
 
 #: ../data/app-menu.ui.h:5
-msgid "About Weather"
-msgstr "বতৰৰ বিষয়ে"
+msgid "About"
+msgstr "বিষয়ে"
 
 #: ../data/app-menu.ui.h:6
 msgid "Quit"
 msgstr "প্ৰস্থান কৰক"
 
-#: ../data/org.gnome.Weather.Application.desktop.in.in.h:1 ../src/main.js:55
-#: ../src/window.js:298
+#: ../data/city.ui.h:1
+msgid "Current conditions"
+msgstr "বৰ্তমান চৰ্তসমূহ"
+
+#: ../data/city.ui.h:2
+msgid "Detailed forecast"
+msgstr "বিৱৰিত প্ৰাককলন"
+
+#: ../data/org.gnome.Weather.Application.desktop.in.h:1 ../src/main.js:57
+#: ../src/window.js:313
 msgid "Weather"
 msgstr "বতৰ"
 
-#: ../data/org.gnome.Weather.Application.desktop.in.in.h:2
+#: ../data/org.gnome.Weather.Application.desktop.in.h:2
 msgid "Show weather conditions and forecast"
 msgstr "বতৰৰ অৱস্থা আৰু পূৰ্বানুমান দেখুৱাওক"
 
@@ -59,10 +67,9 @@
 "forecasts, up to 7 days, provided by various internet services."
 msgstr ""
 "এটা সৰু এপ্লিকেচন যি আপোনাক আপোনাৰ নগৰ, অথবা পৃথিৱীৰ যিকোনো ঠাইত বৰ্তমান বতৰ "
-"অৱস্থা "
-"পৰ্যবেক্ষণ কৰাৰ আৰু বিভিন্ন ইন্টাৰনেট সেৱাসমূহ দ্বাৰা প্ৰদান কৰা, আপডেইটেড "
-"পূৰ্বানুমান, ৭ দিনলৈ, "
-"অভিগম কৰাৰ অনুমতি দিয়ে।"
+"অৱস্থা পৰ্যবেক্ষণ কৰাৰ আৰু বিভিন্ন ইন্টাৰনেট সেৱাসমূহ দ্বাৰা প্ৰদান কৰা, "
+"আপডেইটেড "
+"পূৰ্বানুমান, ৭ দিনলৈ, অভিগম কৰাৰ অনুমতি দিয়ে।"
 
 #: ../data/new-location-dialog.ui.h:1
 msgid "New Location"
@@ -82,8 +89,7 @@
 "GVariant returned by gweather_location_serialize()."
 msgstr ""
 "gnome-weather ৰ বিশ্ব দৰ্শনত দেখুৱা অৱস্থানসমূহ। প্ৰত্যকটো মান "
-"gweather_location_serialize() "
-"দ্বাৰা ঘুৰাই দিয়া এটা GVariant।"
+"gweather_location_serialize() দ্বাৰা ঘুৰাই দিয়া এটা GVariant।"
 
 #: ../data/window.ui.h:1
 msgid "Select All"
@@ -93,7 +99,7 @@
 msgid "Select None"
 msgstr "একো নাবাছিব"
 
-#: ../data/window.ui.h:3 ../src/window.js:187
+#: ../data/window.ui.h:3 ../src/window.js:202
 msgid "Click on locations to select them"
 msgstr "অৱস্থানসমূহ নিৰ্বাচন কৰিবলে সিহতত ক্লিক কৰক"
 
@@ -102,62 +108,79 @@
 msgstr "নতুন"
 
 #: ../data/window.ui.h:5
-msgid "World Weather"
-msgstr "বিশ্বৰ বতৰ"
+msgid "Back"
+msgstr "পিছলৈ"
 
 #: ../data/window.ui.h:6
+#| msgid "Select All"
+msgid "Select"
+msgstr "বাছক"
+
+#: ../data/window.ui.h:7
 msgid "Cancel"
 msgstr "বাতিল কৰক"
 
-#: ../data/window.ui.h:7
+#: ../data/window.ui.h:8
+msgid "Refresh"
+msgstr "সতেজ কৰক"
+
+#: ../data/window.ui.h:9
 msgid "Delete"
 msgstr "মচি পেলাওক"
 
-#: ../src/city.js:119
+#: ../src/city.js:125
+msgid "City view"
+msgstr "নগৰ দৰ্শন"
+
+#: ../src/city.js:134
 msgid "Loading…"
 msgstr "ল'ড কৰা হৈছে…"
 
-#: ../src/forecast.js:112
+#: ../src/forecast.js:41
+#| msgid "Forecast for Today"
+msgid "Forecast"
+msgstr "প্ৰাককলন"
+
+#: ../src/forecast.js:128 ../src/forecast.js:413
 msgid "Today"
 msgstr "আজি"
 
-#: ../src/forecast.js:118
+#: ../src/forecast.js:134 ../src/forecast.js:295 ../src/forecast.js:380
+#: ../src/forecast.js:415
 msgid "Tomorrow"
 msgstr "অহাকালি"
 
-#: ../src/forecast.js:132
-#, c-format
+#: ../src/forecast.js:151
+#, javascript-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
-#: ../src/forecast.js:178
+#: ../src/forecast.js:197 ../src/forecast.js:291
 msgid "More…"
 msgstr "অধিক…"
 
-#: ../src/forecast.js:257
+#: ../src/forecast.js:318
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#: ../src/forecast.js:321
+msgid "%R"
+msgstr "%R"
+
+#: ../src/forecast.js:352
+msgid "Forecast for Tomorrow"
+msgstr "অহাকালিৰ পূৰ্বানুমান"
+
+#: ../src/forecast.js:354
 msgid "Forecast for Today"
 msgstr "আজিৰ পূৰ্বানুমান"
 
-#: ../src/forecast.js:259
-msgid "Forecast for Tomorrow"
-msgstr "অহাকালিৰ পূৰ্বানুমান"
-
-#: ../src/forecast.js:263
+#: ../src/forecast.js:356
 msgid "%B %d"
 msgstr "%B %d"
 
-#. Translators: this is a time format without date used for AM/PM
-#: ../src/forecast.js:300
-msgid "%l∶%M %p"
-msgstr "%l∶%M %p"
-
-#. Translators: this is a time format without date used for 24h mode
-#: ../src/forecast.js:303
-msgid "%R"
-msgstr "%R"
-
-#: ../src/searchProvider.js:161
-#, c-format
+#: ../src/searchProvider.js:169
+#, javascript-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
@@ -305,27 +328,42 @@
 msgid "Tomorrow evening"
 msgstr "অহাকালি গধূলি"
 
-#: ../src/window.js:182
-#, c-format
+#: ../src/window.js:197
+#, javascript-format
 msgid "%d selected"
 msgid_plural "%d selected"
 msgstr[0] "%d নিৰ্বাচিত"
 msgstr[1] "%d নিৰ্বাচিত"
 
-#: ../src/window.js:297
+#: ../src/window.js:223
+msgid "World Weather"
+msgstr "বিশ্বৰ বতৰ"
+
+#: ../src/window.js:312
 msgid "translator-credits"
 msgstr "নীলমদ্যুতি গোস্বামী ([e-mail])"
 
-#: ../src/window.js:299
+#: ../src/window.js:314
 msgid "A weather application"
 msgstr "এটা বতৰ এপ্লিকেচন"