[girl] GIRL 6.1.0
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] GIRL 6.1.0
- Date: Sun, 1 Nov 2015 16:21:43 +0000 (UTC)
commit f7996b0dab3641d4dbbe76a3c6af30ed38696875
Author: Ole Aamot <oka oka no>
Date: Sat Oct 31 20:44:31 2015 +0100
GIRL 6.1.0
AUTHORS | 1 +
ChangeLog | 64 +++++++++++++++++++++++
NEWS | 48 +++++++++++++++++
README | 51 +++++++++++++++++++
THANKS | 2 +
autogen.sh | 2 +-
compile | 2 +-
configure | 109 +++++++++++++---------------------------
configure.ac | 8 ++--
data/Makefile.in | 23 ++++++--
data/girl.appdata.xml.in | 2 +
data/icons/16x16/Makefile.in | 24 +++++++--
data/icons/22x22/Makefile.in | 24 +++++++--
data/icons/24x24/Makefile.in | 24 +++++++--
data/icons/256x256/Makefile.in | 24 +++++++--
data/icons/32x32/Makefile.in | 24 +++++++--
data/icons/48x48/Makefile.in | 24 +++++++--
data/icons/Makefile.in | 22 ++++++--
data/pixmaps/Makefile.in | 22 ++++++--
girl.spec.in | 3 +
help/C/index.page | 2 +-
help/C/prev.page | 49 +++++++++---------
help/Makefile | 40 ++++++++++-----
help/Makefile.am | 2 +-
help/Makefile.in | 24 +++++++--
help/en_US/index.page | 2 +-
help/en_US/legal.xml | 2 +
help/en_US/prev.page | 48 +++++++++---------
po/POTFILES.in | 6 ++-
po/POTFILES.skip | 3 +-
src/Makefile.in | 23 ++++++--
src/girl-station.c | 2 +-
src/girl.c | 80 +----------------------------
src/girl.h | 3 +
34 files changed, 498 insertions(+), 291 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 5b337e5..9a68e01 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,3 +16,4 @@ Efstathios Iosifidis <iosifidis opensuse org> (Greek translation)
Samir Ribić <megaribi epn ba> (Bosnian translation)
Enrico Nicoletto <liverig gmail com> (Brazilian Portuguese translation)
Sveinn í Felli <sv1 fellsnet is> (Icelandic translation)
+Josef Andersson <josef andersson gmail com> (Swedish translation)
diff --git a/ChangeLog b/ChangeLog
index e9c87e2..a1186b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+commit 944a4d22cd0f90b6f66db80bd9ff415e689e188e
+Author: Igor Gnatenko <ignatenko src gnome org>
+Date: Mon Aug 3 13:06:41 2015 +0300
+
+ trivial: update FSF address
+
+ Reported-by: Anders Jonsson <anders jonsson norsjovallen se>
+ Reference: https://bugzilla.gnome.org/show_bug.cgi?id=753044
+ Signed-off-by: Igor Gnatenko <ignatenko src gnome org>
+
+ src/girl-canvas.c | 2 +-
+ src/girl-canvas.h | 2 +-
+ src/girl-gui.c | 2 +-
+ src/girl-listener.c | 2 +-
+ src/girl-listener.h | 2 +-
+ src/girl-program.c | 2 +-
+ src/girl-program.h | 2 +-
+ src/girl-runners.c | 2 +-
+ src/girl-runners.h | 2 +-
+ src/girl-station.c | 2 +-
+ src/girl-station.h | 2 +-
+ src/girl-stations-map.c | 2 +-
+ src/girl-stations-map.h | 2 +-
+ src/girl-streams.c | 2 +-
+ src/girl-streams.h | 2 +-
+ src/girl-tz.c | 2 +-
+ src/girl-tz.h | 2 +-
+ src/girl.c | 4 ++--
+ src/girl.h | 2 +-
+ 19 files changed, 20 insertions(+), 20 deletions(-)
+
+commit 255459b00b2e20ed593b9cf716bb487563ef6d46
+Author: Josef Andersson <josef andersson gmail com>
+Date: Thu Jul 16 00:15:16 2015 +0000
+
+ Added Swedish translation
+
+ po/LINGUAS | 1 +
+ po/sv.po | 445 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 446 insertions(+)
+
+commit ccd7d72c693078b56795c4bca52f5c9bda2de67d
+Author: Ole Aamot <oka oka no>
+Date: Tue Jun 30 23:34:38 2015 +0200
+
+ GNOME Internet Radio Locator version 6.0.0
+
+ ChangeLog | 98 +++++++++++++++++++++++++++++++++++++++++++
+ help/Makefile | 56 ++++++++++++-------------
+ help/en_US/aboutprogram.page | 22 ++++++++++
+ help/en_US/aboutstation.page | 24 +++++++++++
+ help/en_US/en_US.mo | Bin 0 -> 344 bytes
+ help/en_US/en_US.stamp | 0
+ help/en_US/exit.page | 27 ++++++++++++
+ help/en_US/index.page | 65 ++++++++++++++++++++++++++++
+ help/en_US/intro.page | 28 +++++++++++++
+ help/en_US/listen.page | 33 +++++++++++++++
+ help/en_US/next.page | 32 ++++++++++++++
+ help/en_US/prev.page | 34 +++++++++++++++
+ help/en_US/record.page | 40 ++++++++++++++++++
+ help/en_US/search.page | 27 ++++++++++++
+ help/en_US/stations.page | 25 +++++++++++
+ 15 files changed, 483 insertions(+), 28 deletions(-)
+
commit 9589d8b1c2d2767160c8a87e89e5debecc9604fe
Author: Ole Aamot <oka oka no>
Date: Tue Jun 23 00:41:30 2015 +0200
diff --git a/NEWS b/NEWS
index f3be5eb..8802766 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,52 @@
=============
+Version 6.1.0
+=============
+
+AppData
+
+ * data/girl.appdata.xml: Add new <name> and <summary> tags.
+
+Sources
+
+ * src/girl-canvas.c: update FSF address (Bugzilla #753044)
+ * src/girl-canvas.h: update FSF address (Bugzilla #753044)
+ * src/girl-gui.c: update FSF address (Bugzilla #753044)
+ * src/girl-listener.c: update FSF address (Bugzilla #753044)
+ * src/girl-listener.h: update FSF address (Bugzilla #753044)
+ * src/girl-program.c: update FSF address (Bugzilla #753044)
+ * src/girl-program.h: update FSF address (Bugzilla #753044)
+ * src/girl-runners.c: update FSF address (Bugzilla #753044)
+ * src/girl-runners.h: update FSF address (Bugzilla #753044)
+ * src/girl-station.c: update FSF address (Bugzilla #753044)
+ * src/girl-station.h: update FSF address (Bugzilla #753044)
+ * src/girl-stations-map.c: update FSF address (Bugzilla #753044)
+ * src/girl-stations-map.h: update FSF address (Bugzilla #753044)
+ * src/girl-streams.c: update FSF address (Bugzilla #753044)
+ * src/girl-streams.h: update FSF address (Bugzilla #753044)
+ * src/girl-tz.c: update FSF address (Bugzilla #753044)
+ * src/girl-tz.h: update FSF address (Bugzilla #753044)
+ * src/girl.c: update FSF address (Bugzilla #753044)
+ * src/girl.h: update FSF address (Bugzilla #753044)
+
+Translations
+
+ * po/sv.po: New Swedish translation by Anders Jonsson
+
+=============
+Version 6.0.0
+=============
+
+Stations
+
+ * src/girl.xml: Add RÚV (Reykjavik, Iceland)
+ * src/girl.xml: Add Radio AF (Lund, Sweden)
+
+Translations
+
+ * po/is.po: New Icelandic translation by Sveinn í Felli.
+ * po/hu.po: Updated Hungarian translation by Balázs Úr.
+
+=============
Version 5.0.0
=============
diff --git a/README b/README
index bbeebc8..3186bfc 100644
--- a/README
+++ b/README
@@ -1,4 +1,55 @@
==============
+GIRL 6.1 notes
+==============
+
+GNOME Internet Radio Locator (GIRL) 6.1.0 is now available in 15
+languages and supports 73 Internet radio stations in 69 different
+world cities such as Adelaide, Auckland, Austin, Ayr, Berkeley, Bern,
+Boston, Brighton, Brno, Bruxelles, Budapest, Calgary, Cambridge, Cape
+Town, Chapel Hill, Chicago, Cleveland, Coimbra, Copenhagen, Dublin,
+Guatemala City, Honolulu, Houston, Kingston, Leeds, London, Long
+Island, Los Angeles, Lund, Manchester, Memphis, México City,
+Nashville, Newcastle, New Orleans, New York City, Nottingham, Oslo,
+Oswego, Ottawa, Oxford, Paris, Phoenix, Pisa, Pittsburgh, Portland,
+Reykjavik, Rochester, San Francisco, Seattle, Stockholm, Sydney,
+Trondheim, Tuscaloosa, Washington, Waterloo, York, and Zürich.
+
+21 people have contributed to the GIRL program with new patches and
+translations. See girl-6.1.0/AUTHORS for the list of contributors.
+
+If you find the program useful, drop me an email at ole src gnome org
+The GIRL program is completely free, but you don't have to do anything
+else than run it on your computer with a free operating system in
+order to listen to and record from Internet radio stations. You are
+also free to fork it as long as you follow the license terms in GNU
+GPL version 2, but I would appreciate if you send patches instead of
+releasing your own version.
+
+Send patches through Bugzilla on
+https://bugzilla.gnome.org/enter_bug.cgi?product=girl
+
+You could install and run GIRL on free GNU/Linux systems (such as
+Debian GNU/Linux available from http://www.debian.org/ and Fedora
+Linux available from https://getfedora.org/ with the provided binary
+packages) and MacOS X (via macports.org) in order to listen to and
+record from the 73 supported Internet radio stations around the world
+if you have installed the Videos application
+(https://wiki.gnome.org/Apps/Videos) from the GNOME project.
+
+This program is released as a part of the GNOME project
+(http://www.gnome.org/) and 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA
+
+==============
GIRL 5.0 notes
==============
diff --git a/THANKS b/THANKS
index 020bbd3..11aafb6 100644
--- a/THANKS
+++ b/THANKS
@@ -20,3 +20,5 @@ Samir Ribić for Bosnian translation.
Enrico Nicoletto for Brazilian Portuguese translation.
Lillebjørn Nilsen for inspiration to continue work on GIRL.
Sveinn í Felli for Icelandic translation.
+Josef Andersson for Swedish translation.
+Igor Gnatenko for patch that updates the FSF address (Bugzilla #753044).
diff --git a/autogen.sh b/autogen.sh
index e076f85..452c6c8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ which gnome-autogen.sh || {
}
REQUIRED_AUTOCONF_VERSION=2.59
-REQUIRED_AUTOMAKE_VERSION=1.11
+REQUIRED_AUTOMAKE_VERSION=1.15
REQUIRED_INTLTOOL_VERSION=0.40.0
REQUIRED_PKG_CONFIG_VERSION=0.16.0
REQUIRED_GTK_DOC_VERSION=1.9
diff --git a/compile b/compile
index 531136b..a85b723 100755
--- a/compile
+++ b/compile
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey cygnus com>.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/configure b/configure
index 95fd653..7087d2a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 6.0.0.
+# Generated by GNU Autoconf 2.69 for girl 6.1.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='girl'
PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='6.0.0'
-PACKAGE_STRING='girl 6.0.0'
+PACKAGE_VERSION='6.1.0'
+PACKAGE_STRING='girl 6.1.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures girl 6.0.0 to adapt to many kinds of systems.
+\`configure' configures girl 6.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of girl 6.0.0:";;
+ short | recursive ) echo "Configuration of girl 6.1.0:";;
esac
cat <<\_ACEOF
@@ -1545,7 +1545,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-girl configure 6.0.0
+girl configure 6.1.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1910,7 +1910,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by girl $as_me 6.0.0, which was
+It was created by girl $as_me 6.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2258,7 +2258,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.14'
+am__api_version='1.15'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2459,8 +2459,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2479,7 +2479,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2773,7 +2773,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='6.0.0'
+ VERSION='6.1.0'
cat >>confdefs.h <<_ACEOF
@@ -2807,8 +2807,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -2866,6 +2866,7 @@ END
fi
fi
+
ac_config_headers="$ac_config_headers config.h"
@@ -4332,25 +4333,25 @@ if test -n "$GIRL_CFLAGS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0 \\
glib-2.0 >= 2.0 \\
+ libgnome-2.0 >= 2.0 \\
libgnomeui-2.0 >= 2.0 \\
libxml-2.0 >= 2.0 \\
- gnome-vfs-2.0 >= 2.0 \\
- libgnomeui-2.0 >= 2.0\""; } >&5
+ gnome-vfs-2.0 >= 2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0") 2>&5
+ gnome-vfs-2.0 >= 2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GIRL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0" 2>/dev/null`
+ gnome-vfs-2.0 >= 2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4364,25 +4365,25 @@ if test -n "$GIRL_LIBS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0 \\
glib-2.0 >= 2.0 \\
+ libgnome-2.0 >= 2.0 \\
libgnomeui-2.0 >= 2.0 \\
libxml-2.0 >= 2.0 \\
- gnome-vfs-2.0 >= 2.0 \\
- libgnomeui-2.0 >= 2.0\""; } >&5
+ gnome-vfs-2.0 >= 2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0") 2>&5
+ gnome-vfs-2.0 >= 2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GIRL_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0" 2>/dev/null`
+ gnome-vfs-2.0 >= 2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4405,27 +4406,27 @@ fi
if test $_pkg_short_errors_supported = yes; then
GIRL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0" 2>&1`
+ gnome-vfs-2.0 >= 2.0" 2>&1`
else
GIRL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0" 2>&1`
+ gnome-vfs-2.0 >= 2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GIRL_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0) were not met:
+ gnome-vfs-2.0 >= 2.0) were not met:
$GIRL_PKG_ERRORS
@@ -4457,7 +4458,7 @@ else
$as_echo "yes" >&6; }
fi
-GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libxml-2.0, gnome-vfs-2.0, libgnomeui-2.0"
+GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
@@ -6574,44 +6575,6 @@ fi
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
-else
- case $host in
- *-*-solaris*)
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset"
"ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
- DATADIRNAME=share
-else
- DATADIRNAME=lib
-fi
-
- ;;
- *)
- DATADIRNAME=lib
- ;;
- esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
@@ -7493,7 +7456,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by girl $as_me 6.0.0, which was
+This file was extended by girl $as_me 6.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7559,7 +7522,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-girl config.status 6.0.0
+girl config.status 6.1.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 27ca922..9869281 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(girl, 6.0.0)
+AC_INIT(girl, 6.1.0)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
@@ -51,11 +51,11 @@ AC_CHECK_LIB(m, pow, [], [], [])
PKG_CHECK_MODULES(GIRL,
gtk+-2.0 >= 2.0 \
glib-2.0 >= 2.0 \
+ libgnome-2.0 >= 2.0 \
libgnomeui-2.0 >= 2.0 \
libxml-2.0 >= 2.0 \
- gnome-vfs-2.0 >= 2.0 \
- libgnomeui-2.0 >= 2.0)
-GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libxml-2.0, gnome-vfs-2.0, libgnomeui-2.0"
+ gnome-vfs-2.0 >= 2.0)
+GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
diff --git a/data/Makefile.in b/data/Makefile.in
index cc624b0..6714963 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(srcdir)/girl.desktop.in.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = girl.desktop.in
@@ -172,6 +181,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/girl.desktop.in.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -466,7 +476,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -805,6 +814,8 @@ uninstall-am: uninstall-appdataDATA uninstall-desktopDATA
pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-appdataDATA uninstall-desktopDATA
+.PRECIOUS: Makefile
+
@INTLTOOL_DESKTOP_RULE@
diff --git a/data/girl.appdata.xml.in b/data/girl.appdata.xml.in
index 4c86b85..e8b381a 100644
--- a/data/girl.appdata.xml.in
+++ b/data/girl.appdata.xml.in
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">girl.desktop</id>
+ <name>GNOME Internet Radio Locator</name>
+ <summary>Listen to and record from Internet radio</summary>
<licence>CC0</licence>
<description>
<_p>
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index 375a54f..e88f8ec 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons/16x16
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_appicons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appicons_DATA) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(appiconsdir)"
DATA = $(dist_appicons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -297,7 +308,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/16x16/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/16x16/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -490,6 +500,8 @@ uninstall-am: uninstall-dist_appiconsDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_appiconsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index a99350c..f1b541d 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons/22x22
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_appicons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appicons_DATA) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(appiconsdir)"
DATA = $(dist_appicons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -297,7 +308,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/22x22/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/22x22/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -490,6 +500,8 @@ uninstall-am: uninstall-dist_appiconsDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_appiconsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
index efaed8a..e8b94f2 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons/24x24
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_appicons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appicons_DATA) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(appiconsdir)"
DATA = $(dist_appicons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -296,7 +307,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/24x24/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/24x24/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -489,6 +499,8 @@ uninstall-am: uninstall-dist_appiconsDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_appiconsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/data/icons/256x256/Makefile.in b/data/icons/256x256/Makefile.in
index 6708f1c..3310157 100644
--- a/data/icons/256x256/Makefile.in
+++ b/data/icons/256x256/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons/256x256
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_appicons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appicons_DATA) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(appiconsdir)"
DATA = $(dist_appicons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -296,7 +307,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/256x256/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/256x256/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -489,6 +499,8 @@ uninstall-am: uninstall-dist_appiconsDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_appiconsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
index f52a6a5..73d500a 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons/32x32
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_appicons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appicons_DATA) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(appiconsdir)"
DATA = $(dist_appicons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -297,7 +308,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/32x32/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/32x32/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -490,6 +500,8 @@ uninstall-am: uninstall-dist_appiconsDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_appiconsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.in b/data/icons/48x48/Makefile.in
index 79c14e2..14361f7 100644
--- a/data/icons/48x48/Makefile.in
+++ b/data/icons/48x48/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,13 +87,13 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons/48x48
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(dist_appicons_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_appicons_DATA) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(appiconsdir)"
DATA = $(dist_appicons_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -297,7 +308,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/48x48/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/48x48/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -490,6 +500,8 @@ uninstall-am: uninstall-dist_appiconsDATA
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-dist_appiconsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 8da98fb..714787f 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -76,12 +86,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/icons
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -141,6 +151,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -322,7 +333,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -614,6 +624,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-hook
+.PRECIOUS: Makefile
+
install-data-hook: update-icon-cache
uninstall-hook: update-icon-cache
diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in
index a96fa65..4a93d47 100644
--- a/data/pixmaps/Makefile.in
+++ b/data/pixmaps/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,12 +87,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = data/pixmaps
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -136,6 +146,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(pixmapsdir)"
DATA = $(pixmaps_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -297,7 +308,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/pixmaps/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu data/pixmaps/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -490,6 +500,8 @@ uninstall-am: uninstall-pixmapsDATA
pdf-am ps ps-am tags-am uninstall uninstall-am \
uninstall-pixmapsDATA
+.PRECIOUS: Makefile
+
-include $(top_srcdir)/git.mk
diff --git a/girl.spec.in b/girl.spec.in
index 63dabe8..1f53a40 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -68,6 +68,9 @@ fi
%{_datadir}/help/*/%{name}/*
%changelog
+* Sat Aug 08 2015 Ole Aamot - 6.1.0-1.fc21
+- Girl 6.1.0 build on Fedora Linux 21
+
* Sat May 30 2015 Ole Aamot - 6.0.0-1.fc21
- Girl 6.0.0 build on Fedora Linux 21
diff --git a/help/C/index.page b/help/C/index.page
index f976a77..df35d1d 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -31,7 +31,7 @@
<section id="search" style="2column">
<title>Search</title>
- <p><link xref="intro">Search</link> for radio stations by location.</p>
+ <p><link xref="search">Search</link> for radio stations by location.</p>
</section>
<section id="listen" style="2column">
diff --git a/help/C/prev.page b/help/C/prev.page
index 44a57e9..8ce1bf7 100644
--- a/help/C/prev.page
+++ b/help/C/prev.page
@@ -1,7 +1,5 @@
-<page xmlns="http://projectmallard.org/1.0/";
- type="topic"
- id="prev">
-
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="prev" xml:lang="en-US">
<info>
<link type="guide" xref="index#main" group="#first"/>
<revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
@@ -9,27 +7,28 @@
<name>Ole Aamot</name>
<email>ole src gnome org</email>
</credit>
-
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include xmlns="http://www.w3.org/2001/XInclude"; href="legal.xml"/>
<desc>Search for Internet radio stations by location.</desc>
</info>
-
<title>Prev</title>
-
- <p>It is possible to record from supported radio stations in <app>GIRL</app> if you have installed
- the <app>streamripper</app> application.</p>
-
- <p>If you have installed streamripper on your computer, then you can record audio broadcasted from
- any of the supported radio stations.</p>
-
- <p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
- program after you listened to a radio station previously, and then click on "Record", the radio
- station will be recorded and the recorded audio file will be stored in your home directory.</p>
-
-
- <title>
- <media type="image" mime="image/png" src="media/girl-prev-station.png" />
- Previous radio station
- </title>
-
-</page>
\ No newline at end of file
+ <p>It is possible to listen to the previous of supported radio
+ stations in <app>GIRL</app> with the "Prev" button.</p>
+ <p>This makes it easy to change the radio station, if you are bored
+ of the current radio station and in situations when you realize that
+ you are bored of the current radio station and want to listen to the
+ next station.</p>
+ <p>You can also navigate between radio stations by clicking on
+ "Stations" or search for a radio station by location by clicking on
+ "Search".</p>
+ <p>It is possible to record from supported radio stations in <app>GIRL</app> if you have installed
+ the <app>streamripper</app> application.</p>
+ <p>If you have installed streamripper on your computer, then you can record audio broadcasted from
+ any of the supported radio stations.</p>
+ <p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
+ program after you listened to a radio station previously, and then click on "Record", the radio
+ station will be recorded and the recorded audio file will be stored in your home directory.</p>
+ <title>
+ <media type="image" mime="image/png" src="media/girl-prev-station.png"/>
+ Previous radio station
+ </title>
+</page>
diff --git a/help/Makefile b/help/Makefile
index 1a19c56..5fd71df 100644
--- a/help/Makefile
+++ b/help/Makefile
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# help/Makefile. Generated from Makefile.in by configure.
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -76,12 +86,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = help
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -106,14 +116,15 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/oka/girl/missing aclocal-1.14
+ACLOCAL = ${SHELL} /home/oka/girl/missing aclocal-1.15
ALL_LINGUAS =
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
AUTOCONF = ${SHELL} /home/oka/girl/missing autoconf
AUTOHEADER = ${SHELL} /home/oka/girl/missing autoheader
-AUTOMAKE = ${SHELL} /home/oka/girl/missing automake-1.14
+AUTOMAKE = ${SHELL} /home/oka/girl/missing automake-1.15
AWK = gawk
CATALOGS =
CATOBJEXT = .gmo
@@ -132,11 +143,11 @@ ECHO_T =
EGREP = /usr/bin/grep -E
EXEEXT =
GETTEXT_PACKAGE = girl
-GIRL_CFLAGS = -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1
-I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnome-2.0
-I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0
-I/usr/include/libgnomecanvas-2.0 -I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gtk-2.0
-I/usr/lib64/gtk-2.0/include -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo
-I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/pango-1.0 -I/usr/include/harfbuzz
-I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2
-I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/gnome-vfs-2.0
-I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0
-I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
+GIRL_CFLAGS = -D_REENTRANT -DORBIT2=1 -pthread -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1
-I/usr/include/libbonoboui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libbonobo-2.0
-I/usr/include/bonobo-activation-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libgnomecanvas-2.0
-I/usr/include/gail-1.0 -I/usr/include/libart-2.0 -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include
-I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1
-I/usr/include/libdrm -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0
-I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/libxml2 -I/usr/include/gnome-vfs-2.0
-I/usr/lib64/gnome-vfs-2.0/include -I/usr/include/gconf/2 -I/usr/include/dbus-1.0
-I/usr/lib64/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
GIRL_HELPER_PLAYER = /usr/bin/totem
GIRL_HELPER_RECORD = /usr/bin/streamripper
-GIRL_LIBS = -lxml2 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation
-lORBit-2 -lgnomecanvas-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo
-lgio-2.0 -lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lgdk_pixbuf-2.0 -lgnomevfs-2 -lgconf-2
-lgthread-2.0 -pthread -lgmodule-2.0 -pthread -lgobject-2.0 -lglib-2.0
-GIRL_PKG_DEPS = gtk+-2.0, glib-2.0, libgnome-2.0, libxml-2.0, gnome-vfs-2.0, libgnomeui-2.0
+GIRL_LIBS = -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2
-lgnomecanvas-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -lpangocairo-1.0 -latk-1.0 -lcairo -lgio-2.0
-lpangoft2-1.0 -lpango-1.0 -lfontconfig -lfreetype -lgdk_pixbuf-2.0 -lxml2 -lgnomevfs-2 -lgconf-2
-lgthread-2.0 -pthread -lgmodule-2.0 -pthread -lgobject-2.0 -lglib-2.0
+GIRL_PKG_DEPS = gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
GREP = /usr/bin/grep
@@ -180,10 +191,10 @@ OBJEXT = o
PACKAGE = girl
PACKAGE_BUGREPORT =
PACKAGE_NAME = girl
-PACKAGE_STRING = girl 6.0.0
+PACKAGE_STRING = girl 6.1.0
PACKAGE_TARNAME = girl
PACKAGE_URL =
-PACKAGE_VERSION = 6.0.0
+PACKAGE_VERSION = 6.1.0
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
PKG_CONFIG_LIBDIR =
@@ -196,7 +207,7 @@ SET_MAKE =
SHELL = /bin/sh
STRIP =
USE_NLS = yes
-VERSION = 6.0.0
+VERSION = 6.1.0
XGETTEXT = /usr/bin/xgettext
XMLLINT = xmllint
YELP_LC_DIST = true
@@ -246,7 +257,7 @@ top_build_prefix = ../
top_builddir = ..
top_srcdir = ..
HELP_ID = girl
-HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page listen.page next.page
prev.page record.page search.page stations.page
+HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
next.page prev.page record.page search.page stations.page
HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-next-station.png media/girl-prev-station.png
media/girl-prev-station.png media/girl-record.png media/girl-search-station-by-location.png
media/girl-select-station.png media/girl-stations.png media/girl-stop.png
HELP_LINGUAS = cs en_US
all: all-am
@@ -264,7 +275,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu help/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -432,6 +442,8 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
HELP_ID ?=
HELP_POT ?=
diff --git a/help/Makefile.am b/help/Makefile.am
index 4c4cf0f..f8c35eb 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,6 +1,6 @@
@YELP_HELP_RULES@
HELP_ID = girl
-HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page listen.page next.page
prev.page record.page search.page stations.page
+HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
next.page prev.page record.page search.page stations.page
HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-next-station.png media/girl-prev-station.png
media/girl-prev-station.png media/girl-record.png media/girl-search-station-by-location.png
media/girl-select-station.png media/girl-stations.png media/girl-stop.png
HELP_LINGUAS = cs en_US
-include $(top_srcdir)/git.mk
diff --git a/help/Makefile.in b/help/Makefile.in
index e9adb62..5b0188e 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -76,12 +86,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = help
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -106,6 +116,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -246,7 +257,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
HELP_ID = girl
-HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page listen.page next.page
prev.page record.page search.page stations.page
+HELP_FILES = aboutprogram.page aboutstation.page exit.page index.page intro.page legal.xml listen.page
next.page prev.page record.page search.page stations.page
HELP_MEDIA = media/girl-aboutprogram.png media/girl-aboutstation.png media/girl-exit.png
media/girl-listen.png media/girl-main.png media/girl-next-station.png media/girl-prev-station.png
media/girl-prev-station.png media/girl-record.png media/girl-search-station-by-location.png
media/girl-select-station.png media/girl-stations.png media/girl-stop.png
HELP_LINGUAS = cs en_US
all: all-am
@@ -264,7 +275,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu help/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu help/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -432,6 +442,8 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
@YELP_HELP_RULES@
-include $(top_srcdir)/git.mk
diff --git a/help/en_US/index.page b/help/en_US/index.page
index c7ba8f9..e575c3d 100644
--- a/help/en_US/index.page
+++ b/help/en_US/index.page
@@ -28,7 +28,7 @@
<section id="search" style="2column">
<title>Search</title>
- <p><link xref="intro">Search</link> for radio stations by location.</p>
+ <p><link xref="search">Search</link> for radio stations by location.</p>
</section>
<section id="listen" style="2column">
diff --git a/help/en_US/legal.xml b/help/en_US/legal.xml
index 64575ed..df7dc05 100644
--- a/help/en_US/legal.xml
+++ b/help/en_US/legal.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
<license xmlns="http://projectmallard.org/1.0/";>
+
<p>This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a
copy of this license, visit <link
xref="http://creativecommons.org/licenses/by-sa/3.0/";>http://creativecommons.org/licenses/by-sa/3.0/</link>
or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.</p>
</license>
diff --git a/help/en_US/prev.page b/help/en_US/prev.page
index e72fa11..90fdec8 100644
--- a/help/en_US/prev.page
+++ b/help/en_US/prev.page
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<page xmlns="http://projectmallard.org/1.0/"; type="topic" id="prev" xml:lang="en-US">
-
<info>
<link type="guide" xref="index#main" group="#first"/>
<revision pkgversion="1.8" date="2015-03-14" status="candidate"/>
<credit type="author copyright">
- <name>Ole Aamot</name>
+ <name xml:lang="en-US">Ole Aamot</name>
<email>ole src gnome org</email>
</credit>
-
- <include xmlns="http://www.w3.org/2001/XInclude"; href="legal.xml"/>
- <desc>Search for Internet radio stations by location.</desc>
+ <include xmlns="http://www.w3.org/2001/XInclude"; href="legal.xml"/>
+ <desc xml:lang="en-US">Search for Internet radio stations by location.</desc>
</info>
-
- <title>Prev</title>
-
- <p>It is possible to record from supported radio stations in <app>GIRL</app> if you have installed
- the <app>streamripper</app> application.</p>
-
- <p>If you have installed streamripper on your computer, then you can record audio broadcasted from
- any of the supported radio stations.</p>
-
- <p>If you select the radio station from "Stations" and click on "Listen" in the <app>GIRL</app>
- program after you listened to a radio station previously, and then click on "Record", the radio
- station will be recorded and the recorded audio file will be stored in your home directory.</p>
-
-
- <title>
- <media type="image" mime="image/png" src="media/girl-prev-station.png"/>
- Previous radio station
- </title>
-
+ <title xml:lang="en-US">Prev</title>
+ <p xml:lang="en-US">It is possible to listen to the previous of supported radio
+ stations in <app>GIRL</app> with the "Prev" button.</p>
+ <p xml:lang="en-US">This makes it easy to change the radio station, if you are bored
+ of the current radio station and in situations when you realize that
+ you are bored of the current radio station and want to listen to the
+ next station.</p>
+ <p xml:lang="en-US">You can also navigate between radio stations by clicking on
+ "Stations" or search for a radio station by location by clicking on
+ "Search".</p>
+ <p xml:lang="en-US">It is possible to record from supported radio stations in <app>GIRL</app> if you
have installed
+ the <app>streamripper</app> application.</p>
+ <p xml:lang="en-US">If you have installed streamripper on your computer, then you can record audio
broadcasted from
+ any of the supported radio stations.</p>
+ <p xml:lang="en-US">If you select the radio station from "Stations" and click on "Listen" in the
<app>GIRL</app>
+ program after you listened to a radio station previously, and then click on "Record", the radio
+ station will be recorded and the recorded audio file will be stored in your home directory.</p>
+ <title xml:lang="en-US">
+ <media type="image" mime="image/png" src="media/girl-prev-station.png"/>
+ Previous radio station
+ </title>
</page>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fcd5390..7544f94 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,9 +2,11 @@
# Please keep this file sorted alphabetically.
[encoding: UTF-8]
data/girl.appdata.xml.in
+data/girl.desktop.in
+data/girl.desktop.in
data/girl.desktop.in.in
-src/girl.c
-src/girl-canvas.c
src/girl-gui.c
src/girl-listener.c
src/girl-station.c
+src/girl.c
+sub/data/girl.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 82583be..a060bba 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,4 @@
# List of source files that should *not* be translated.
# Please keep this file sorted alphabetically.
-data/girl.desktop.in
+
+sub/data/girl.desktop.in
diff --git a/src/Makefile.in b/src/Makefile.in
index 0817d2a..bfe1a2a 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -81,13 +91,12 @@ noinst_PROGRAMS = test-stations-gfx$(EXEEXT) test-endianess$(EXEEXT) \
test-stations$(EXEEXT)
bin_PROGRAMS = girl$(EXEEXT)
subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -212,6 +221,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -408,7 +418,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -977,6 +986,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-girlDATA
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-girlDATA
+.PRECIOUS: Makefile
+
all-local: check-local
diff --git a/src/girl-station.c b/src/girl-station.c
index 0e1e359..e25db84 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -342,7 +342,7 @@ void girl_helper_run(char *url, char *name, GirlStreamType type, GirlHelperType
girl->record_pid = pid;
girl->record_status = GIRL_RECORD_TRUE;
- girl_archive_new(pid, "archive.mp3");
+ girl_archive_new("Archive", "archive.mp3");
/* Install timeout fnction that will move the progress bar */
girl->timeout_id = g_timeout_add(100,(GSourceFunc)cb_timeout,girl);
diff --git a/src/girl.c b/src/girl.c
index fcb559e..bf4fd41 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -700,10 +700,6 @@ void on_search_button_clicked(GtkWidget *a, gpointer user_data)
void on_listen_button_clicked(GtkWidget *a, gpointer user_data)
{
-
-
- /* girl_stream_player(a, user_data); */
-
appbar_send_msg(_("Listening to the radio station %s in %s: %s "),
girl->selected_station_name,
girl->selected_station_location,
@@ -714,7 +710,6 @@ void on_listen_button_clicked(GtkWidget *a, gpointer user_data)
girl->selected_station_name,
GIRL_STREAM_SHOUTCAST,
GIRL_STREAM_PLAYER);
-
}
void on_record_button_clicked(GtkWidget *a, gpointer user_data)
@@ -731,6 +726,7 @@ void on_record_button_clicked(GtkWidget *a, gpointer user_data)
girl->selected_station_location,
girl->selected_station_uri,
girl->selected_station_band);
+
girl_helper_run(girl->selected_station_uri,
girl->selected_station_name,
GIRL_STREAM_SHOUTCAST,
@@ -830,78 +826,6 @@ girl_archive_progress_callback(GnomeVFSXferProgressInfo * info, gpointer data)
return TRUE;
}
-gint girl_archive_new(GPid *pid, gchar *file)
+gint girl_archive_new(gchar *title, gchar *file)
{
-#if 0
- const gchar *temp;
- FILE *fh;
- gchar *buf[64];
- gchar *archive;
- gchar* stat_path;
- gchar exec_name[16];
- struct stat *statobj = g_new(struct stat, 1);
-
- snprintf(buf, 64, "/proc/%i/fd", pid);
-
- archive = g_dir_open(buf, 0, NULL);
- printf("%s\n", g_dir_read_name (archive));
-
- while((temp = g_dir_read_name(archive)))
- {
- pid = atoi(temp);
- if (!pid)
- continue;
- // /proc/{pid}/stat contains lots of juicy info
- stat_path = g_strdup_printf("/proc/%d/stat", pid);
- fh = fopen(stat_path, "r");
- if (!fh)
- {
- g_free(stat_path);
- continue;
- }
- pid = fscanf(fh, "%*d (%15[^)]", exec_name);
- fclose(fh);
- if (!g_str_equal(exec_name, "streamripper"))
- {
- g_free(stat_path);
- continue;
- }
- //get uid/owner of stat file by using fstat()
- g_stat(stat_path, statobj);
- g_free(stat_path);
- //compare uid/owner of stat file (in g_stat->st_uid) to getuid();
- if (statobj->st_uid == getuid())
- {
- //this copy of streamripper was started by us
- g_dir_close(archive);
- g_free(statobj);
- return TRUE;
- }
- }
-
- g_dir_close(archive);
-
- /* GnomeVFSURI *src_uri, *dest_uri; */
- /* GnomeVFSResult result; */
- /* GnomeVFSXferOptions xfer_options; */
-
- /* xfer_options = GNOME_VFS_XFER_DEFAULT; */
-
- /* src_uri = gnome_vfs_uri_new(src); */
- /* dest_uri = gnome_vfs_uri_new(dest); */
-
- /* result = gnome_vfs_xfer_uri(src_uri, */
- /* dest_uri, */
- /* xfer_options, */
- /* GNOME_VFS_XFER_ERROR_MODE_QUERY, */
- /* GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, */
- /* girl_archive_progress_callback, src); */
-
- /* gnome_vfs_uri_unref(src_uri); */
-
- /* if (result != GNOME_VFS_OK) */
- /* return NULL; */
-
- /* return dest_uri; */
-#endif
}
diff --git a/src/girl.h b/src/girl.h
index 8a39dcc..7de1653 100644
--- a/src/girl.h
+++ b/src/girl.h
@@ -70,6 +70,9 @@ void statusbar_send_msg(const char *a, ...);
gchar *copy_to_mem(GnomeVFSURI * uri, GnomeVFSFileSize len);
+void appbar_send_msg(const char *a, ...);
+gint girl_archive_new(gchar *title, gchar *file);
+
/* Fetcher for the channels */
void girl_helper_run(char *url, char *name, GirlStreamType type, GirlHelperType girl);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
