Packaging updates for 2.5.0 release

debian/changelog

@@ -1,8 +1,32 @@
+airtime (2.5.1-1) unstable; urgency=low
+
+  * Nightly development snapshot of Airtime 2.5.x series
+
+ -- Daniel James <daniel@64studio.com>  Thu, 24 Oct 2013 11:04:56 +0100
+
+airtime (2.5.0-1) unstable; urgency=low
+
+  * Upstream 2.5.0-ga release
+
+ -- Daniel James <daniel@64studio.com>  Wed, 23 Oct 2013 14:56:21 +0100
+
+airtime (2.4.1-1) unstable; urgency=low
+
+  * Upstream 2.4.1-ga release
+
+ -- Daniel James <daniel@64studio.com>  Wed, 28 Aug 2013 11:53:10 +0100
+
 airtime (2.4.0-1) unstable; urgency=low
 
-  * Nightly development snapshot of Airtime 2.4.x series
+  * Upstream 2.4.0-ga release
 
- -- Daniel James <daniel@64studio.com>  Tue, 19 Mar 2013 16:39:23 +0000
+ -- Daniel James <daniel@64studio.com>  Tue, 25 Jun 2013 14:26:55 +0100
+
+airtime (2.3.1-1) unstable; urgency=low
+
+  * Upstream 2.3.1 release
+
+ -- Daniel James <daniel@64studio.com>  Wed, 20 Mar 2013 09:43:15 +0000
 
 airtime (2.3.0-2) unstable; urgency=low
 

debian/control

@@ -3,8 +3,8 @@ Section: web
 Priority: optional
 Maintainer: Daniel James <daniel@64studio.com>
 Build-Depends: debhelper (>= 7.0.50~), po-debconf
-Standards-Version: 3.8.4
-Homepage: http://www.sourcefabric.org/en/products/airtime_overview/
+Standards-Version: 3.9.3
+Homepage: http://www.sourcefabric.org/en/airtime/
 
 Package: airtime
 Architecture: all
@@ -15,48 +15,40 @@ Depends: apache2,
  ecasound,
  flac,
  gzip (>= 1.3.12),
- libao-ocaml,
  libapache2-mod-php5,
- libc-bin,
  libcamomile-ocaml-data,
- libesd0,
- libmad-ocaml,
- libmp3lame0,
- libportaudio2,
- libpulse0,
- libsamplerate0,
- libsoundtouch-ocaml,
- libtaglib-ocaml,
- liquidsoap (>= 1.0.0~),
+ liquidsoap (>= 1.1.1~),
  locales,
  lsof,
  monit,
+ mp3gain,
  multitail,
  odbc-postgresql,
  patch,
- php-db,
  php5-cli,
  php5-curl,
+ php-db,
  php5-gd,
  php-pear,
  php5-pgsql,
  pwgen,
  python,
  rabbitmq-server,
- silan  (>= 0.3.1~),
+ silan (>= 0.3.1~),
  sudo,
  sysv-rc, 
  tar (>= 1.22),
  unzip,
+ vorbisgain,
  vorbis-tools,
  zendframework | libzend-framework-php,
  ${misc:Depends}
 Recommends: icecast2, php-apc
 Suggests: airtime-audio-samples,
  alsa-utils
-Description: open radio software for scheduling and remote station management.
+Description: open broadcast software for scheduling and station management.
  Airtime is an open source application that provides remote automation 
- of a radio station.
+ of a broadcast station.
  .
  Major features:
  .

debian/postinst

@@ -16,7 +16,7 @@ includefile="${configdir}/apache.conf"
 a2tplfile="${configdir}/apache.vhost.tpl"
 phpinifile="${configdir}/airtime.ini"
 OLDVERSION="$2"
-NEWVERSION="2.4.0"
+NEWVERSION="2.5.0"
 
 case "$1" in
   configure|reconfigure)
@@ -46,6 +46,8 @@ case "$1" in
       # temporarily disable an existing virtual host
       if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then
         a2dissite airtime-vhost
+      elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then
+        a2dissite airtime-vhost.conf
       fi
 
       db_get airtime/apache-servername
@@ -57,12 +59,12 @@ case "$1" in
         install -d -m755 /etc/$webserver/sites-available/
       fi
       sed -e "s/__SERVER_ADMIN__/${SA}/;s/__SERVER_NAME__/${SN}/" \
-        ${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost
+        ${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost.conf
 
       command -v a2ensite > /dev/null
       RETVAL=$?
       if [ $RETVAL -eq 0 ]; then
-      a2ensite airtime-vhost
+        a2ensite airtime-vhost.conf
       fi
 
       # insert a specific hostname, if provided, into API configuration
@@ -92,7 +94,9 @@ case "$1" in
       db_get airtime/apache-deldefault
       if [ "$RET" == "remove default" ]; then
         if [ -f /etc/apache2/sites-available/default ]; then
-        a2dissite default
+          a2dissite default
+        elif [ -f /etc/apache2/sites-available/000-default.conf ]; then
+          a2dissite 000-default.conf
         fi
       fi
 
@@ -154,6 +158,7 @@ case "$1" in
       if [ -f /etc/default/monit ]; then
         echo "Setting up monit configuration..."
          sed -i 's:startup=.*:startup=1:g' /etc/default/monit
+         sed -i 's:START=.*:START=yes:g' /etc/default/monit
 
            MONITCONFIGURED=$(grep "include /etc/monit/conf.d" /etc/monit/monitrc || true)
            if [ -z "$MONITCONFIGURED" ]; then

debian/postrm

@@ -83,6 +83,8 @@ case "$1" in
 
     if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then
       a2dissite airtime-vhost &>/dev/null || true
+    elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then
+      a2dissite airtime-vhost.conf &>/dev/null || true
       # TODO: if airtime-vhost is not modified -> delete it
       restart="$webserver $restart"
     fi

gen-snapshot.sh

@@ -2,7 +2,7 @@
 # Script for generating nightly Airtime snapshot packages
 # Run from the directory containg the files checked out from git
 
-VERSION=2.4.0~$(date "+%Y%m%d")
+VERSION=2.5.1~$(date "+%Y%m%d")
 BUILDDEST=/tmp/airtime-${VERSION}/
 DEBDIR=`pwd`/debian
 
@@ -23,9 +23,9 @@ cd ${BUILDDEST} || exit
 
 # Set the version of the snapshot package
 
-sed -i "1s:(2.4.0-1):(${VERSION}):g" debian/changelog
+sed -i "1s:(2.5.1-1):(${VERSION}):g" debian/changelog
 
-# FIXES for 2.3.0 #############
+# FIXES for 2.5.1 #############
 
 # these are all moved to debian/copyright
 rm airtime/python_apps/pypo/LICENSE
@@ -46,6 +46,12 @@ rm -r airtime/airtime_mvc/library/ZFDebug/
 #Strip un-needed install scripts
 rm -r airtime/install_full/
 
+#Remove dev tools and files
+rm -r airtime/dev_tools/
+rm -r airtime/docs/
+rm airtime/.gitignore
+rm airtime/.zfproject.xml
+
 #############################
 
 echo "running the build..."