GNOME.org
 

[girl] girl version 0.6.0

commit 6619beb0aebb3061391b4b384ab1ed21e3d45088
Author: Ole Aamot <oka oka no>
Date:   Sat Dec 6 11:32:10 2014 +0100

    girl version 0.6.0

 AUTHORS            |    3 ++-
 ChangeLog          |   16 ++++++++++++++++
 Makefile.am        |    1 +
 Makefile.in        |    1 +
 NEWS               |    6 ++++++
 NEWS-0.5           |    2 +-
 THANKS             |    1 +
 configure          |   20 ++++++++++----------
 configure.ac       |    2 +-
 girl.doap          |    2 +-
 girl.spec.in       |   28 +++++++++++-----------------
 src/girl-station.c |    1 +
 src/stations.xml   |   36 +++++++++++++++++++++++++++++++++---
 13 files changed, 85 insertions(+), 34 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 7c26475..ce25a1f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
 Ole Aamot <oka+girl ping uio no> (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)
\ No newline at end of file
+Мирослав Николић/Miroslav Nikolić <miroslavnikolic rocketmail com> (Serbian translation)
+Wolfgang Stöggl (German translation)
diff --git a/ChangeLog b/ChangeLog
index 09c3d15..92c460e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-12-06  Ole Aamot  <oka oka no>
+
+       * NEWS: girl 0.6.0 released.
+
+2014-12-04  Ole Aamot  <oka oka no>
+
+       * AUTHORS: Add Wolfgang Stöggl (German translation).
+       * po/de.po: German translation by Wolfgang Stöggl
+
+2014-12-02  Ole Aamot  <oka oka no>
+
+       * src/stations.xml: Add Leeds University Student Radio FM (lsrfm.com)
+       * src/stations.xml: Add University Radio Nottingham (urn1350.net))
+       * src/stations.xml: Add King's College London Radio (kclradio.co.uk)
+       * src/stations.xml: Add Imperial College Radio (icradio.com)
+
 2014-11-29  Ole Aamot  <oka oka no>
 
        * configure.ac: girl version 0.5.2.
diff --git a/Makefile.am b/Makefile.am
index 739ba8d..d776f9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ EXTRA_DIST = config.rpath m4/ChangeLog  \
        LETTER \
        NEWS \
        NEWS-0.5 \
+       NEWS-0.6 \
        THANKS \
        TODO \
        girl.spec.in
diff --git a/Makefile.in b/Makefile.in
index ca8b0ce..4434c53 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -325,6 +325,7 @@ EXTRA_DIST = config.rpath m4/ChangeLog  \
        LETTER \
        NEWS \
        NEWS-0.5 \
+       NEWS-0.6 \
        THANKS \
        TODO \
        girl.spec.in
diff --git a/NEWS b/NEWS
index 069fae4..62ada79 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2014-12-06  Ole Aamot  <oka oka no>
+
+       * girl version 0.6.0 release.
+       * AUTHORS: Add Wolfgang Stöggl (German translation).
+       * po/de.po: German translation by Wolfgang Stöggl
+
 2014-11-29  Ole Aamot  <oka oka no>
 
        * girl version 0.5.2 release.
diff --git a/NEWS-0.5 b/NEWS-0.5
index bc4be02..eb000a2 100644
--- a/NEWS-0.5
+++ b/NEWS-0.5
@@ -98,4 +98,4 @@ Version 0.1.0
 
 GUI (src/girl-gui.c)
 
-       * Initial release.
\ No newline at end of file
+       * Initial release.
diff --git a/THANKS b/THANKS
index 807ed82..77c17eb 100644
--- a/THANKS
+++ b/THANKS
@@ -3,3 +3,4 @@ Richard Hughes for tips on adding data/girl.app.data.xml and data/girl.desktop.i
 Federico Mena Quintero for launching the GNOME project and writing GNOME Canvas
 Piotr Drąg for fixing minor typos in src/girl-station.c
 Hans Petter Jansson for help with debugging GNOME VFS.
