Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source 
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-01-07 14:55:04 -05:00
parent d3ff39c5a5 7b44b4ffbc
commit 5e85759472
3 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -22862,3 +22862,8 @@
* Removed generation of the 'rivwebpyapi' RPM package.
2022-01-04 Fred Gleason <fredg@paravelsystems.com>
* Removed generation of the 'rivendell-pypad' RPM package.
2022-01-07 Fred Gleason <fredg@paravelsystems.com>
* Removed generation of the 'rivwebpyapi' DEB package.
2022-01-07 Fred Gleason <fredg@paravelsystems.com>
* Merged the 'rivendell-pypad' DEB package into the 'rivendell'
DEB package.

21
debian/control.src vendored
View File

@@ -7,7 +7,8 @@ Standards-Version: 4.4.1
Package: rivendell
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, mariadb-client, libqt5sql5-mysql, apache2, curl, rsyslog, rivendell-pypad (= @VERSION@-1)
Depends: ${shlibs:Depends}, ${misc:Depends}, mariadb-client, libqt5sql5-mysql, apache2, curl, rsyslog, python3, python3-pycurl, python3-mysqldb, python3-serial, python3-requests
Replaces: rivendell-pypad
Description: Radio Broadcast Automation System
Rivendell is a complete radio broadcast automation solution, with
facilities for the acquisition, management, scheduling and playout of
@@ -63,15 +64,9 @@ Depends: ${misc:Depends}, rivendell (= @VERSION@-1)
Description: The WebGet audio fetcher service for Rivendell
This package contains the WebGet audio fetching tool for Rivendell.
Package: rivendell-pypad
Architecture: all
Depends: python3, python3-pycurl, python3-mysqldb, python3-serial, python3-requests
Description: PyPAD Program Associated Data script system for Rivendell
This package contains Rivendell's PyPAD scripting system for transmitting
Program Associated Data (PAD) using Python scripts.
Package: python3-rivwebpyapi
Architecture: all
Depends: python3, python3-requests
Description: Python 3 interface for accessing the Rivendell Web API
This is a Python 3 language binding for the Rivendell Web API.
#Package: rivendell-pypad
#Architecture: all
#Depends: python3, python3-pycurl, python3-mysqldb, python3-serial, python3-requests
#Description: PyPAD Program Associated Data script system for Rivendell
# This package contains Rivendell's PyPAD scripting system for transmitting
# Program Associated Data (PAD) using Python scripts.

22
debian/rules.src vendored
View File

@@ -95,28 +95,6 @@ binary:
mkdir -p debian/rivendell/usr/share/rivendell
cp conf/rd.conf-sample debian/rivendell/usr/share/rivendell/
#
# rivendell-pypad
#
mkdir -p debian/rivendell-pypad/usr/lib/rivendell/pypad
mv debian/tmp/usr/lib/rivendell/pypad/* debian/rivendell-pypad/usr/lib/rivendell/pypad/
mkdir -p debian/rivendell-pypad/usr/lib/python3/dist-packages/__pycache__
mv debian/tmp/usr/lib/python3/dist-packages/pypad.py debian/rivendell-pypad/usr/lib/python3/dist-packages/
mv debian/tmp/usr/lib/python3/dist-packages/__pycache__/* debian/rivendell-pypad/usr/lib/python3/dist-packages/__pycache__/
#
# python3-rivwebpyapi
#
mkdir -p debian/python3-rivwebpyapi/usr/lib/python3/dist-packages
mv debian/tmp/usr/lib/python3/dist-packages/rivwebpyapi debian/python3-rivwebpyapi/usr/lib/python3/dist-packages/
mkdir -p debian/python3-rivwebpyapi/usr/lib/python3/dist-packages/rivwebpyapi-@RIVWEBPYAPI_VERSION@.egg-info
cp apis/rivwebpyapi/PKG-INFO debian/python3-rivwebpyapi/usr/lib/python3/dist-packages/rivwebpyapi-@RIVWEBPYAPI_VERSION@.egg-info/
cp apis/rivwebpyapi/dependency_links.txt debian/python3-rivwebpyapi/usr/lib/python3/dist-packages/rivwebpyapi-@RIVWEBPYAPI_VERSION@.egg-info/
cp apis/rivwebpyapi/requires.txt debian/python3-rivwebpyapi/usr/lib/python3/dist-packages/rivwebpyapi-@RIVWEBPYAPI_VERSION@.egg-info/
cp apis/rivwebpyapi/top_level.txt debian/python3-rivwebpyapi/usr/lib/python3/dist-packages/rivwebpyapi-@RIVWEBPYAPI_VERSION@.egg-info/
mkdir -p debian/python3-rivwebpyapi/usr/share/doc/python3-rivwebpyapi/examples
cp apis/rivwebpyapi/tests/*.py debian/python3-rivwebpyapi/usr/share/doc/python3-rivwebpyapi/examples/
#
# rivendell-select