[girl] GNOME Internet Radio Locator version 2.1.0
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] GNOME Internet Radio Locator version 2.1.0
- Date: Wed, 29 Apr 2015 08:24:07 +0000 (UTC)
commit 9f26c4d8266c78d7b22f4496f2c7a9a02e55fa22
Author: Ole Aamot <oka oka no>
Date: Sat Apr 25 16:11:10 2015 +0200
GNOME Internet Radio Locator version 2.1.0
ChangeLog | 34 ++++++++++++++++++++++++++++++++++
NEWS | 8 ++++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
girl.spec.in | 3 +++
src/Makefile.am | 5 ++---
src/Makefile.in | 22 +++-------------------
src/girl.xml | 13 +++++++++++--
8 files changed, 72 insertions(+), 35 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9f39b00..a5dce0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+commit b1732c1310cc4d878328dfc1c3672071310a81fd
+Author: Ole Aamot <oka oka no>
+Date: Sun Mar 29 00:10:52 2015 +0100
+
+ GIRL 2.0.0
+
+ ChangeLog | 1640 ++++++++++++++++++++++++++++++++++------
+ Makefile.am | 27 +-
+ NEWS | 16 +
+ README | 9 +
+ THANKS | 1 +
+ configure | 337 ++++++++-
+ configure.ac | 5 +-
+ data/Makefile.in | 8 +-
+ data/icons/16x16/Makefile.in | 8 +-
+ data/icons/22x22/Makefile.in | 8 +-
+ data/icons/24x24/Makefile.in | 8 +-
+ data/icons/256x256/Makefile.in | 8 +-
+ data/icons/32x32/Makefile.in | 8 +-
+ data/icons/48x48/Makefile.in | 8 +-
+ data/icons/Makefile.in | 8 +-
+ data/pixmaps/Makefile.in | 8 +-
+ data/screenshot.png | Bin 165520 -> 251842 bytes
+ girl.spec.in | 4 +
+ src/Makefile.am | 4 +-
+ src/Makefile.in | 12 +-
+ src/girl-gui.c | 11 +-
+ src/girl-station.c | 2 +-
+ src/girl-station.h | 2 +
+ src/girl.c | 39 +-
+ src/girl.h | 6 +-
+ src/girl.xml | 149 ++--
+ 26 files changed, 1979 insertions(+), 357 deletions(-)
+
commit c24031433d2b13b817ec9df7413f4e26e6ad9220
Author: Balázs Úr <urbalazs gmail com>
Date: Mon Mar 23 16:40:10 2015 +0000
diff --git a/NEWS b/NEWS
index fe02193..5eb16df 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,12 @@
=============
+Version 2.1.0
+=============
+
+Stations
+
+ * src/girl.xml: Add KTUH (ktuh.org)
+
+=============
Version 2.0.0
=============
diff --git a/configure b/configure
index fc50c48..b9b7cba 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 2.0.0.
+# Generated by GNU Autoconf 2.69 for girl 2.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='2.0.0'
-PACKAGE_STRING='girl 2.0.0'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='girl 2.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 2.0.0 to adapt to many kinds of systems.
+\`configure' configures girl 2.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 2.0.0:";;
+ short | recursive ) echo "Configuration of girl 2.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 2.0.0
+girl configure 2.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 2.0.0, which was
+It was created by girl $as_me 2.1.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='2.0.0'
+ VERSION='2.1.0'
cat >>confdefs.h <<_ACEOF
@@ -7447,7 +7447,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 2.0.0, which was
+This file was extended by girl $as_me 2.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7513,7 +7513,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 2.0.0
+girl config.status 2.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 8129484..cb407ca 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, 2.0.0)
+AC_INIT(girl, 2.1.0)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
diff --git a/girl.spec.in b/girl.spec.in
index 9565f25..016fc3f 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -68,6 +68,9 @@ fi
%{_datadir}/help/*/%{name}/*
%changelog
+* Sat Apr 25 2015 Ole Aamot - 2.1.0-1.fc21
+- Girl 2.1.0 build on Fedora Linux 21
+
* Tue Mar 24 2015 Ole Aamot - 2.0.0-1.fc21
- Girl 2.0.0 build on Fedora Linux 21
diff --git a/src/Makefile.am b/src/Makefile.am
index db963a8..6d35dfc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,6 @@ girl_SOURCES = \
girl-program.c \
girl-runners.c \
girl-streams.c \
- girl-canvas.c \
girl-station.c
girl_CFLAGS = $(GIRL_CFLAGS) \
@@ -23,6 +22,6 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
girl_LDADD = $(GIRL_LIBS)
girldir = $(datadir)/girl
-girl_DATA = girl-2.0.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-2.1.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h
girl-canvas.h girl-2.0.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h
girl-2.1.dtd girl-logo.png girl.png girl.xml
diff --git a/src/Makefile.in b/src/Makefile.in
index 3b1a09c..678bd5b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -95,7 +95,7 @@ PROGRAMS = $(bin_PROGRAMS)
am_girl_OBJECTS = girl-girl.$(OBJEXT) girl-girl-gui.$(OBJEXT) \
girl-girl-listener.$(OBJEXT) girl-girl-program.$(OBJEXT) \
girl-girl-runners.$(OBJEXT) girl-girl-streams.$(OBJEXT) \
- girl-girl-canvas.$(OBJEXT) girl-girl-station.$(OBJEXT)
+ girl-girl-station.$(OBJEXT)
girl_OBJECTS = $(am_girl_OBJECTS)
am__DEPENDENCIES_1 =
girl_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -335,7 +335,6 @@ girl_SOURCES = \
girl-program.c \
girl-runners.c \
girl-streams.c \
- girl-canvas.c \
girl-station.c
girl_CFLAGS = $(GIRL_CFLAGS) \
@@ -349,8 +348,8 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
girl_LDADD = $(GIRL_LIBS)
girldir = $(datadir)/girl
-girl_DATA = girl-2.0.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h
girl-canvas.h girl-2.0.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-2.1.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h
girl-2.1.dtd girl-logo.png girl.png girl.xml
all: all-am
.SUFFIXES:
@@ -438,7 +437,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
- AMDEP_TRUE@@am__include@ @am__quote /$(DEPDIR)/girl-girl-canvas Po am__quote@
@AMDEP_TRUE@@am__include@ @am__quote /$(DEPDIR)/girl-girl-gui Po am__quote@
@AMDEP_TRUE@@am__include@ @am__quote /$(DEPDIR)/girl-girl-listener Po am__quote@
@AMDEP_TRUE@@am__include@ @am__quote /$(DEPDIR)/girl-girl-program Po am__quote@
@@ -545,20 +543,6 @@ girl-girl-streams.obj: girl-streams.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-streams.obj `if test -f 'girl-streams.c'; then
$(CYGPATH_W) 'girl-streams.c'; else $(CYGPATH_W) '$(srcdir)/girl-streams.c'; fi`
-girl-girl-canvas.o: girl-canvas.c
- am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-canvas.o -MD -MP -MF $(DEPDIR)/girl-girl-canvas.Tpo -c -o
girl-girl-canvas.o `test -f 'girl-canvas.c' || echo '$(srcdir)/'`girl-canvas.c
- am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-canvas.Tpo $(DEPDIR)/girl-girl-canvas.Po
- AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='girl-canvas.c' object='girl-girl-canvas.o'
libtool=no @AMDEPBACKSLASH@
- AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-canvas.o `test -f 'girl-canvas.c' || echo
'$(srcdir)/'`girl-canvas.c
-
-girl-girl-canvas.obj: girl-canvas.c
- am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-canvas.obj -MD -MP -MF $(DEPDIR)/girl-girl-canvas.Tpo -c -o
girl-girl-canvas.obj `if test -f 'girl-canvas.c'; then $(CYGPATH_W) 'girl-canvas.c'; else $(CYGPATH_W)
'$(srcdir)/girl-canvas.c'; fi`
- am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-canvas.Tpo $(DEPDIR)/girl-girl-canvas.Po
- AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='girl-canvas.c' object='girl-girl-canvas.obj'
libtool=no @AMDEPBACKSLASH@
- AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS)
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-canvas.obj `if test -f 'girl-canvas.c'; then
$(CYGPATH_W) 'girl-canvas.c'; else $(CYGPATH_W) '$(srcdir)/girl-canvas.c'; fi`
-
girl-girl-station.o: girl-station.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-station.o -MD -MP -MF $(DEPDIR)/girl-girl-station.Tpo -c -o
girl-girl-station.o `test -f 'girl-station.c' || echo '$(srcdir)/'`girl-station.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-station.Tpo $(DEPDIR)/girl-girl-station.Po
diff --git a/src/girl.xml b/src/girl.xml
index 3f3c5ad..2932a0b 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,7 +1,16 @@
<?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-2.0.dtd">
-<girl version="1.0">
+<!DOCTYPE girl SYSTEM "girl-2.1.dtd">
+<girl version="2.1">
+ <station band="ONLINE" id="ktuh" lang="en" name="KTUH FM" rank="1.0" type="edu">
+ <frequency uri="http://ktuh.org/">Honolulu, HI</frequency>
+ <location>Honolulu, Hawaii</location>
+ <description>
+ KTUH is a student-run noncommercial radio station broadcasting from the University of Hawai’i at
Manoa. We’ve been serving the community since 1969 with a variety of programs that include public
announcements, equipment for community events, and a practical chance to learn about radio broadcasting. KTUH
was granted a license to the Board of Regents as a non-commercial educational FM Station by the Federal
Communications Commission (FCC) on June 28, 1985. Maintaining a staff in excess of 70 volunteers annually,
KTUH operates 24 hours a day, year-round.
+ </description>
+ <stream mime="audio/mpeg" uri="http://stream.ktuh.org:8000/stream-mp3.m3u" codec="MPEG 1 Audio, Layer 3
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <uri>http://ktuh.org/</uri>
+ </station>
<station band="ONLINE" id="nrkp1" lang="no" name="NRK P1" rank="1.0" type="gov">
<frequency uri="http://www.nrk.no/p1/">ONLINE in Oslo, Norway</frequency>
<location>Oslo, Norway</location>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]