Skip to content

Commit

Permalink
Update: Release Icecast 2.5 beta3
Browse files Browse the repository at this point in the history
  • Loading branch information
ph3-der-loewe committed Mar 13, 2022
1 parent 41e0732 commit 57093de
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 16 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2022-03-13 18:25:33 Philipp Schafft <lion@lion.leolix.org>

* Preparing for 2.5 beta3 aka 2.4.99.3

2017-11-17 09:04:42 Thomas B. Ruecker <thomas@ruecker.fi>

* Preparing for 2.5 beta2 aka 2.4.99.2
Expand Down
6 changes: 6 additions & 0 deletions ci/osc/icecast/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
icecast2 (2.4.99.3-1) UNRELEASED; urgency=medium

* Preparing for 2.5 beta3 aka 2.4.99.3

-- Philipp Schafft <lion@lion.leolix.org> Sun, 13 Mar 2022 18:25:33 +0000

icecast2 (2.4.99.2-1) UNRELEASED; urgency=medium

* 2.5 beta 2
Expand Down
6 changes: 5 additions & 1 deletion ci/osc/icecast/icecast.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%define version_archive _VERSION_ARCHIVE_
Summary: Streaming media server
Name: icecast
Version: 2.4.99.2
Version: 2.4.99.3
Release: 1%{?dist}
Group: Applications/Multimedia
#because one way to say this is not enough...
Expand Down Expand Up @@ -180,6 +180,10 @@ fi
%dir %attr(-,%{name},%{name}) %{_localstatedir}/log/icecast

%changelog
* Sun Mar 13 2022 Philipp Schafft <lion@lion.leolix.org> - 2.4.99.3-1
- Preparing for 2.5 beta3 aka 2.4.99.3


* Fri May 11 2018 Thomas B. Ruecker <thomas@ruecker.fi> - 2.4.2.99-1
- 2.5 Beta 2

Expand Down
10 changes: 7 additions & 3 deletions ci/osc/mingw32-icecast-installer/mingw32-icecast-installer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Summary: Installer for MinGW Windows port of Icecast streaming media server
Name: mingw32-icecast-installer
Version: 2.4.99.2
Version: 2.4.99.3
Release: 2%{?dist}
Group: Applications/Multimedia
License: GPL-2.0
Expand Down Expand Up @@ -70,15 +70,19 @@ makensis icecast.nsis -V4

%install
mkdir -p "%{buildroot}/%{_mingw32_bindir}"
cp %_builddir/installer/icecast_win32_2.5-beta2.exe "%{buildroot}/%{_mingw32_bindir}"
cp %_builddir/installer/icecast_win32_2.5-beta3.exe "%{buildroot}/%{_mingw32_bindir}"

%clean

%files
%defattr(-,root,root)
%{_mingw32_bindir}/icecast_win32_2.5-beta2.exe
%{_mingw32_bindir}/icecast_win32_2.5-beta3.exe

%changelog
* Sun Mar 13 2022 Philipp Schafft <lion@lion.leolix.org> - 2.4.99.3-1
- Preparing for 2.5 beta3 aka 2.4.99.3


* Sun Mar 06 2022 Stephan Jauernick <info@stephan-jauernick.de> - 2.4.99.2

Rework OBS CI/CD
Expand Down
6 changes: 5 additions & 1 deletion ci/osc/mingw32-icecast/mingw32-icecast.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
%define version_archive _VERSION_ARCHIVE_
Summary: MinGW Windows port of Icecast streaming media server
Name: mingw32-icecast
Version: 2.4.99.2
Version: 2.4.99.3
Release: 2%{?dist}
Group: Applications/Multimedia
License: GPL-2.0
Expand Down Expand Up @@ -78,6 +78,10 @@ rm -rf %{buildroot}
#%%{_mingw32_sysconfdir}/icecast.xml

%changelog
* Sun Mar 13 2022 Philipp Schafft <lion@lion.leolix.org> - 2.4.99.3-1
- Preparing for 2.5 beta3 aka 2.4.99.3


* Sun Mar 06 2022 Stephan Jauernick <info@stephan-jauernick.de> - 2.4.99.2

