diff --git a/.gitignore b/.gitignore index 9b6a36de..855e5c62 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,8 @@ config.log config.status config.sub configure +debian/changelog +debian/control depcomp docs/apis/*.html docs/apis/*.pdf diff --git a/ChangeLog b/ChangeLog index cbb8567c..2c8bf264 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21698,3 +21698,9 @@ 2021-05-17 Fred Gleason * Added code to generate 'debian/changelog' and 'debian/control' automatically. +2021-05-17 Fred Gleason + * Updated Debian package dependencies. + * Renamed the Debian 'rivendell-devel' sub-package to + 'rivendell-dev'. +2021-05-17 Fred Gleason + * Updated Debianpackage dependencies for shared libraries. diff --git a/configure.ac b/configure.ac index 79bcea86..f829f70d 100644 --- a/configure.ac +++ b/configure.ac @@ -265,6 +265,7 @@ AC_CHECK_HEADER(soundtouch/SoundTouch.h,[],[AC_MSG_ERROR([*** SoundTouch not fou # Check for Python # AM_PATH_PYTHON([3]) +#echo -n $pythondir | sed "s^\${prefix}^/usr^" > debian/pythondir AC_SUBST(PYTHON_BASE_DEP,"python"`echo $PYTHON_VERSION | sed -e s/3./3/`) # diff --git a/debian/control.src b/debian/control.src index 3a7c7eca..3194dcfb 100644 --- a/debian/control.src +++ b/debian/control.src @@ -16,7 +16,7 @@ Description: Radio Broadcast Automation System Package: rivendell-importers Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, rivendell +Depends: ${misc:Depends}, rivendell (= @VERSION@) Description: Library importers for the Rivendell Broadcast Automation System This package contains various importer scripts, which can be used to import audio from existing legacy automation systems into Rivendell. @@ -29,7 +29,7 @@ Description: Library importers for the Rivendell Broadcast Automation System Package: rivendell-opsguide Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends} Description: Rivendell Operations and Administration Guide This package contains the Rivendell Operations and Administration Guide, in both HTML and PDF formats. @@ -41,9 +41,9 @@ Description: Client libraries for interfacing with Rivendell's Web API. This package contains client libraries for interfacing with Rivendell's Web API subsystem. -Package: rivendell-devel +Package: rivendell-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, rivendell (= @VERSION@) Description: Header files and example code for development with Rivendell APIs This package contains header files and example code for development using Rivendell's Web C API, which can be used to integrate with Rivendell Web @@ -51,7 +51,7 @@ Description: Header files and example code for development with Rivendell APIs Package: rivendell-select Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, rivendell (= @VERSION@) Description: The RDSelect system selector tool for Rivendell. This package contains the RDMonitor/RDSelect tool for Rivendell, which can be used to select which amoung multiple Rivendell instances a host should be @@ -59,13 +59,13 @@ Description: The RDSelect system selector tool for Rivendell. Package: rivendell-webget Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, rivendell (= @VERSION@) Description: The WebGet audio fetcher service for Rivendell This package contains the WebGet audio fetching tool for Rivendell. Package: rivendell-pypad Architecture: all -Depends: +Depends: python3, python3-pycurl, python3-pymysql, 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. diff --git a/debian/rules b/debian/rules index cc397cdb..19c4afba 100755 --- a/debian/rules +++ b/debian/rules @@ -39,60 +39,60 @@ binary: mv debian/tmp/usr/share/rivendell/html debian/rivendell-opsguide/usr/share/rivendell/ # -# rivendell-devel +# rivendell-dev # - mkdir -p debian/rivendell-devel/usr/lib - mv debian/tmp/usr/lib/librivwebcapi.so debian/rivendell-devel/usr/lib/ - mv debian/tmp/usr/lib/librivwebcapi.a debian/rivendell-devel/usr/lib/ - mkdir -p debian/rivendell-devel/usr/share/pkgconfig - mv debian/tmp/usr/lib/pkgconfig/rivwebcapi.pc debian/rivendell-devel/usr/share/pkgconfig/ - mkdir -p debian/rivendell-devel/usr/include - mv debian/tmp/usr/include/rivwebcapi debian/rivendell-devel/usr/include/ - mkdir -p debian/rivendell-devel/usr/share/man/man7 - mv debian/tmp/usr/share/man/man7/rd_addcart.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_addcut.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_addlog.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_assignschedcode.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_audioinfo.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_audiostore.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_copyaudio.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_createticket.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_deleteaudio.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_deletelog.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_deletepodcast.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_editcart.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_editcut.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_export.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_exportpeaks.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_getuseragent.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_getversion.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_import.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcart.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcartcuts.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcarts.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcartscuts.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcartschedcodes.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcut.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listcuts.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listgroup.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listgroups.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listlog.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listlogs.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listschedcodes.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listservices.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_listsystemsettings.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_postimage.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_postpodcast.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_postrss.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_removecart.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_removecut.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_removeimage.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_removepodcast.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_removerss.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_savelog.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_savepodcast.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_trimaudio.7 debian/rivendell-devel/usr/share/man/man7/ - mv debian/tmp/usr/share/man/man7/rd_unassignschedcode.7 debian/rivendell-devel/usr/share/man/man7/ + mkdir -p debian/rivendell-dev/usr/lib + mv debian/tmp/usr/lib/librivwebcapi.so debian/rivendell-dev/usr/lib/ + mv debian/tmp/usr/lib/librivwebcapi.a debian/rivendell-dev/usr/lib/ + mkdir -p debian/rivendell-dev/usr/share/pkgconfig + mv debian/tmp/usr/lib/pkgconfig/rivwebcapi.pc debian/rivendell-dev/usr/share/pkgconfig/ + mkdir -p debian/rivendell-dev/usr/include + mv debian/tmp/usr/include/rivwebcapi debian/rivendell-dev/usr/include/ + mkdir -p debian/rivendell-dev/usr/share/man/man7 + mv debian/tmp/usr/share/man/man7/rd_addcart.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_addcut.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_addlog.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_assignschedcode.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_audioinfo.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_audiostore.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_copyaudio.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_createticket.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_deleteaudio.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_deletelog.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_deletepodcast.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_editcart.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_editcut.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_export.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_exportpeaks.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_getuseragent.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_getversion.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_import.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcart.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcartcuts.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcarts.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcartscuts.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcartschedcodes.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcut.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listcuts.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listgroup.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listgroups.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listlog.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listlogs.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listschedcodes.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listservices.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_listsystemsettings.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_postimage.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_postpodcast.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_postrss.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_removecart.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_removecut.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_removeimage.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_removepodcast.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_removerss.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_savelog.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_savepodcast.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_trimaudio.7 debian/rivendell-dev/usr/share/man/man7/ + mv debian/tmp/usr/share/man/man7/rd_unassignschedcode.7 debian/rivendell-dev/usr/share/man/man7/ #