[girl] GNOME Internet Radio Locator (GIRL) version 7.0.0
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] GNOME Internet Radio Locator (GIRL) version 7.0.0
- Date: Tue, 5 Jan 2016 20:55:37 +0000 (UTC)
commit 72c6449205724fea9d4c38ee03796a8a653cec5d
Author: Ole Aamot <oka oka no>
Date: Tue Jan 5 21:54:10 2016 +0100
GNOME Internet Radio Locator (GIRL) version 7.0.0
AUTHORS | 8 +-
BROADCAST | 4 +-
ChangeLog | 107 ++++++++++++++++++++++++++-
HACKING | 19 ++++-
NEWS | 30 ++++++++
README | 143 +++++++++++++++++++++++++++++++++++-
THANKS | 6 +-
configure | 24 +++---
configure.ac | 4 +-
data/Makefile.in | 6 +-
data/icons/1024x1024/apps/girl.png | Bin 189386 -> 100115 bytes
data/icons/16x16/apps/girl.png | Bin 825 -> 747 bytes
data/icons/22x22/apps/girl.png | Bin 1309 -> 998 bytes
data/icons/24x24/apps/girl.png | Bin 1448 -> 1118 bytes
data/icons/256x256/apps/girl.png | Bin 34036 -> 16693 bytes
data/icons/32x32/apps/girl.png | Bin 2154 -> 1431 bytes
data/icons/48x48/apps/girl.png | Bin 3766 -> 2290 bytes
data/icons/512x512/apps/girl.png | Bin 81370 -> 39550 bytes
girl.spec.in | 7 +-
help/Makefile | 22 +++---
help/Makefile.in | 2 +-
src/Makefile.am | 4 +-
src/Makefile.in | 4 +-
src/girl-station.c | 4 +-
src/girl.c | 10 ++-
src/girl.png | Bin 3766 -> 7209 bytes
src/girl.xml | 30 +++++++-
27 files changed, 376 insertions(+), 58 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 6d16450..1ed0c06 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,13 +1,13 @@
Ole Aamot <ole src gnome org> (Maintainer)
Marek Černocký <marek manet cz> (Czech translation)
Rafael Ferreira <rafael f f1 gmail com> (Brazilian Portuguese translation)
-Мирослав Николић/Miroslav Nikolić <miroslavnikolic rocketmail com> (Serbian translation)
+Мирослав Николић <miroslavnikolic rocketmail com> (Serbian translation)
Wolfgang Stöggl <c72578 yahoo de> (German translation)
Piotr Drąg <piotrdrag gmail com> (Polish translation)
Muhammet Kara <muhammetk gmail com> (Turkish translation)
Balázs Úr <urbalazs gmail com> (Hungarian translation)
-Wiki Graphic Designer (Icon design)
-Aly Raj (Icon design)
+Wiki Graphic Designer (Earliest Icon design)
+Aly Raj (Earlier Icon design)
Andika Triwidada <andika gmail com> (Indonesian translation)
Daniel Mustieles <daniel mustieles gmail com> (Spanish translation)
Matej Urbančič <mateju svn gnome org> (Slovenian translation)
@@ -18,3 +18,5 @@ Enrico Nicoletto <liverig gmail com> (Brazilian Portuguese translation)
Sveinn í Felli <sv1 fellsnet is> (Icelandic translation)
Josef Andersson <josef andersson gmail com> (Swedish translation)
Pedro Albuquerque <palbuquerque73 gmail com> (Portuguese translation)
+Mario Blättermann <mario blaettermann gmail com> (German translation)
+Mathilde Agostini <mathilde agostini outlook com> (Icon design)
diff --git a/BROADCAST b/BROADCAST
index cad7169..faeb759 100644
--- a/BROADCAST
+++ b/BROADCAST
@@ -4,6 +4,8 @@ a broadcast license permit from the F.C.C. if you are in the U.S. to
legally broadcast (see http://en.wikipedia.org/wiki/Broadcast_license
and https://www.dnalounge.com/backstage/webcasting.html).
+See http://www.icecast.org/ for a free streaming server by Xiph.org.
+
All of the radio stations in the GNOME Internet Radio Locator are
non-profit stations serving the public interest.
@@ -31,4 +33,4 @@ Publishers (ASCAP), Broadcast Music, Inc. (BMI), and Society of
European Stage Authors and Composers (SESAC).
Enjoy Internet radio,
-Ole Aamot, Oslo, January 2nd, 2015
+Ole Aamot, Oslo, January 3nd, 2016
diff --git a/ChangeLog b/ChangeLog
index 652e390..c6fdc5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,110 @@
-commit a81defd83166396ae41c8207d6f024c2fde6dec5
-Merge: 475b1b1 38842f9
+commit fe1e790fe6066b616f8d0f329073b8e7d1f4028c
+Merge: f0eb98f 7847cdb
Author: Ole Aamot <oka oka no>
-Date: Sat Oct 31 20:44:47 2015 +0100
+Date: Sun Jan 3 18:45:57 2016 +0100
Merge branch 'master' of ssh://git.gnome.org/git/girl
-commit 475b1b1696ac4c3efdbe3f0a4e064bc302ce0533
+commit 7847cdb81ff75ffb8e91416e09d9d99b5fe98981
+Author: Мирослав Николић <miroslavnikolic rocketmail com>
+Date: Wed Dec 30 10:14:50 2015 +0100
+
+ Updated Serbian translation
+
+ po/sr.po | 213 ++++++++++++++++++++++++++++++++++-----------------------
+ po/sr latin po | 213 ++++++++++++++++++++++++++++++++++-----------------------
+ 2 files changed, 254 insertions(+), 172 deletions(-)
+
+commit 1275d0af5a9ec425be7d18e3ace40f15105ec27b
+Author: Mario Blättermann <mario blaettermann gmail com>
+Date: Mon Dec 28 12:48:44 2015 +0100
+
+ Added initial German doc translation
+
+ help/Makefile.am | 2 +-
+ help/de/de.po | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 516 insertions(+), 1 deletion(-)
+
+commit f0eb98f08634d8cff650aabcd653a350dd146c90
+Merge: 4c365dc 0356762
+Author: Ole Aamot <oka oka no>
+Date: Sat Dec 12 15:11:50 2015 +0100
+
+ Merge branch 'master' of ssh://git.gnome.org/git/girl
+
+commit 035676222636f168229b3acf2e07c8fd3d3d1ad8
+Author: Marek Černocký <marek manet cz>
+Date: Thu Nov 12 16:39:19 2015 +0100
+
+ Updated Czech translation
+
+ help/cs/cs.po | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit 4c365dc71f81e062a60de9d49ff832054e3d4c5d
+Merge: e95a3d3 3666bfc
+Author: Ole Aamot <oka oka no>
+Date: Wed Nov 11 19:00:39 2015 +0100
+
+ Merge branch 'master' of ssh://git.gnome.org/git/girl
+
+commit e95a3d378450b0c4de9a298f745da3587a5d4359
+Author: Ole Aamot <oka oka no>
+Date: Wed Nov 11 18:59:46 2015 +0100
+
+ Misc. changes.
+
+ ChangeLog | 31 +++++++++++++++++++++++--------
+ configure | 4 ++--
+ configure.ac | 2 +-
+ data/Makefile.in | 6 +++---
+ help/Makefile | 20 ++++++++++----------
+ po/POTFILES.in | 2 --
+ src/girl.xml | 4 ++--
+ 7 files changed, 41 insertions(+), 28 deletions(-)
+
+commit 3666bfc9a675d94df5981a92901ca5a81a6aa18a
+Author: Marek Černocký <marek manet cz>
+Date: Tue Nov 3 14:51:03 2015 +0100
+
+ Updated Czech translation
+
+ help/cs/cs.po | 49 ++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 36 insertions(+), 13 deletions(-)
+
+commit 9eafb3a0a3ddad61be79533aea9b0a551c141f96
+Author: Piotr Drąg <piotrdrag gmail com>
+Date: Sun Nov 1 18:48:42 2015 +0100
+
+ Updated POTFILES.in and POTFILES.skip
+
+ po/POTFILES.in | 3 ---
+ po/POTFILES.skip | 2 +-
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+commit 5a3240db299995343df82fe0400de4df0746470c
+Author: Ole Aamot <oka oka no>
+Date: Sun Nov 1 17:20:34 2015 +0100
+
+ GIRL 6.1.0 changes
+
+ AUTHORS | 1 +
+ ChangeLog | 176 +++++++++++++++++++++++++++++++++++++
+ NEWS | 12 +++
+ data/icons/1024x1024/apps/girl.png | Bin 91311 -> 189386 bytes
+ data/icons/16x16/apps/girl.png | Bin 744 -> 825 bytes
+ data/icons/22x22/apps/girl.png | Bin 1052 -> 1309 bytes
+ data/icons/24x24/apps/girl.png | Bin 1087 -> 1448 bytes
+ data/icons/256x256/apps/girl.png | Bin 14492 -> 34036 bytes
+ data/icons/32x32/apps/girl.png | Bin 1401 -> 2154 bytes
+ data/icons/48x48/apps/girl.png | Bin 2153 -> 3766 bytes
+ data/icons/512x512/apps/girl.png | Bin 39039 -> 81370 bytes
+ help/Makefile | 20 ++---
+ help/en_US/search.page | 2 +-
+ src/girl.png | Bin 2988 -> 3766 bytes
+ 14 files changed, 200 insertions(+), 11 deletions(-)
+
+commit f7996b0dab3641d4dbbe76a3c6af30ed38696875
Author: Ole Aamot <oka oka no>
Date: Sat Oct 31 20:44:31 2015 +0100
diff --git a/HACKING b/HACKING
index 08b0540..5329eca 100644
--- a/HACKING
+++ b/HACKING
@@ -3,7 +3,8 @@ Introduction to girl-list (http://mail.gnome.org/listinfo/girl-list):
The initial work on this program began in 2002 at Norwegian Computing
Center (http://www.nr.no/) and PING, a computer club at University of
Oslo (http://www.ping.uio.no/). Work on GIRL continued in 2014 after
-a visit to SIPB (http://sipb.mit.edu/) at MIT, and continues in 2015.
+a visit to SIPB (http://sipb.mit.edu/) at MIT, reached version 1.0 in
+2015, and continues in 2016.
The GNOME Internet Radio Locator is currently available as a GNOME
desktop program with source code released under GNU General Public
@@ -14,10 +15,10 @@ the Wiki page is available at http://wiki.gnome.org/Apps/Girl
You are welcome to contribute to the GNOME Internet Radio Locator code
either by translating Girl into your language and contributing patches
-and adding new Internet radio stations in src/stations.xml
+and adding new Internet radio stations in src/girl.xml
-The list of supported Internet radio stations are also available in
-XML format from http://girl.software/girl.xml
+The most recent list of supported Internet radio stations are also
+available in XML format from http://girl.software/girl.xml
The mailing list for discussing this program is girl-list gnome org --
see http://mail.gnome.org/listinfo/girl-list for subscription and
@@ -25,5 +26,15 @@ https://mail.gnome.org/archives/girl-list/ for mailing list archives.
Any contribution is welcome and always credited in AUTHORS and THANKS.
+To enable debugging messages, modifiy the CC compilation definition flag
+from -DGIRL_DEBUG=0 to -DGIRL_DEBUG=1 in src/Makefile.am allthough it is
+not be necessary, only if you want to debug personal station definitions
+in $HOME/.girl/girl.xml
+
+See src/girl.xml (or ${PREFIX}/share/girl/girl.xml where PREFIX is the
+install path specified as ./configure --prefix=${PREFIX}, see INSTALL)
+for the GIRL radio station format.
+
+
Enjoy Internet radio,
Ole Aamot <ole src gnome org>
diff --git a/NEWS b/NEWS
index e572be5..a6597e4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,34 @@
=============
+Version 7.0.0
+=============
+
+Documentation
+
+ * help/de/de.po: Add German language translation (Mario Blättermann)
+
+Icons
+ * data/icons/16x16/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/22x22/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/24x24/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/32x32/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/48x48/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/128x128/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/256x256/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/512x512/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/1024x1024/apps/girl.png: Add new icon (Mathilde Agostini)
+
+Stations
+
+ * src/girl.xml: Add Narvik Studentradio (Narvik, Norway)
+ * src/girl.xml: Add Radio Campus & City (St. Pölten, Austria)
+
+Translations
+
+ * po/cs.po: Updated Czech translation (Marek Černocký)
+ * po/sr.po: Updated Serbian translation (Мирослав Николић)
+ * po/sr latin po: Updated Serbian translation (Miroslav Nikolić)
+
+=============
Version 6.1.0
=============
diff --git a/README b/README
index 3186bfc..497f368 100644
--- a/README
+++ b/README
@@ -1,4 +1,145 @@
==============
+GIRL 7.0 notes
+==============
+
+GNOME Internet Radio Locator 7.0.0 is now available in 17 languages
+and supports 75 Internet radio stations in 60 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, Narvik,
+Nashville, Newcastle, New Orleans, New York City, Nottingham, Oslo,
+Oswego, Ottawa, Oxford, Paris, Phoenix, Pisa, Pittsburgh, Portland,
+Reykjavik, Rochester, San Francisco, Seattle, Stockholm, St. Pölten,
+Sydney, Trondheim, Tuscaloosa, Washington, Waterloo, York, and Zürich.
+
+The initial work on this program began in 2002 at Norwegian Computing
+Center (http://www.nr.no/) and PING, a computer club at University of
+Oslo (http://www.ping.uio.no/). Work on GIRL continued in 2014 after
+a visit to SIPB (http://sipb.mit.edu/) at MIT, reached version 1.0 in
+2015, and continues in 2016.
+
+23 people have contributed to the program with new patches and
+translations. See AUTHORS for the list of contributors.
+
+To enable debugging messages, modifiy the CC compilation definition flag
+from -DGIRL_DEBUG=0 to -DGIRL_DEBUG=1 in src/Makefile.am allthough it is
+not be necessary, only if you want to debug personal station definitions
+in $HOME/.girl/girl.xml
+
+See src/girl.xml (or ${PREFIX}/share/girl/girl.xml where PREFIX is the
+install path specified as ./configure --prefix=${PREFIX}, see INSTALL)
+for the GIRL radio station format.
+
+If you find the program useful, drop me an email at ole src gnome org
+
+The 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 it 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 75 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
+
+
+Changes since GNOME Internet Radio Locator 6.1.0:
+
+Documentation
+
+ * help/de/de.po: Add German language translation (Mario Blättermann)
+
+Icons
+ * data/icons/16x16/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/22x22/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/24x24/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/32x32/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/48x48/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/128x128/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/256x256/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/512x512/apps/girl.png: Add new icon (Mathilde Agostini)
+ * data/icons/1024x1024/apps/girl.png: Add new icon (Mathilde Agostini)
+
+Stations
+
+ * src/girl.xml: Add Narvik Studentradio (Narvik, Norway)
+ * src/girl.xml: Add Radio Campus & City (St. Pölten, Austria)
+
+Translations
+
+ * po/cs.po: Updated Czech translation (Marek Černocký)
+ * po/sr.po: Updated Serbian translation (Мирослав Николић)
+ * po/sr latin po: Updated Serbian translation (Miroslav Nikolić)
+
+
+Source
+
+http://download.gnome.org/sources/girl/7.0/girl-7.0.0.tar.xz
+
+Source repository
+git://git.gnome.org/girl
+https://git.gnome.org/browse/girl
+ssh://USERNAME git gnome org/git/girl
+
+Translation status
+https://l10n.gnome.org/module/girl/
+
+Translators are as always welcome to translate the software to a new language.
+
+Authors
+Ole Aamot (Maintainer)
+Marek Černocký (Czech translation)
+Rafael Ferreira (Brazilian Portuguese translation)
+Мирослав Николић/Miroslav Nikolić (Serbian translation)
+Wolfgang Stöggl (German translation)
+Piotr Drąg (Polish translation)
+Muhammet Kara (Turkish translation)
+Balázs Úr (Hungarian translation)
+Wiki Graphic Designer (Icon design)
+Aly Raj (Icon design)
+Andika Triwidada (Indonesian translation)
+Γιάννης Κουτσούκος/Efstathios Iosifidis (Greek translation)
+Matej Urbančič (Slovenian translation)
+Samir Ribić (Bosnian translation)
+Daniel Mustieles (Spanish translation)
+Sveinn í Felli (Icelandic translation)
+Anders Jonsson (Swedish translation)
+Pedro Albuquerque (Portuguese translation)
+Mario Blättermann (German translation)
+Mathilde Agostini (Icon design)
+
+You are welcome to add personal radio stations in $HOME/.girl/girl.xml
+(see src/girl.xml for the syntax) and translations to new languages,
+and submit suggestions for improvements in Bugzilla on
+https://bugzilla.gnome.org/enter_bug.cgi?product=girl
+
+Thanks to all who contributed stations/patches/translations in the 7.0
+release!
+
+==============
GIRL 6.1 notes
==============
@@ -15,7 +156,7 @@ 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.
+translations. See girl-7.0.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
diff --git a/THANKS b/THANKS
index 11aafb6..4e3c4fd 100644
--- a/THANKS
+++ b/THANKS
@@ -8,8 +8,8 @@ Ettore Perazzoli (June 15, 1974 - December 10, 2003) for GNOME VFS.
Bernd Homuth for minor spelling correction.
Muhammet Kara for Turkish translation.
Balázs Úr for Hungarian translation.
-Wiki Graphic Designer for icon design.
-Aly Raj for icon design.
+Wiki Graphic Designer for earliest icon design.
+Aly Raj for earlier icon design.
Andika Triwidada for Indonesian translation.
Dominique Leuenberger for autoconf and automake patch (Bugzilla #743340).
Daniel Mustieles for Spanish translation.
@@ -22,3 +22,5 @@ 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).
+Mario Blättermann for German translation.
+Mathilde Agostini for the GIRL icon design.
diff --git a/configure b/configure
index 7087d2a..89a34bb 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.1.0.
+# Generated by GNU Autoconf 2.69 for girl 7.0.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.1.0'
-PACKAGE_STRING='girl 6.1.0'
+PACKAGE_VERSION='7.0.0'
+PACKAGE_STRING='girl 7.0.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.1.0 to adapt to many kinds of systems.
+\`configure' configures girl 7.0.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.1.0:";;
+ short | recursive ) echo "Configuration of girl 7.0.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.1.0
+girl configure 7.0.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.1.0, which was
+It was created by girl $as_me 7.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2773,7 +2773,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='6.1.0'
+ VERSION='7.0.0'
cat >>confdefs.h <<_ACEOF
@@ -6892,7 +6892,7 @@ uninstall-help:
-ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop.in data/pixmaps/Makefile
data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile
data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/512x512/Makefile
data/icons/1024x1024/Makefile debian/Makefile debian/source/Makefile help/Makefile man/Makefile
po/Makefile.in src/Makefile girl.spec"
+ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop data/pixmaps/Makefile
data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile
data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/512x512/Makefile
data/icons/1024x1024/Makefile debian/Makefile debian/source/Makefile help/Makefile man/Makefile
po/Makefile.in src/Makefile girl.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -7456,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.1.0, which was
+This file was extended by girl $as_me 7.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7522,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.1.0
+girl config.status 7.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7657,7 +7657,7 @@ do
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
- "data/girl.desktop.in") CONFIG_FILES="$CONFIG_FILES data/girl.desktop.in" ;;
+ "data/girl.desktop") CONFIG_FILES="$CONFIG_FILES data/girl.desktop" ;;
"data/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES data/pixmaps/Makefile" ;;
"data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
"data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 9869281..ffd74b2 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.1.0)
+AC_INIT(girl, 7.0.0)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
@@ -91,7 +91,7 @@ YELP_HELP_INIT
AC_OUTPUT([
Makefile
data/Makefile
-data/girl.desktop.in
+data/girl.desktop
data/pixmaps/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
diff --git a/data/Makefile.in b/data/Makefile.in
index 6714963..2f03540 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -95,7 +95,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = girl.desktop.in
+CONFIG_CLEAN_FILES = girl.desktop
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_ AM_V@)
am__v_P_ = $(am__v_P_ AM_DEFAULT_V@)
@@ -181,7 +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
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/girl.desktop.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -493,7 +493,7 @@ $(top_srcdir)/configure: $(am__configure_deps)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-girl.desktop.in: $(top_builddir)/config.status $(srcdir)/girl.desktop.in.in
+girl.desktop: $(top_builddir)/config.status $(srcdir)/girl.desktop.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-appdataDATA: $(appdata_DATA)
@$(NORMAL_INSTALL)
diff --git a/data/icons/1024x1024/apps/girl.png b/data/icons/1024x1024/apps/girl.png
index 608380b..404d0ad 100644
Binary files a/data/icons/1024x1024/apps/girl.png and b/data/icons/1024x1024/apps/girl.png differ
diff --git a/data/icons/16x16/apps/girl.png b/data/icons/16x16/apps/girl.png
index 5ec1298..3f936e8 100644
Binary files a/data/icons/16x16/apps/girl.png and b/data/icons/16x16/apps/girl.png differ
diff --git a/data/icons/22x22/apps/girl.png b/data/icons/22x22/apps/girl.png
index a1c47b7..4cf0f2f 100644
Binary files a/data/icons/22x22/apps/girl.png and b/data/icons/22x22/apps/girl.png differ
diff --git a/data/icons/24x24/apps/girl.png b/data/icons/24x24/apps/girl.png
index 32180fc..c7a3f78 100644
Binary files a/data/icons/24x24/apps/girl.png and b/data/icons/24x24/apps/girl.png differ
diff --git a/data/icons/256x256/apps/girl.png b/data/icons/256x256/apps/girl.png
index 7f055e4..21bc84e 100644
Binary files a/data/icons/256x256/apps/girl.png and b/data/icons/256x256/apps/girl.png differ
diff --git a/data/icons/32x32/apps/girl.png b/data/icons/32x32/apps/girl.png
index 50f0527..8d5b15c 100644
Binary files a/data/icons/32x32/apps/girl.png and b/data/icons/32x32/apps/girl.png differ
diff --git a/data/icons/48x48/apps/girl.png b/data/icons/48x48/apps/girl.png
index d141435..a90f299 100644
Binary files a/data/icons/48x48/apps/girl.png and b/data/icons/48x48/apps/girl.png differ
diff --git a/data/icons/512x512/apps/girl.png b/data/icons/512x512/apps/girl.png
index a4bf743..130bcd2 100644
Binary files a/data/icons/512x512/apps/girl.png and b/data/icons/512x512/apps/girl.png differ
diff --git a/girl.spec.in b/girl.spec.in
index 1f53a40..105d30d 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -3,9 +3,9 @@ Name: @PACKAGE@
Version: @VERSION@
Release: 1%{?dist}
License: GPLv2+
-URL: http://www.ping.uio.no/~oka/src/girl/
+URL: http://people.gnome.org/~ole/girl/
Group: Applications/Internet
-Source: http://www.ping.uio.no/~oka/src/girl/@PACKAGE -@VERSION tar xz
+Source: http://people.gnome.org/~ole/girl/@PACKAGE -@VERSION tar xz
BuildRequires: gtk2-devel
BuildRequires: libgnome-devel
BuildRequires: libxml2-devel
@@ -68,6 +68,9 @@ fi
%{_datadir}/help/*/%{name}/*
%changelog
+* Sun Jan 03 2016 Ole Aamot - 7.0.0-1.fc23
+- Girl 7.0.0 build on Fedora Linux 23
+
* Sat Aug 08 2015 Ole Aamot - 6.1.0-1.fc21
- Girl 6.1.0 build on Fedora Linux 21
diff --git a/help/Makefile b/help/Makefile
index ba789f1..7d92b48 100644
--- a/help/Makefile
+++ b/help/Makefile
@@ -118,13 +118,13 @@ am__can_run_installinfo = \
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/git/gnome/girl/missing aclocal-1.15
+ACLOCAL = ${SHELL} /home/oka/girl/missing aclocal-1.15
ALL_LINGUAS =
AMTAR = $${TAR-tar}
AM_DEFAULT_VERBOSITY = 1
-AUTOCONF = ${SHELL} /home/oka/git/gnome/girl/missing autoconf
-AUTOHEADER = ${SHELL} /home/oka/git/gnome/girl/missing autoheader
-AUTOMAKE = ${SHELL} /home/oka/git/gnome/girl/missing automake-1.15
+AUTOCONF = ${SHELL} /home/oka/girl/missing autoconf
+AUTOHEADER = ${SHELL} /home/oka/girl/missing autoheader
+AUTOMAKE = ${SHELL} /home/oka/girl/missing automake-1.15
AWK = gawk
CATALOGS =
CATOBJEXT = .gmo
@@ -181,7 +181,7 @@ LIBOBJS =
LIBS = -lm
LN_S = ln -s
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/oka/git/gnome/girl/missing makeinfo
+MAKEINFO = ${SHELL} /home/oka/girl/missing makeinfo
MKDIR_P = /usr/bin/mkdir -p
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
@@ -212,10 +212,10 @@ XGETTEXT = /usr/bin/xgettext
XMLLINT = xmllint
YELP_LC_DIST = true
YELP_LC_MEDIA_LINKS = true
-abs_builddir = /home/oka/git/gnome/girl/help
-abs_srcdir = /home/oka/git/gnome/girl/help
-abs_top_builddir = /home/oka/git/gnome/girl
-abs_top_srcdir = /home/oka/git/gnome/girl
+abs_builddir = /home/oka/girl/help
+abs_srcdir = /home/oka/girl/help
+abs_top_builddir = /home/oka/girl
+abs_top_srcdir = /home/oka/girl
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -234,7 +234,7 @@ host_alias =
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/oka/git/gnome/girl/install-sh
+install_sh = ${SHELL} /home/oka/girl/install-sh
intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
intltool__v_merge_options_0 = -q
libdir = ${exec_prefix}/lib
@@ -259,7 +259,7 @@ top_srcdir = ..
HELP_ID = girl
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
+HELP_LINGUAS = cs de en_US
all: all-am
.SUFFIXES:
diff --git a/help/Makefile.in b/help/Makefile.in
index 5b0188e..606fb03 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -259,7 +259,7 @@ top_srcdir = @top_srcdir@
HELP_ID = girl
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
+HELP_LINGUAS = cs de en_US
all: all-am
.SUFFIXES:
diff --git a/src/Makefile.am b/src/Makefile.am
index 01fc8d4..d6478b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,9 +44,9 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
girl_LDADD = $(GIRL_LIBS)
girldir = $(datadir)/girl
-girl_DATA = girl-6.0.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-7.0.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h
girl-runners.h girl-streams.h girl-6.0.dtd girl-map.png girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h
girl-runners.h girl-streams.h girl-7.0.dtd girl-map.png girl-logo.png girl.png girl.xml
all-local: check-local
diff --git a/src/Makefile.in b/src/Makefile.in
index bfe1a2a..05c04dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -400,8 +400,8 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
girl_LDADD = $(GIRL_LIBS)
girldir = $(datadir)/girl
-girl_DATA = girl-6.0.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h
girl-runners.h girl-streams.h girl-6.0.dtd girl-map.png girl-logo.png girl.png girl.xml
+girl_DATA = girl-7.0.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h
girl-runners.h girl-streams.h girl-7.0.dtd girl-map.png girl-logo.png girl.png girl.xml
all: all-am
.SUFFIXES:
diff --git a/src/girl-station.c b/src/girl-station.c
index e25db84..63ff08f 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -269,7 +269,9 @@ void girl_helper_run(char *url, char *name, GirlStreamType type, GirlHelperType
out_ch = g_io_channel_unix_new( out );
err_ch = g_io_channel_unix_new( error );
#endif
- /* Add watches to channels */
+ */
+
+ /* Add watches to channels */
g_io_add_watch( out_ch, G_IO_IN | G_IO_HUP, (GIOFunc)cb_out_watch, girl );
g_io_add_watch( err_ch, G_IO_IN | G_IO_HUP, (GIOFunc)cb_err_watch, girl );
/* Install timeout fnction that will move the progress bar */
diff --git a/src/girl.c b/src/girl.c
index bf4fd41..5580a0e 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -517,13 +517,17 @@ void about_app(GtkWidget * a, gpointer user_data)
"Efstathios Iosifidis <iosifidis opensuse org> (Greek translation)\n"
"Samir Ribić <megaribi epn ba> (Bosnian translation)\n"
"Enrico Nicoletto <liverig gmail com> (Brazilian Portuguese
translation)\n"
- "Sveinn í Felli <sv1 fellsnet is> (Icelandic translation)"));
+ "Sveinn í Felli <sv1 fellsnet is> (Icelandic translation)\n"
+ "Josef Andersson <josef andersson gmail com> (Swedish translation)\n"
+ "Pedro Albuquerque <palbuquerque73 gmail com> (Portuguese
translation)\n"
+ "Mario Blättermann <mario blaettermann gmail com> (German
translation)\n"));
gchar* artists[] = { "Wiki Graphic Designer",
"Aly Raj",
+ "Mathilde Agostini",
NULL };
gchar* comments = { _("Locate Internet Radio Stations") };
- gchar* copyright = { _("Copyright (C) 2014, 2015 Ole Aamot Software") };
- gchar* documenters[] = { _("See yelp://girl"), NULL };
+ gchar* copyright = { _("Copyright (C) 2014, 2015, 2016 Ole Aamot Software") };
+ gchar* documenters[] = { _("Mario Blättermann <mario blaettermann gmail com> (German translation)"),
_("Marek Černocký <marek manet cz> (Czech translation)"), NULL };
static GdkPixbuf* logo;
diff --git a/src/girl.png b/src/girl.png
index d141435..4e80b32 100644
Binary files a/src/girl.png and b/src/girl.png differ
diff --git a/src/girl.xml b/src/girl.xml
index 875c6b3..0ae19da 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,9 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://www.ping.uio.no/~oka/src/girl/girl.xsl"; ?>
-<!DOCTYPE girl SYSTEM "girl-5.0.dtd">
-<girl version="5.0">
+<?xml-stylesheet type="text/xsl" href="http://people.gnome.org/~ole/girl/girl.xsl"; ?>
+<!DOCTYPE girl SYSTEM "girl-7.0.dtd">
+<girl version="7.0">
+ <station band="94.1FM" id="narvikstudentradio" lang="nb" name="Narvik Studentradio" rank="1.0" type="edu">
+ <frequency uri="https://nsr.samfunnet.no/";>94.1 FM in Narvik, Norway</frequency>
+ <location>Narvik, Norway</location>
+ <description lang="nb">
+ Narvik Studentradio is the oldest legal local radio station.
+
+ The station launched in December 1972, is affiliated with the
+ University College of Narvik, and transmits via the FM band in
+ the Narvik area as well as on the Internet.
+ </description>
+ <stream mime="audio/ogg" uri="http://stream.sysrq.no:8000/00-nsr.ogg"; codec="Ogg Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
+ <uri>https://nsr.samfunnet.no/</uri>
+ </station>
+ <station band="94.4FM" id="campusandcityradio" lang="de-AT" name="Campus & City Radio" rank="1.0"
type="edu">
+ <frequency uri="http://www.campusradio.at/";>94.4 FM in St. Pölten, Austria</frequency>
+ <location>St. Pölten, Austria</location>
+ <description lang="de-AT">
+ 24 Stunden lang Beiträge von Studierenden der FH St. Pölten, von RadiomacherInnen aus St. Pölten und
Umgebung, Beiträge der freien Radios Österreichs und Musik aus allen Genres.
+ </description>
+ <stream mime="audio/mpeg" uri="http://www.cr944.at:8000/cr944-high.m3u"; codec="MPEG 1 Audio, Layer 3
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
+ <uri>http://www.campusradio.at/</uri>
+ </station>
<station band="" id="radiouniversidad" lang="en" name="Radio Universidad" rank="1.0" type="edu">
- <frequency uri="http://radiou.usac.edu.gt/";>92.1 FM in Guatemala City, </frequency>
+ <frequency uri="http://radiou.usac.edu.gt/";>92.1 FM in Guatemala City, Guatemala</frequency>
<location>Guatemala City, Guatemala</location>
<description lang="es">
Radio universidad obtiene su frecuencia en 1990 y sale al aire por primera vez en octubre de 1991 bajo
la coor dinación del periodista David Grajeda. Su potencia era solamente de 300 vatios, lo cual no le
permitía una gran proyección. En esta primera época cubría cuatro horas, programando de 8:00 a 12:00 horas.
Operaba en el segundo nivel del Edificio de Bienestar Estudiantil en la ciudad universitaria, zona 12. El 29
de enero de 1992 se traslada a las instalaciones del Centro Cultural Universitario en la 2ª. Avenida 12-40 de
la zona 1, y un día después, queda oficialmente inaugurada. Sus operaciones iniciaron con una donación de
equipo del Gobierno de España que permitió instalar un transmisor con 1 kilovatio de potencia ampliando su
cobertura un poco más allá del área metropolitana. Desde 1994 se cuenta con un transmisor de 10 kilovatios
que le permite tener una cobertura de más de 200 kms. Alrededor de la capital del país. Posteriormente se
realizan
las gestiones para instalar una antena de transmisión desde el Cerro Alux, arrendándose durante algún tiempo
espacio en la torre de Radio Rumbos. Se iniciaron trámites para contar con un terreno propio, ante la
carencia de espacio en el Cerro. En 1998 se suscribe un contrato de arrendamiento con la Municipalidad de San
Lucas Sacatepéquez y se procede a la construcción y acondicionamiento de una modesta cabina con su respectiva
guardianía. En el año 2001 se construyen en el Cerro Alux las nuevas instalaciones para los aparatos de
transmisión y espacio para planta eléctrica de emergencia. En el año 2005, a través de gestiones realizadas
con la fundación “Aracalacana”, adquiere nuevo equipo para el apoyo de la producción y la transmisión por
control remoto. Se instituye la automatización computarizada para la transmisión de radio. Dos años después
se establecen como actividades rutinarias las transmisiones en directo de actividades grandes como la Huelga
de Dolores, la celebración de la Autonomía Universitaria y la Fundación de la Universidad, los partidos de
fútbol del equipo universitario, entre otros acontecimientos de alta trascendencia nacional y académica. A
partir del año 2009, se comienzan a realizar las primeras transmisiones vía internet, desde puntos externos a
la cabina de transmisión, alcanzando con éxito la primera transmisión con sonido de mejor definición desde el
Campus Universitario a mediados del año 2010, entrando de esta manera, a una nueva etapa tecnológica para la
transmisión por radio.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