Work in Progress rebuilding Icecast OBS CI
Expand Down
4 changes: 2 additions & 2 deletions ci/osc/nightly-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ fi
export ICECAST_PROJECT=icecast
export W32_ICECAST_PROJECT=mingw32-icecast
export W32_ICECAST_INSTALLER_PROJECT=mingw32-icecast-installer
export ICECAST_BETA_VERSION=2
export ICECAST_VERSION=2.4.99.2
export ICECAST_BETA_VERSION=3
export ICECAST_VERSION=2.4.99.3
export ICECAST_CI_VERSION=$ICECAST_VERSION+`date +%Y%m%d%H%M%S`+`git rev-parse HEAD`
export DISABLE_CHANGELOG=0
export RELEASE_AUTHOR=${CI_COMMIT_AUTHOR:?Please set CI_COMMIT_AUTHOR}
Expand Down
8 changes: 4 additions & 4 deletions ci/osc/release-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ fi
export ICECAST_PROJECT=icecast
export W32_ICECAST_PROJECT=mingw32-icecast
export W32_ICECAST_INSTALLER_PROJECT=mingw32-icecast-installer
export ICECAST_BETA_VERSION=2
export ICECAST_VERSION=2.4.99.2
export ICECAST_BETA_VERSION=3
export ICECAST_VERSION=2.4.99.3
export ICECAST_CI_VERSION=$ICECAST_VERSION
export DISABLE_CHANGELOG=1
export RELEASE_AUTHOR="Thomas B. Ruecker <thomas@ruecker.fi>"
export RELEASE_DATETIME=2017-11-17T09:04:42
export RELEASE_AUTHOR="Philipp Schafft <lion@lion.leolix.org>"
export RELEASE_DATETIME=2022-03-13T18:25:33+00:00
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([Icecast], [2.4.99.2], [icecast@xiph.org])
AC_INIT([Icecast], [2.4.99.3], [icecast@xiph.org])

AC_PREREQ([2.54])

Expand Down
4 changes: 2 additions & 2 deletions doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<a class="current" href=".">Introduction</a>
<ul class="subnav">

<li class="toctree-l2"><a href="#icecast-25-beta-2-documentation">Icecast 2.5 beta2 Documentation</a></li>
<li class="toctree-l2"><a href="#icecast-25-beta-3-documentation">Icecast 2.5 beta3 Documentation</a></li>


<li class="toctree-l2"><a href="#prerequisites">Prerequisites</a></li>
Expand Down Expand Up @@ -138,7 +138,7 @@
<div role="main">
<div class="section">

<h1 id="icecast-25-beta-2-documentation">Icecast 2.5 beta2 Documentation</h1>
<h1 id="icecast-25-beta-3-documentation">Icecast 2.5 beta3 Documentation</h1>
<p>Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 audio streams.
It can be used to create an Internet radio station or a privately running jukebox and many
things in between. It is very versatile in that new formats can be added relatively easily
Expand Down
4 changes: 2 additions & 2 deletions win32/icecast.nsis
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

;Name and file
Name "Icecast"
OutFile "icecast_win32_2.5-beta2.exe"
OutFile "icecast_win32_2.5-beta3.exe"

;Default installation folder
InstallDir "$PROGRAMFILES32\Icecast"
Expand Down Expand Up @@ -136,7 +136,7 @@ Section "Icecast" SecIcecastWin32
WriteRegStr HKLM $RegistryPathForUninstall "Publisher" "Xiph.org Foundation / The Icecast Project"
WriteRegStr HKLM $RegistryPathForUninstall "HelpLink" "http://icecast.org/contact"
WriteRegStr HKLM $RegistryPathForUninstall "URLInfoAbout" "http://icecast.org/"
WriteRegStr HKLM $RegistryPathForUninstall "DisplayVersion" "2.5 beta2"
WriteRegStr HKLM $RegistryPathForUninstall "DisplayVersion" "2.5 beta3"
WriteRegStr HKLM $RegistryPathForUninstall "InstallLocation" "$INSTDIR"
WriteRegStr HKLM $RegistryPathForUninstall "InstallDate" "$Year$Month$Day"
WriteRegDWORD HKLM $RegistryPathForUninstall "NoModify" 0x1
Expand Down

0 comments on commit 57093de

Please sign in to comment.