+Ettore Perazzoli (June 15, 1974 - December 10, 2003) for GNOME VFS.
\ No newline at end of file
diff --git a/configure b/configure
index 6d00be4..d95c324 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 0.5.2.
+# Generated by GNU Autoconf 2.69 for girl 0.6.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='0.5.2'
-PACKAGE_STRING='girl 0.5.2'
+PACKAGE_VERSION='0.6.0'
+PACKAGE_STRING='girl 0.6.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1324,7 +1324,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 0.5.2 to adapt to many kinds of systems.
+\`configure' configures girl 0.6.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1390,7 +1390,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 0.5.2:";;
+     short | recursive ) echo "Configuration of girl 0.6.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1489,7 +1489,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 0.5.2
+girl configure 0.6.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,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 0.5.2, which was
+It was created by girl $as_me 0.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2717,7 +2717,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='0.5.2'
+ VERSION='0.6.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6550,7 +6550,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 0.5.2, which was
+This file was extended by girl $as_me 0.6.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6616,7 +6616,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 0.5.2
+girl config.status 0.6.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 4591bff..61d66ef 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, 0.5.2)
+AC_INIT(girl, 0.6.0)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/girl.doap b/girl.doap
index 51c6051..369225c 100644
--- a/girl.doap
+++ b/girl.doap
@@ -5,7 +5,7 @@
          xmlns="http://usefulinc.com/ns/doap#";>
   <name xml:lang="en">GNOME Internet Radio Locator</name>
   <shortdesc xml:lang="en">Locate Internet Radio Stations</shortdesc>
-  <description>Girl, the GNOME Internet Radio Locator program, allow users to easily find live radio 
programs on radio broadcasters on the Internet.  Girl is developed on the new GNOME 2.0 platform and requires 
at least one audio helper such as totem to be installed.  Enjoy Internet Radio.</description>
+  <description>Girl, the GNOME Internet Radio Locator program, allow users to easily find live radio 
programs on radio broadcasters on the Internet.  Girl is developed on the new GNOME platform and requires at 
least one audio helper such as totem to be installed.  Enjoy Internet Radio.</description>
   <homepage rdf:resource="https://wiki.gnome.org/Apps/Girl"; />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/girl-list"; />
   <download-page rdf:resource="http://download.gnome.org/sources/girl/"; />
diff --git a/girl.spec.in b/girl.spec.in
index 045e66c..5d40fcb 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -1,15 +1,11 @@
-%define name @PACKAGE@
-%define ver @VERSION@
-%define rel 1
-Summary: GNOME 2.0 Internet Radio Locator program
-Name: %{name}
-Version: %{ver}
-Release: %{rel}
+Summary: GNOME Internet Radio Locator program
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 1
 License: GPLv2+
 URL: http://www.ping.uio.no/~oka/src/girl/
 Group: Applications/Internet
 Source: http://www.ping.uio.no/~oka/src/girl/@PACKAGE -@VERSION  tar xz
-BuildRoot: %{_tmppath}/%{name}-root
 Requires: gtk2 >= 2.24.24
 Requires: libgnome >= 2.32.1
 Requires: libxml2 >= 2.9.1
@@ -23,8 +19,8 @@ Girl is a GNOME Internet Radio Locator program that allow users
 to easily find live radio programs on radio broadcasters on the
 Internet.
 
-Girl is developed on the new GNOME 2.0 platform and it requires
-at least one audio helper to be installed.
+Girl is developed on the GNOME platform and it requires at least
+one audio helper such as Totem to be installed.
 
 Enjoy Internet Radio.
 
@@ -37,15 +33,11 @@ Enjoy Internet Radio.
 
 %install
 
-%makeinstall
-
-mkdir -p %{buildroot}%{_bindir}
+%make_install
+make DESTDIR=%{buildroot} install
 
 %find_lang %{name} --with-man
 
-%clean
-rm -rf %{buildroot}
-
 %files -f %{name}.lang
 %doc AUTHORS COPYING LETTER NEWS README TODO YP-DIRS
 %lang(cs)
@@ -72,10 +64,12 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/32x32/apps/girl.png
 %{_datadir}/icons/hicolor/48x48/apps/girl.png
 %{_datadir}/icons/hicolor/256x256/apps/girl.png
-%{_datadir}/icons/hicolor/icon-theme.cache
 %{_mandir}/man1/girl.1.gz
 
 %changelog
+* Tue Dec 02 2014 Ole Aamot - 0.6.0-1
+- Girl 0.6.0 build on Fedora Linux 21
+
 * Sat Nov 29 2014 Ole Aamot - 0.5.2-1
 - Girl 0.5.2 build on Fedora Linux 21
 
diff --git a/src/girl-station.c b/src/girl-station.c
index cbb1918..63de5e8 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -162,6 +162,7 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
                            xmlNodeListGetString(doc, sub->xmlChildrenNode,
                                                 1);
                        MSG("station->location = %s\n", station->location);
+                       /* fprintf(stdout, "%s (%s), ", station->name, station->location); */
                }
 
                if ((!xmlStrcmp
diff --git a/src/stations.xml b/src/stations.xml
index ab6ae92..fb8e363 100644
--- a/src/stations.xml
+++ b/src/stations.xml
@@ -1,6 +1,36 @@
 <?xml version="1.0"?>
 <!DOCTYPE girl SYSTEM "girl-0.6.dtd">
 <girl version="0.6">
+  <station id="lsrfm" name="Leeds University Student Radio FM" rank="1.0" type="edu" release="">
+    <frequency uri="http://lsrfm.com/";>Internet</frequency>
+    <location>Leeds, United Kingdom</location>
+    <description></description>
+    <stream mime="audio/mpeg" uri="http://soho.wavestreamer.com:6648/listen.pls?sid=1"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://lsrfm.com/</uri>
+  </station>
+  <station id="urn" name="University Radio Nottingham" rank="1.0" type="edu" release="1350">
+    <frequency uri="http://urn1350.net";>1350 AM MHz in Nottingham, United Kingdom</frequency>
+    <location>Nottingham, United Kingdom</location>
+    <description>URN is the University of Nottingham's award winning student radio station.You can listen 
online, on 1350AM on campus or in some of the university's shops and bars.</description>
+    <stream mime="audio/mpeg" uri="http://posurnl.nottingham.ac.uk:8080/urn_high.mp3"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://urn1350.net/</uri>
+  </station>
+  <station id="kcl" name="King's College London Radio" rank="1.0" type="edu" release="">
+    <frequency uri="http://www.kclradio.co.uk/";>Internet</frequency>
+    <location>London, United Kingdom</location>
+    <description>KCL Radio is King’s College London’s award winning, student radio station, which first 
broadcast live last year. Our studio is currently located on the basement floor of the Chesham Building 
(although there are plans to relocate to a new studio in Tutu’s on the 4th floor of the Macadam Building 
during 2015).  Output ranges from music to news, chat, sport, comedy and everything in between. Live 
broadcasts also take place throughout the year for significant events on the KCLSU calendar such as the 
Student Officer Elections or the Varsity Rugby match.</description>
+    <stream mime="audio/mpeg" uri="http://159.92.75.8:8080/KCLR"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://www.kclradio.co.uk/</uri>
+  </station>
+  <station id="icradio" name="Imperial College Radio" rank="1.0" type="edu" release="">
+    <frequency uri="http://icradio.com/";>1134 AM in Wye, Kent, United Kingdom</frequency>
+    <location>London, United Kingdom</location>
+    <description>IC Radio is among the oldest student radio stations in the country. Started in 1976, 
broadcasting on a home built AM transmitter around halls, we now broadcast all over the globe from 
icradio.com. Absolutely anyone is welcome to try their hand at presenting or producing a show; whatever your 
music taste. We also love a good speech based program, so anyone will feel at home in IC Radio. As well as 
being able to broadcast, we are lucky enough to have a brand new, fully equipped recording studio which we 
use to record bands and musicians.
+
+Behind the scenes we rely on our fantastic technical, musical and promotional teams. Are you interested in 
web design? Want to record professional band and artists? Maybe you fancy running our IT system? Or perhaps 
you want to talk to industry insiders to get your hands on new music weeks before any of your friends? 
There's a place for you here and we'd love for you to join us!</description>
+    <stream mime="audio/mpeg" uri="http://icecast.icradio.com:8000/live-mp3-high"; codec="MPEG 1 Audio, Layer 
3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
+    <uri>http://icradio.com/</uri>
+  </station>
   <station id="ruc" name="Coimbra University Radio" rank="1.0" type="edu" release="107.9">
     <frequency uri="http://www.ruc.pt/";>107.9 FM MHz in Coimbra, Portugal</frequency>
     <location>Coimbra, Portugal</location>
@@ -13,14 +43,14 @@
     The radio gives courses in Programming, Technic and News, that students from the University of Coimbra 
can join.
     
     For its 25th anniversary, the radio hosts concerts of the indie Swedish band the Radio Dept., and later 
Eleanor Friedberger from the rock duo The Fiery Furnaces and the Welsh songwriter Euros Childs.</description>
-    <stream mime="mime/mpeg" uri="http://ruc.midi-club.net:8000/;stream/1"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <stream mime="audio/mpeg" uri="http://ruc.midi-club.net:8000/;stream/1"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.ruc.pt/</uri>
   </station>
   <station id="radiocampusbruxelles" name="Radio Campus Bruxelles" rank="1.0" type="edu" release="92.1">
     <frequency uri="http://www.radiocampus.be/";>92.1 MHz FM in Bruxelles, Belgium</frequency>
     <location>Bruxelles, Belgium</location>
     <description>Radio Campus est née en 1980 sur le campus de l’Université Libre de Bruxelles. Avec une 
cinquantaine d’émissions, elle rassemble plus de 150 animateurs, techniciens et collaborateurs autour de 
valeurs partagées : une libre expression assumée et constructive, un attachement immodéré au tissu social 
bruxellois et un amour sans borne pour la diversité musicale et culturelle.</description>
-    <stream mime="mime/mpeg" uri="http://streamer.radiocampus.be:8000/stream_hi.ogg"; codec="Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
+    <stream mime="audio/mpeg" uri="http://streamer.radiocampus.be:8000/stream_hi.ogg"; codec="Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
     <uri>http://www.radiocampus.be/</uri>
   </station>
   <station id="radiocampusparis" name="Radio Campus Paris" rank="1.0" type="edu" release="93.9">
@@ -34,7 +64,7 @@
     <frequency uri="http://wcsb.org/";>89.3 MHz FM in Cleveland, OH</frequency>
     <location>Cleveland, OH</location>
     <description>A student-operated radio station at Cleveland State University, broadcasting from northeast 
Ohio.</description>
-    <stream mime="mime/mpeg" uri="http://cent7.directhostingcenter.com/tunein.php/ubtevcdv/playlist.pls"; 
codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <stream mime="audio/mpeg" uri="http://cent7.directhostingcenter.com/tunein.php/ubtevcdv/playlist.pls"; 
codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://wcsb.org/</uri>
   </station>
   <station id="pulse" name="Pulse LSE" rank="1.0" type="edu" release="87.7">
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]