Debian/Ubuntu packaging

2010-08-26 15:52:53 +02:00 · 2010-08-26 15:52:53 +02:00 · 1ff3b38d1d
parent 71a97cdc93
commit 1ff3b38d1d
33 changed files with 3306 additions and 0 deletions
--- a/debian/campcaster-data.lintian-overrides
+++ b/debian/campcaster-data.lintian-overrides
@ -0,0 +1,13 @@
+# Upstream uses realtive paths to data folders, so we use
+# syminks to /var/campcaster/.. where persistant data is stored
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/stor/buffer/
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/trans/
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/htmlUI/var/templates_c/
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/access/
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/stor/buffer/
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/storageServer/var/trans/
+campcaster-data: package-contains-empty-directory usr/share/campcaster/www/archiveServer/var/access/
+# Upstream uses a patched/customized version of Smarty - but is 
+# working on getting solving issue to move to a maintained one.
+campcaster-data: embedded-php-library usr/share/campcaster/www/htmlUI/var/Smarty/libs/Smarty_Compiler.class.php
+campcaster-data: embedded-php-library usr/share/campcaster/www/htmlUI/var/Smarty/libs/Smarty.class.php
--- a/debian/campcaster-data.prerm
+++ b/debian/campcaster-data.prerm
@ -0,0 +1,54 @@
+#!/bin/sh
+# prerm script for campcaster
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+installdir=/
+vardir=/var/lib/campcaster/
+ls_database=Campcaster
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	mkdir -p $vardir
+
+        # remove generated files
+        rm -rf $vardir/htmlUI/var/html/img/*
+        rm -rf $vardir/htmlUI/var/templates_c/*
+        rm -rf $vardir/archiveServer/var/access/*
+        rm -rf $vardir/archiveServer/var/trans/*
+        rm -rf $vardir/storageServer/var/access/*
+        rm -rf $vardir/storageServer/var/trans/*
+
+        ##rm -rf $installdir/etc/pear.conf
+ 
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- a/debian/campcaster-import.1
+++ b/debian/campcaster-import.1
@ -0,0 +1,72 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" URL Macro
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.\"
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CAMPCASTER\-IMPORT 1 "February  4, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+campcaster-import \- import audio files into campcaster
+.SH SYNOPSIS
+.B campcaster-scheduler
+.RI "[-h] -l|-c" " FILES_OR_DIRS"
+.SH DESCRIPTION
+This tool allows to batch upload audio files into the campcaster-radio system.
+There are two ways to import audio files into Campcaster: linking or copying.
+You need to specify how to import the files by using either 
+.B \-l
+(link) or 
+.B -c
+(copy) option. 
+.B -h 
+will print further help information.
+.PP
+Linking has the advantage that it will not duplicate any files,
+but you must take care not to move, rename, or delete any of the
+imported files from their current locations on disk.
+.PP
+Copying has the advantage that you can do whatever you like with
+the source files after you import them, but has the disadvantage
+that it requires doubling the hard drive space needed to store
+your files.
+.PP
+Campcaster is the first free and open radio management software, providing
+live studio broadcast capabilities as well as the remote automation in one
+integrated system. The scalability of Campcaster allows implementation in a
+number of use scenarios, ranging from an unmanned broadcast unit accessed from
+remote through the Internet to a local network of Campcaster machines inside a
+radio station handling live broadcasts and delivering program automation by
+accessing a central audio storage system. Campcaster is capable of combining
+local audio files and remote web streams, supporting the widely used MP3 format
+and the open equivalent OGG Vorbis.
+.SH SEE ALSO
+.URL "http://code.campware.org/manuals/campcaster/1.4/" "online manual" ,
+.BR campcaster-studio (1),
+.BR campcaster-scheduler (1),
+.\".BR campcaster-backup (1).
+.\".BR campcaster-restore (1).
+.SH AUTHOR
+Campcaster was written by the Media Develoment Loan Fund (MDLF) at the Center
+for Advanced Media\-Prague (CAMP).
+.br
+For full credits see
+.URL "http://www.campware.org/en/camp/about_campware/619/" "campware.org"  .
+.PP
+This manual page was written by Robin Gareus <robin@gareus.org>,
+for the Debian project (and may be used by others).
--- a/debian/campcaster-libs.dirs
+++ b/debian/campcaster-libs.dirs
@ -0,0 +1 @@
+usr/lib
--- a/debian/campcaster-libs.lintian-overrides
+++ b/debian/campcaster-libs.lintian-overrides
@ -0,0 +1,9 @@
+# Campcaster has a job opening for someone to
+# refactor code to use standard PEAR classes.
+# see http://www.campware.org/en/camp/about_campware/696/ for details.
+# 
+# Note that the embedded-pear-modules are unpatched upstream
+# versions - they're just included for version compatibiliy issues
+campcaster-libs: embedded-pear-module usr/lib/campcaster/pear/PEAR/Command/Auth.php
+campcaster-libs: embedded-pear-module usr/lib/campcaster/pear/PEAR/Command/Config.php
+campcaster-libs: embedded-pear-module usr/lib/campcaster/pear/PEAR/Config.php
--- a/debian/campcaster-scheduler.1
+++ b/debian/campcaster-scheduler.1
@ -0,0 +1,62 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" URL Macro
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.\"
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CAMPCASTER\-SCHEDULER 1 "February  4, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+campcaster-scheduler \- graphical interface to campcaster radio station
+.SH SYNOPSIS
+.B campcaster-scheduler
+.RI start|stop|restart|status|install|uninstall|kill
+.SH DESCRIPTION
+This is the daemon behind the campcaster-radio-system which is usually launched
+during boot with administrator privileges. However this tool is also used to
+query the current status of the server or perform administrative tasks.
+.PP
+The campcaster-scheduler plays songs at their designated time and provides an
+XML-RPC interface for the Scheduler, which can be accessed via web/HTML
+interface or via the campcaster-studio GUI.
+.PP
+Campcaster is the first free and open radio management software, providing
+live studio broadcast capabilities as well as the remote automation in one
+integrated system. The scalability of Campcaster allows implementation in a
+number of use scenarios, ranging from an unmanned broadcast unit accessed from
+remote through the Internet to a local network of Campcaster machines inside a
+radio station handling live broadcasts and delivering program automation by
+accessing a central audio storage system. Campcaster is capable of combining
+local audio files and remote web streams, supporting the widely used MP3 format
+and the open equivalent OGG Vorbis.
+.SH SEE ALSO
+.URL "http://code.campware.org/manuals/campcaster/1.4/" "online manual" ,
+.BR campcaster-studio (1),
+.BR campcaster-import (1).
+.\".BR campcaster-backup (1).
+.\".BR campcaster-restore (1).
+.BR campcaster-restore (1).
+.SH AUTHOR
+Campcaster was written by the Media Develoment Loan Fund (MDLF) at the Center
+for Advanced Media\-Prague (CAMP).
+.br
+For full credits see
+.URL "http://www.campware.org/en/camp/about_campware/619/" "campware.org"  .
+.PP
+This manual page was written by Robin Gareus <robin@gareus.org>,
+for the Debian project (and may be used by others).
--- a/debian/campcaster-station.default
+++ b/debian/campcaster-station.default
@ -0,0 +1,10 @@
+# Defaults for campcaster initscript
+# sourced by /etc/init.d/campcaster-station
+# installed at /etc/default/campcaster by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
--- a/debian/campcaster-station.dirs
+++ b/debian/campcaster-station.dirs
@ -0,0 +1,3 @@
+etc
+usr/bin
+usr/lib
--- a/debian/campcaster-station.init
+++ b/debian/campcaster-station.init
@ -0,0 +1,163 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          campcaster-station
+# Required-Start:    $remote_fs $network $local_fs apache postgres
+# Required-Stop:     $remote_fs
+# Should-Start:      $named
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: campcaster-scheduler
+# Description: A radio program automation and support tool.
+### END INIT INFO
+
+
+CAMPCASTER_BIN=/usr/lib/campcaster/bin
+CAMPCASTER_LIB=/usr/lib/campcaster/
+CAMPCASTER_ETC=/etc
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:$CAMPCASTER_BIN
+LD_LIBRARY_PATH=$CAMPCASTER_LIB:$LD_LIBRARY_PATH
+DAEMON=$CAMPCASTER_BIN/campcaster-scheduler
+NAME=campcaster-station
+DESC="campcaster scheduler"
+
+test -x $DAEMON || exit 0
+
+export PATH
+export LD_LIBRARY_PATH
+
+LOGDIR=/var/log/campcaster
+PIDFILE=/var/run/$NAME.pid  # defined in /etc/campcaster-scheduler.xml
+DODTIME=3                   # Time to wait for the server to die, in seconds
+                            # If this value is set too low you might not
+                            # let some servers to die gracefully and
+                            # 'restart' will not work
+
+# Include campcaster defaults if available
+if [ -f /etc/default/campcaster ] ; then
+    . /etc/default/campcaster
+fi
+
+test -z "$DAEMON_OPTS" && \
+DAEMON_OPTS="-c $CAMPCASTER_ETC/campcaster-scheduler.xml"
+
+set -e
+
+running_pid()
+{
+    # Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    # Is this the expected child?
+    [ "$cmd" != "$name" ] &&  return 1
+    return 0
+}
+
+running()
+{
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    # Obtain the pid and check it against the binary name
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+force_stop() {
+# Forcefully kill the process
+    [ ! -f "$PIDFILE" ] && return
+    if running ; then
+        kill -15 $pid
+        # Is it really dead?
+        [ -n "$DODTIME" ] && sleep "$DODTIME"s
+        if running ; then
+            kill -9 $pid
+            [ -n "$DODTIME" ] && sleep "$DODTIME"s
+            if running ; then
+                echo "Cannot kill $NAME (pid=$pid)!"
+                exit 1
+            fi
+        fi
+    fi
+    rm -f $PIDFILE
+    return 0
+}
+
+case "$1" in
+  start)
+        echo -n "Starting $DESC: "
+        $DAEMON $DAEMON_OPTS start 2>/dev/null
+        if running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+        ;;
+  stop)
+        echo -n "Stopping $DESC: "
+	$DAEMON $DAEMON_OPTS stop 2>/dev/null
+        echo "$NAME."
+        ;;
+  force-stop)
+        echo -n "Forcefully stopping $DESC: "
+        force_stop
+        if ! running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+        ;;
+  #reload)
+        #
+        # If the daemon can reload its config files on the fly
+        # for example by sending it SIGHUP, do it here.
+        #
+        # If the daemon responds to changes in its config file
+        # directly anyway, make this a do-nothing entry.
+        #
+        # echo "Reloading $DESC configuration files."
+        # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+        #       /var/run/$NAME.pid --exec $DAEMON
+  #;;
+  force-reload)
+        #
+        # If the "reload" option is implemented, move the "force-reload"
+        # option to the "reload" entry above. If not, "force-reload" is
+        # just the same as "restart" except that it does nothing if the
+        # daemon isn't already running.
+        # check wether $DAEMON is running. If so, restart
+        if running ; then
+            $0 restart || exit 0
+	fi
+        ;;
+  restart)
+    echo -n "Restarting $DESC: "
+	$DAEMON $DAEMON_OPTS stop 2>/dev/null
+        [ -n "$DODTIME" ] && sleep $DODTIME
+        $DAEMON $DAEMON_OPTS start 2>/dev/null
+        echo "$NAME."
+        ;;
+  status)
+    echo -n "$NAME is "
+    if running ;  then
+        echo "running"
+    else
+        echo "not running."
+        exit 1
+    fi
+    ;;
+  *)
+    N=/etc/init.d/$NAME
+    echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
--- a/debian/campcaster-station.manpages
+++ b/debian/campcaster-station.manpages
@ -0,0 +1,2 @@
+debian/campcaster-scheduler.1
+debian/campcaster-import.1
--- a/debian/campcaster-station.postinst
+++ b/debian/campcaster-station.postinst
@ -0,0 +1,72 @@
+#!/bin/sh
+# postinst script for campcaster
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+installdir=/usr/lib/campcaster
+vardir=/var/lib/campcaster
+apache_group=www-data
+
+if [ -d /etc/postgresql/8.1 ]; then
+    postgresql_dir=/etc/postgresql/8.1/main
+    postgresql_init_script=/etc/init.d/postgresql-8.1
+elif [ -d /etc/postgresql/8.2 ]; then
+    postgresql_dir=/etc/postgresql/8.2/main
+    postgresql_init_script=/etc/init.d/postgresql-8.2
+elif [ -d /etc/postgresql/8.3 ]; then
+    postgresql_dir=/etc/postgresql/8.3/main
+    postgresql_init_script=/etc/init.d/postgresql-8.3
+elif [ -d /etc/postgresql/8.4 ]; then
+    postgresql_dir=/etc/postgresql/8.4/main
+    postgresql_init_script=/etc/init.d/postgresql-8.4
+else
+    echo "no postgresql 8.1, 8.2, 8.3 or 8.4 found" >&2
+    exit 1
+fi
+
+
+case "$1" in
+    configure)
+        # do post-installation configuration
+        $installdir/bin/postInstallStation.sh --directory=$installdir \
+                        --apache-group=$apache_group \
+                        --postgresql-dir=$postgresql_dir \
+                        --postgresql-init-script=$postgresql_init_script
+
+        # remount the NFS share if we have a 2-computer setup
+        if [ -f $vardir/storageServer.wasMounted ]; then
+            echo "Remounting the remote storage..."
+            mount $vardir/storageServer
+            rm $vardir/storageServer.wasMounted
+        fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- a/debian/campcaster-station.postrm
+++ b/debian/campcaster-station.postrm
@ -0,0 +1,94 @@
+#!/bin/sh
+# postrm script for campcaster
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+vardir=/var/lib/campcaster
+
+
+if [ -d /etc/postgresql/8.1 ]; then
+    postgresql_init_script=/etc/init.d/postgresql-8.1
+elif [ -d /etc/postgresql/8.2 ]; then
+    postgresql_init_script=/etc/init.d/postgresql-8.2
+elif [ -d /etc/postgresql/8.3 ]; then
+    postgresql_init_script=/etc/init.d/postgresql-8.3
+elif [ -d /etc/postgresql/8.4 ]; then
+    postgresql_init_script=/etc/init.d/postgresql-8.4
+else
+    echo "no postgresql 8.1, 8.2, 8.3 or 8.4 found" >&2
+    exit 1
+fi
+postgres_user=postgres
+
+ls_database=Campcaster
+ls_dbuser=campcaster
+
+
+#-------------------------------------------------------------------------------
+#  Function to check for the existence of an executable on the PATH
+#
+#  @param $1 the name of the exectuable
+#  @return 0 if the executable exists on the PATH, non-0 otherwise
+#-------------------------------------------------------------------------------
+check_exe() {
+    if [ -x "`which $1 2> /dev/null`" ]; then
+        return 0;
+    else
+        return 1;
+    fi
+}
+
+
+case "$1" in
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade)
+    ;;
+
+    purge|disappear)
+        # check for the required tools
+        check_exe "psql" || psql_found=no
+
+        if [ "x$psql_found" != "xno" ] ; then
+            # kill open connections to the Campcaster database
+            $postgresql_init_script stop
+            $postgresql_init_script start
+
+            # remove the PostgreSQL database and user
+            su - $postgres_user -c \
+                "echo \"DROP DATABASE \\\"$ls_database\\\" \" | psql template1" \
+                || echo "Couldn't drop database $ls_database.";
+            su - $postgres_user -c \
+                "echo \"DROP USER $ls_dbuser \" | psql template1" \
+                || echo "Couldn't drop database user $ls_dbuser.";
+        fi
+
+        # remove generated files
+        rm -rf $vardir/
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- a/debian/campcaster-station.prerm
+++ b/debian/campcaster-station.prerm
@ -0,0 +1,109 @@
+#!/bin/sh
+# prerm script for campcaster
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+installdir=/
+vardir=/var/lib/campcaster/
+ls_database=Campcaster
+
+#-------------------------------------------------------------------------------
+#  Function to check for the existence of an executable on the PATH
+#
+#  @param $1 the name of the exectuable
+#  @return 0 if the executable exists on the PATH, non-0 otherwise
+#-------------------------------------------------------------------------------
+check_exe() {
+    if [ -x "`which $1 2> /dev/null`" ]; then
+        return 0;
+    else
+        return 1;
+    fi
+}
+
+
+if [ -d /etc/postgresql/8.1 ]; then
+    postgresql_dir=/etc/postgresql/8.1/main
+    postgresql_init_script=/etc/init.d/postgresql-8.1
+elif [ -d /etc/postgresql/8.2 ]; then
+    postgresql_dir=/etc/postgresql/8.2/main
+    postgresql_init_script=/etc/init.d/postgresql-8.2
+elif [ -d /etc/postgresql/8.3 ]; then
+    postgresql_dir=/etc/postgresql/8.3/main
+    postgresql_init_script=/etc/init.d/postgresql-8.3
+elif [ -d /etc/postgresql/8.4 ]; then
+    postgresql_dir=/etc/postgresql/8.4/main
+    postgresql_init_script=/etc/init.d/postgresql-8.4
+else
+    echo "no postgresql 8.1, 8.2, 8.3 or 8.4 found" >&2
+    exit 1
+fi
+
+case "$1" in
+    remove|deconfigure)
+        cd /usr/share/campcaster/www/htmlUI/var/install/
+	php -q uninstall.php
+	cd /usr/share/campcaster/www/storageServer/var/install/
+	php -q uninstall.php
+    ;;
+    *)
+    ;;
+esac
+
+case "$1" in
+    remove|upgrade|deconfigure)
+	mkdir -p $vardir
+        # unmount the NFS share, if we have a 2-computer setup
+        storagedir=$vardir/storageServer
+        if [ "`mount | grep -o \"on $storagedir \"`" = "on $storagedir " ]; then
+            echo "Unmounting the remote storage..."
+            umount $storagedir
+            touch $vardir/storageServer.wasMounted
+        fi
+
+        ## remove the ODBC data source and driver
+        check_exe "odbcinst" || odbcinst_found=no
+	
+        if [ "x$odbcinst_found" != "xno" ] ; then
+            odbcinst -u -s -l -n $ls_database
+            odbcinst -u -d -n PostgreSQL_Campcaster
+        fi
+
+        rm -f /etc/apache/conf.d/90_php_campcaster.conf
+        rm -f /etc/apache2/conf.d/90_php_campcaster.conf
+        rm -f /etc/apache2/conf/modules.d/90_php_campcaster.conf
+        rm -f /etc/httpd/conf.d/90_php_campcaster.conf
+
+        ##rm -rf $installdir/etc/pear.conf
+ 
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
--- a/debian/campcaster-studio.1
+++ b/debian/campcaster-studio.1
@ -0,0 +1,57 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" URL Macro
+.de URL
+\\$2 \(laURL: \\$1 \(ra\\$3
+..
+.if \n[.g] .mso www.tmac
+.\"
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH CAMPCASTER\-STUDIO 1 "February  4, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+campcaster-studio \- graphical interface to campcaster radio station
+.SH SYNOPSIS
+.B campcaster-studio
+.SH DESCRIPTION
+campcaster-studio is a desktop application which connect to the
+campcaster-server and allows you to do live shows or schedule automated
+playback.
+.PP
+Campcaster is the first free and open radio management software, providing
+live studio broadcast capabilities as well as the remote automation in one
+integrated system. The scalability of Campcaster allows implementation in a
+number of use scenarios, ranging from an unmanned broadcast unit accessed from
+remote through the Internet to a local network of Campcaster machines inside a
+radio station handling live broadcasts and delivering program automation by
+accessing a central audio storage system. Campcaster is capable of combining
+local audio files and remote web streams, supporting the widely used MP3 format
+and the open equivalent OGG Vorbis.
+.PP
+Campcaster Studio is mainly targeted at doing live shows, though it is possible
+to do automated scheduling through this interface as well. Note that the Web
+component has a much more robust interface for handling automated scheduling.
+.SH SEE ALSO
+.BR campcaster-scheduler (1),
+.BR campcaster-import (1).
+.SH AUTHOR
+Campcaster was written by the Media Develoment Loan Fund (MDLF) at the Center
+for Advanced Media\-Prague (CAMP).
+.br
+For full credits see
+.URL "http://www.campware.org/en/camp/about_campware/619/" "campware.org"  .
+.PP
+This manual page was written by Robin Gareus <robin@gareus.org>,
+for the Debian project (and may be used by others).
--- a/debian/campcaster-studio.dirs
+++ b/debian/campcaster-studio.dirs
@ -0,0 +1,4 @@
+etc
+usr/bin
+usr/lib
+usr/share/campcaster
--- a/debian/campcaster-studio.manpages
+++ b/debian/campcaster-studio.manpages
@ -0,0 +1 @@
+debian/campcaster-studio.1
--- a/debian/campcaster-studio.menu
+++ b/debian/campcaster-studio.menu
@ -0,0 +1,6 @@
+?package(campcaster-studio):\
+  needs="X11" \
+  section="Applications/Sound"\
+  title="Campcaster-Studio"\
+  command="/usr/bin/campcaster-studio"\
+  icon="/usr/share/pixmaps/campcaster.xpm"
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,11 @@
+campcaster (1.4.0+r3436-0) 64studio; urgency=low
+
+  * rebased to new upstream version
+
+ -- Robin Gareus <robin@gareus.org>  Fri, 16 Apr 2010 11:59:57 +0200
+
+campcaster (1.4.0+r3427) 64studio; urgency=low
+
+  * Initial release (Closes: #568530) (LP: #250397)
+
+ -- Robin Gareus <robin@gareus.org>  Fri, 05 Feb 2010 16:35:44 +0100
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+7
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,151 @@
+Source: campcaster
+Section: sound
+Priority: extra
+Maintainer: Alessio Treglia <quadrispro@ubuntu.com>
+XSBC-Original-Maintainer: Robin Gareus <robin@gareus.org>
+Build-Depends: debhelper (>= 7.0.50~),
+               autotools-dev,
+               libtool,
+               pkg-config (>= 0.15),
+               doxygen,
+               automake,
+               unzip, bzip2,
+               curl,
+               graphviz,
+               xsltproc,
+               libcppunit-dev,
+               unixodbc-dev (>= 2.2),
+               odbc-postgresql,
+               fontconfig,
+               libfontconfig1-dev,
+               libpng12-dev,
+               libjpeg62-dev | libjpeg8-dev,
+               libssl-dev,
+               libxml2-dev,
+               libpopt-dev,
+               libmad0-dev,
+               libogg-dev,
+               libvorbis-dev,
+               libbz2-dev,
+               libtar-dev (>= 1.2.11),
+               libcurl3-dev (>= 7.12.3) | libcurl4-openssl-dev (>= 7.16.4),
+               libboost-date-time-dev (>= 1.33.1),
+               libgtk2.0-dev (>= 2.6.10),
+               libgtkmm-2.4-dev (>= 1:2.6.5),
+               libglademm-2.4-dev (>= 2.6.2),
+               libxml++2.6-dev (>= 2.8.1),
+               libicu34-dev | libicu36-dev | libicu-dev,
+               apache2,
+               php5-pgsql,
+               libapache2-mod-php5,
+               php5-gd,
+               postgresql-8.1 | postgresql-8.2 | postgresql-8.3 | postgresql (>= 8.1),
+               postgresql-client-8.1 | postgresql-client-8.2 | postgresql-client-8.3 | postgresql-client (>= 8.1),
+               libgstreamer0.10-dev (>= 0.10.17),
+               php-pear,
+               php-db,
+               libserial-dev (>= 0.5.2)
+Standards-Version: 3.8.4
+Homepage: http://campware.org/en/camp/campcaster_news/
+
+
+Package: campcaster-libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A radio program automation and support tool
+ Campcaster is the first free and open radio management software that 
+ provides live studio broadcast capabilities as well as remote automation
+ in one integrated system.
+ .
+ Major features of Campcaster: live, in-studio playout; web-based remote
+ station management; automation; playlists; centralized archives of station
+ program material; solid, fast playback using the GStreamer multimedia
+ framework; search-based backup; localization into several languages;
+ innovative design by the Parsons School of Design; open, extensible
+ architecture based on XML-RPC.
+ .
+ This package contains the libraries used by Campcaster.
+
+Package: campcaster-data
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+         apache2,
+         unzip, bzip2, gzip (>= 1.3.5),
+         libapache2-mod-php5,
+         postgresql-8.1 | postgresql-8.2 | postgresql-8.3 | postgresql (>= 8.1),
+         postgresql-client-8.1 | postgresql-client-8.2 | postgresql-client-8.3 | postgresql-client (>= 8.1),
+         unixodbc (>= 2.2),
+         odbc-postgresql, 
+         xsltproc,
+         php5-pgsql, php5-cli, php5-gd, php-db,
+         gstreamer0.10-plugins-good,
+         gstreamer0.10-plugins-ugly | gstreamer0.10-ffmpeg | gstreamer0.10-fluendo-mp3,
+         gstreamer0.10-alsa,
+         curl, pwgen, sed (>= 4.2.1)
+Description: A radio program automation and support tool - data files
+ Campcaster is the first free and open radio management software that 
+ provides live studio broadcast capabilities as well as remote automation
+ in one integrated system.
+ .
+ Major features of Campcaster: live, in-studio playout; web-based remote
+ station management; automation; playlists; centralized archives of station
+ program material; solid, fast playback using the GStreamer multimedia
+ framework; search-based backup; localization into several languages;
+ innovative design by the Parsons School of Design; open, extensible
+ architecture based on XML-RPC.
+ .
+ This package contains the XMLRPC server component and shared data 
+ files for Campcaster.
+
+Package: campcaster-station
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+         campcaster-libs (= ${binary:Version}),
+         campcaster-data (= ${source:Version}),
+         apache2,
+         unzip, bzip2, gzip (>= 1.3.5),
+         libapache2-mod-php5,
+         postgresql-8.1 | postgresql-8.2 | postgresql-8.3 | postgresql (>= 8.1),
+         postgresql-client-8.1 | postgresql-client-8.2 | postgresql-client-8.3 | postgresql-client (>= 8.1),
+         unixodbc (>= 2.2),
+         odbc-postgresql, 
+         xsltproc,
+         php5-pgsql, php5-cli, php5-gd, php-db,
+         gstreamer0.10-plugins-good,
+         gstreamer0.10-plugins-ugly | gstreamer0.10-ffmpeg | gstreamer0.10-fluendo-mp3,
+         gstreamer0.10-alsa,
+         curl, pwgen, sed (>= 4.2.1)
+Description: A radio program automation and support tool - backend and server
+ Campcaster is the first free and open radio management software that 
+ provides live studio broadcast capabilities as well as remote automation
+ in one integrated system.
+ .
+ Major features of Campcaster: live, in-studio playout; web-based remote
+ station management; automation; playlists; centralized archives of station
+ program material; solid, fast playback using the GStreamer multimedia
+ framework; search-based backup; localization into several languages;
+ innovative design by the Parsons School of Design; open, extensible
+ architecture based on XML-RPC.
+ .
+ This package contains the XMLRPC backend 
+ and web-server component of Campcaster.
+
+Package: campcaster-studio
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+         campcaster-libs (= ${binary:Version}),
+         campcaster-data (= ${source:Version}),
+         campcaster-station (= ${binary:Version})
+Description: A radio program automation and support tool - client GUI
+ Campcaster is the first free and open radio management software that 
+ provides live studio broadcast capabilities as well as remote automation
+ in one integrated system.
+ .
+ Major features of Campcaster: live, in-studio playout; web-based remote
+ station management; automation; playlists; centralized archives of station
+ program material; solid, fast playback using the GStreamer multimedia
+ framework; search-based backup; localization into several languages;
+ innovative design by the Parsons School of Design; open, extensible
+ architecture based on XML-RPC.
+ .
+ This package contains the GUI client component of Campcaster.
--- a/debian/copyright
+++ b/debian/copyright
@ -0,0 +1,142 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=142
+Name: Campcaster
+Maintainer:
+ Micz Flor <micz.flor@web.de>
+ Robert Klajn <robert.klajn@gmail.com>
+ Michael Aschauer <mash@re-p.org>
+ Douglas Arellanes <douglas.arellanes@mdlf.org>
+ Akos Maroy <darkeye@tyrell.hu>
+ Sava Tatić <sava.tatic@mdlf.org>
+ Charles Truett
+ Ferenc Gerlits <fgerlits@campware.org>
+ Mark Kretschmann
+Source: http://sourceforge.net/projects/campcaster/files/
+
+Files: *
+Copyright: 2004-2010, Media Developmnet Loan Fund, http://www.mdlf.org/
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+ 2010, Robin Gareus <robin@gareus.org> on Sun, 31 Jan 2010 22:53:14 +0100
+ 2010, Alessio Treglia <quadrispro@ubuntu.com> on Tue, 16 Feb 2010 22:25:39 +0100
+License: GPL-2+
+
+Files: src/tools/libodbc++/
+Copyright: 1999-2000, Manush Dodunekov <manush@stendahls.net> 
+License: LGPL-2+
+
+Files: src/tools/taglib/
+Copyright: 2002-2008, Scott Wheeler <wheeler@kde.org> et al.
+License: LGPL-2+
+
+Files: src/tools/xmlrpc++/
+Copyright: 2002-2004, Chris Morley
+License: LGPL-2+
+
+Files: src/tools/pear/
+Copyright:
+ 2002-2005, Richard Heyes <richard@php.net>
+ 2002-2005, Tal Peer <tal@php.net>
+ 2002-2005, Michael Wallner <mike@php.net>
+License: other
+		    The PHP License, version 3.0
+  Copyright (c) 1999 - 2006 The PHP Group. All rights reserved.
+  -------------------------------------------------------------------- 
+
+  Redistribution and use in source and binary forms, with or without
+  modification, is permitted provided that the following conditions
+  are met:
+
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+   
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+       the documentation and/or other materials provided with the
+       distribution.
+   
+    3. The name "PHP" must not be used to endorse or promote products
+       derived from this software without prior written permission. For
+       written permission, please contact group@php.net.
+    
+    4. Products derived from this software may not be called "PHP", nor
+       may "PHP" appear in their name, without prior written permission
+       from group@php.net.  You may indicate that your software works in
+       conjunction with PHP by saying "Foo for PHP" instead of calling
+       it "PHP Foo" or "phpfoo"
+   
+    5. The PHP Group may publish revised and/or new versions of the
+       license from time to time. Each version will be given a
+       distinguishing version number.
+       Once covered code has been published under a particular version
+       of the license, you may always continue to use it under the terms
+       of that version. You may also choose to use such covered code
+       under the terms of any subsequent version of the license
+       published by the PHP Group. No one other than the PHP Group has
+       the right to modify the terms applicable to covered code created
+       under this License.
+
+    6. Redistributions of any form whatsoever must retain the following
+       acknowledgment:
+       "This product includes PHP, freely available from
+       <http://www.php.net/>".
+
+  THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND 
+  ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+  PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE PHP
+  DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
+  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+  OF THE POSSIBILITY OF SUCH DAMAGE.
+
+  -------------------------------------------------------------------- 
+
+  This software consists of voluntary contributions made by many
+  individuals on behalf of the PHP Group.
+
+  The PHP Group can be contacted via Email at group@php.net.
+
+  For more information on the PHP Group and the PHP project, 
+  please see <http://www.php.net>.
+
+  This product includes the Zend Engine, freely available at
+  <http://www.zend.com>.
+
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+X-Comment: On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+X-Comment: On Debian systems, the complete text of the GNU Lesser Public
+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
--- a/debian/patches/apache_setup.diff
+++ b/debian/patches/apache_setup.diff
@ -0,0 +1,33 @@
+Subject: do not add symlink in /var/www/ - use apache Alias instead
+Forwarded: no
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-02-14
+Index: campcaster/bin/postInstallStation.sh
+===================================================================
+--- campcaster.orig/bin/postInstallStation.sh	2010-08-26 14:51:40.000000000 +0200
+++ campcaster/bin/postInstallStation.sh	2010-08-26 14:51:45.000000000 +0200
+@@ -396,8 +396,9 @@
+ echo "Creating symlinks...";
+ 
+ # create symlink for the PHP pages in apache's document root
+-rm -f $www_root/campcaster
+-ln -s $install_var_ls $www_root/campcaster
+#rm -f $www_root/campcaster
+#ln -s $install_var_ls $www_root/campcaster
+#debian: skip this -> done via apache-config in 90_php_campcaster.conf
+ 
+ 
+ #-------------------------------------------------------------------------------
+Index: campcaster/etc/apache/90_php_campcaster.conf
+===================================================================
+--- campcaster.orig/etc/apache/90_php_campcaster.conf	2010-07-22 15:21:30.000000000 +0200
+++ campcaster/etc/apache/90_php_campcaster.conf	2010-08-26 14:51:45.000000000 +0200
+@@ -1,2 +1,8 @@
+ php_value upload_max_filesize 32M
+ php_value post_max_size 36M
+
+Alias /campcaster /usr/share/campcaster/www
+
+<Directory /usr/share/campcaster/www>
+  Options FollowSymlinks
+</Directory>
--- a/debian/patches/debianize_paths.diff
+++ b/debian/patches/debianize_paths.diff
@ -0,0 +1,552 @@
+Description: Change (hardcoded) paths in shell and install scripts
+ to conform to debian locations.  
+Forwarded: not-needed
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-02-14
+Index: campcaster/bin/postInstallStation.sh
+===================================================================
+--- campcaster.orig/bin/postInstallStation.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/bin/postInstallStation.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -31,14 +31,6 @@
+ #-------------------------------------------------------------------------------
+ 
+ #-------------------------------------------------------------------------------
+-#  Determine directories, files
+-#-------------------------------------------------------------------------------
+-reldir=`dirname $0`/..
+-basedir=`cd $reldir; pwd;`
+-bindir=$basedir/bin
+-
+-
+-#-------------------------------------------------------------------------------
+ #  Print the usage information for this script.
+ #-------------------------------------------------------------------------------
+ printUsage()
+@@ -181,11 +173,11 @@
+ postgres_user=postgres
+ 
+ install_bin=$installdir/bin
+-install_etc=$installdir/etc
+-install_lib=$installdir/lib
+-install_usr=$installdir/usr
+-install_var=$installdir/var
+-install_var_ls=$install_var/Campcaster
+install_etc=/etc
+install_shr=/usr/share/campcaster/www/
+install_tpl=/usr/share/campcaster/etc/
+install_var_ls=/var/lib/campcaster/
+storagedir=$install_var_ls/storageServer
+ 
+ 
+ #-------------------------------------------------------------------------------
+@@ -281,7 +273,6 @@
+ #  Check whether the storage server directory has been replaced with a mount
+ #  point for an NFS share.
+ #-------------------------------------------------------------------------------
+-storagedir=$installdir/var/storageServer
+ storage_is_local=yes
+ if [ "`mount | grep -o \"on $storagedir \"`" = "on $storagedir " ]; then
+     storage_is_local=no
+@@ -291,6 +282,33 @@
+ #-------------------------------------------------------------------------------
+ #  Setup directory permissions
+ #-------------------------------------------------------------------------------
+
+echo "Setting up links in /var..."
+
+linkvardir()
+{
+  mkdir -p $install_var_ls/$1
+  test -L $install_shr/$1 || (\
+    ls $install_shr/$1/* &>/dev/null && \
+    cp -af $install_shr/$1/* $install_var_ls/$1/ )
+  rm -rf $install_shr/$1
+  ln -fs $install_var_ls/$1 $install_shr/$1
+}
+
+linkvardir archiveServer/var/stor
+linkvardir archiveServer/var/access
+linkvardir archiveServer/var/trans
+
+linkvardir storageServer/var/stor
+linkvardir storageServer/var/access
+linkvardir storageServer/var/trans
+
+linkvardir htmlUI/var/templates_c
+linkvardir htmlUI/var/html/img
+
+mkdir -p $install_var_ls/archiveServer/var/stor/buffer
+mkdir -p $install_var_ls/storageServer/var/stor/buffer
+
+ echo "Setting up directory permissions..."
+ 
+ chgrp $apache_group $install_var_ls/archiveServer/var/stor
+@@ -335,7 +353,7 @@
+     if [ -d $APACHE_DDIR ]; then
+         echo "Y"
+         AP_DDIR_FOUND=yes
+-        cp $basedir/etc/apache/$CONFFILE $APACHE_DDIR
+        cp $install_tpl/$CONFFILE $APACHE_DDIR
+         break
+     else
+         echo "N"
+@@ -345,7 +363,7 @@
+     echo "###############################"
+     echo " Could not configure Apache"
+     echo "  include following file into apache config manually:"
+-    echo "  $basedir/etc/apache/$CONFFILE"
+    echo "  $install_tpl/etc/apache/$CONFFILE"
+     echo "###############################"
+ fi
+ echo "done"
+@@ -389,7 +407,7 @@
+ 
+ if [ "$storage_is_local" = "yes" ]; then
+     # create PHP-related database tables
+-    cd $install_var_ls/storageServer/var/install
+    cd $install_shr/storageServer/var/install
+     # workaround for #2059; restore to "exit 1" after the ticket is closed
+     php -q install.php || exit 1;
+     #php -q install.php || true
+@@ -397,7 +415,7 @@
+ fi
+ 
+ # create PHP-related database tables
+-cd $install_var_ls/archiveServer/var/install
+cd $install_shr/archiveServer/var/install
+ # workaround for ticket #2059; restore to "exit 1" after the ticket is closed
+ php -q install.php || exit 1;
+ #php -q install.php || true
+@@ -416,7 +434,7 @@
+     grep -q 'ls_scheduler_storage_pass' $install_etc/campcaster-scheduler.xml
+     if [ $? = 0 ]; then
+         SCHEDULER_STORAGE_PASS=`pwgen -N1 -c -n -s`
+-        php -q $install_var_ls/storageServer/var/install/campcaster-user.php \
+        php -q $install_shr/storageServer/var/install/campcaster-user.php \
+             --addupdate scheduler ${SCHEDULER_STORAGE_PASS}
+         sed -i -e "s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/" \
+             $install_etc/campcaster-scheduler.xml
+@@ -428,7 +446,7 @@
+ #-------------------------------------------------------------------------------
+ echo "Initializing twitter cron...";
+ 
+-cd $install_var_ls/htmlUI/var/install
+cd $install_shr/htmlUI/var/install
+ # workaround for #2059; restore to "exit 1" after the ticket is closed
+ php -q install.php || exit 1;
+ #php -q install.php || true
+@@ -436,7 +454,7 @@
+ 
+ # We need the scheduler password here too
+ sed -i -e "s/change_me/${SCHEDULER_STORAGE_PASS}/" \
+-            $install_var_ls/htmlUI/var/html/ui_twitterCron.php
+            $install_shr/htmlUI/var/ui_twitterCron.php
+ 
+ 
+ 
+@@ -444,7 +462,7 @@
+ #  Update the database, if necessary
+ #-------------------------------------------------------------------------------
+ if [ "$storage_is_local" = "yes" ]; then
+-    php -q $install_var_ls/storageServer/var/install/upgrade/upgrade.php
+    php -q $install_shr/storageServer/var/install/upgrade/upgrade.php
+ fi
+ 
+ 
+Index: campcaster/etc/Makefile.in
+===================================================================
+--- campcaster.orig/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -52,7 +52,7 @@
+ 
+ USR_DIR     = ${prefix}
+ USR_BIN_DIR = ${USR_DIR}/bin
+-USR_DOC_DIR = ${USR_DIR}/doc
+USR_DOC_DIR = ${USR_DIR}/share/doc/campcaster
+ USR_ETC_DIR = ${USR_DIR}/etc
+ USR_LIB_DIR = ${USR_DIR}/lib
+ USR_VAR_DIR = ${USR_DIR}/var
+@@ -237,10 +237,10 @@
+             --with-apache-group=${APACHE_GROUP} \
+             --with-www-docroot=${WWW_DOCROOT} \
+             --with-configure-apache=${CONFIGURE_APACHE} \
+-            --with-storage-server=${prefix}/var/Campcaster/storageServer \
+            --with-storage-server=/usr/share/campcaster/www/storageServer \
+             PACKAGE_VERSION=${PACKAGE_VERSION}
+ 	cd ${STORAGE_ADMIN_DIR} && ./configure --prefix=${prefix} \
+-            --with-storage-server=${prefix}/var/Campcaster/storageServer \
+            --with-storage-server=/usr/share/campcaster/www/storageServer \
+             --with-phppart-dir=${prefix}/var/Campcaster/storageAdmin \
+             PACKAGE_VERSION=${PACKAGE_VERSION}
+ 	cd ${STORAGE_SERVER_DIR} && \
+Index: campcaster/src/modules/archiveServer/etc/Makefile.in
+===================================================================
+--- campcaster.orig/src/modules/archiveServer/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/archiveServer/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -86,11 +86,13 @@
+ PHP_URL_PREFIX = @URL_PREFIX@
+ 
+ 
+-USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+SHR_WWW_DIR_S=$(shell ${ECHO} /usr/share/campcaster/www | ${SED} -e "s/\//\\\\\\\\\//g")
+USR_LIB_DIR_S=$(shell ${ECHO} /usr/lib/campcaster | ${SED} -e "s/\//\\\\\\\\\//g")
+ PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g")
+ 
+ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
+               s/ls_dbuser/${DB_USER}/; \
+              s/ls_shr_www/${SHR_WWW_DIR_S}/; \
+               s/ls_dbpassword/${DB_PASSWORD}/; \
+               s/ls_dbserver/${DB_SERVER}/; \
+               s/ls_database/${DATABASE}/; \
+Index: campcaster/src/modules/archiveServer/var/conf.php.template
+===================================================================
+--- campcaster.orig/src/modules/archiveServer/var/conf.php.template	2010-07-22 15:21:30.000000000 +0200
+++ campcaster/src/modules/archiveServer/var/conf.php.template	2010-08-26 14:51:22.000000000 +0200
+@@ -3,7 +3,7 @@
+  * ArchiveServer configuration file
+  */
+ 
+-include(dirname(__FILE__)."/../../storageServer/var/campcaster_version.php");
+include("/etc/campcaster/storageServer/campcaster_version.php");
+ 
+ /**
+  *  configuration structure:
+@@ -48,10 +48,10 @@
+     'AdminsGr'      => 'Admins',
+     'StationPrefsGr'=> '',
+     'AllGr'         => 'All',
+-    'storageDir'    =>  dirname(__FILE__).'/../../archiveServer/var/stor',
+-    'bufferDir'     =>  dirname(__FILE__).'/../../archiveServer/var/stor/buffer',
+-    'transDir'      =>  dirname(__FILE__).'/../../archiveServer/var/trans',
+-    'accessDir'     =>  dirname(__FILE__).'/../../archiveServer/var/access',
+    'storageDir'    =>  'ls_shr_www/archiveServer/var/stor',
+    'bufferDir'     =>  'ls_shr_www/archiveServer/var/stor/buffer',
+    'transDir'      =>  'ls_shr_www/archiveServer/var/trans',
+    'accessDir'     =>  'ls_shr_www/archiveServer/var/access',
+     'pearPath'      =>  'ls_lib_dir/pear',
+     'isArchive'     =>  TRUE,
+     'validate'      =>  TRUE,
+@@ -117,4 +117,4 @@
+ );
+ $old_ip = get_include_path();
+ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'].PATH_SEPARATOR.$old_ip);
+-?>
+\ No newline at end of file
+?>
+Index: campcaster/src/modules/htmlUI/etc/Makefile.in
+===================================================================
+--- campcaster.orig/src/modules/htmlUI/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/htmlUI/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -73,7 +73,11 @@
+ WWW_DOCROOT  = @WWW_DOCROOT@
+ STORAGE_SERVER = @STORAGE_SERVER@
+ 
+-REPLACE_SED_STRING="s\storage_server\${STORAGE_SERVER}\;"
+STORAGE_SERVER_S=$(shell ${ECHO} "${STORAGE_SERVER}" | ${SED} -e "s/\//\\\\\\\\\//g")
+HTMLUI_DIR_S=$(shell ${ECHO} "${STORAGE_SERVER}/../htmlUI/var" | ${SED} -e "s/\//\\\\\\\\\//g")
+
+REPLACE_SED_STRING="s/storage_server/${STORAGE_SERVER_S}/;\
+                   s/htmlui_dir/${HTMLUI_DIR_S}/;"
+ 
+ 
+ #-------------------------------------------------------------------------------
+Index: campcaster/src/modules/htmlUI/var/ui_conf.php.template
+===================================================================
+--- campcaster.orig/src/modules/htmlUI/var/ui_conf.php.template	2010-07-22 15:21:30.000000000 +0200
+++ campcaster/src/modules/htmlUI/var/ui_conf.php.template	2010-08-26 14:51:22.000000000 +0200
+@@ -152,9 +152,9 @@
+     )
+ );
+ 
+-require_once(dirname(__FILE__).'/ui_base.inc.php');
+-require_once('../../../storageServer/var/GreenBox.php');
+-require_once(dirname(__FILE__).'/formmask/generic.inc.php');
+require_once('htmlui_dir/ui_base.inc.php');
+require_once('storage_server/var/GreenBox.php');
+require_once('htmlui_dir/formmask/generic.inc.php');
+ 
+ require_once('DB.php');
+ require_once('HTML/QuickForm.php');
+Index: campcaster/src/modules/storageAdmin/bin/campcaster-backup
+===================================================================
+--- campcaster.orig/src/modules/storageAdmin/bin/campcaster-backup	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/storageAdmin/bin/campcaster-backup	2010-08-26 14:51:22.000000000 +0200
+@@ -36,8 +36,7 @@
+ then
+     phpdir=`cd $reldir/var; pwd`
+ fi
+-mkdir -p $reldir/tmp
+-tmpmaindir=`cd $reldir/tmp; pwd`
+tmpmaindir=/tmp
+ dbxml="db.xml"
+ datestr=`date '+%Y%m%d%H%M%S'`
+ xmltar="xmls.tar"
+Index: campcaster/src/modules/storageAdmin/bin/dumpDbSchema.sh
+===================================================================
+--- campcaster.orig/src/modules/storageAdmin/bin/dumpDbSchema.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/storageAdmin/bin/dumpDbSchema.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -30,13 +30,7 @@
+ #  Determine directories, files
+ #-------------------------------------------------------------------------------
+ 
+-reldir=`dirname $0`/..
+-phpdir=ls_storageAdmin_phppart_dir
+-if [ "$phpdir" == "ls_storageAdmin_phppart_dir" ]
+-then
+-    phpdir=`cd $reldir/var; pwd`
+-fi
+-filelistpathname=.
+phpdir=/usr/share/campcaster/www/storageAdmin/var/
+ 
+ #-------------------------------------------------------------------------------
+ #  Print the usage information for this script.
+Index: campcaster/src/modules/storageAdmin/etc/Makefile.in
+===================================================================
+--- campcaster.orig/src/modules/storageAdmin/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/storageAdmin/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -67,9 +67,10 @@
+ 
+ DEST_DIR    = ${USR_DIR}
+ PHPPART_DIR = ${prefix}/var/Campcaster/storageAdmin/var
+REALPHP_DIR = /usr/share/campcaster/www/storageAdmin/var
+ STORAGE_SERVER 	= @STORAGE_SERVER@
+ 
+-PHPPART_DIR_S=$(shell ${ECHO} ${PHPPART_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+PHPPART_DIR_S=$(shell ${ECHO} ${REALPHP_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+ STORAGE_SERVER_S=$(shell ${ECHO} ${STORAGE_SERVER} | ${SED} -e "s/\//\\\\\\\\\//g")
+ 
+ SED_STORAGE_SERVER="s/ls_storageServer/${STORAGE_SERVER_S}/;"
+Index: campcaster/src/modules/storageServer/bin/createDatabase.sh
+===================================================================
+--- campcaster.orig/src/modules/storageServer/bin/createDatabase.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/storageServer/bin/createDatabase.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -30,18 +30,6 @@
+ #-------------------------------------------------------------------------------
+ 
+ #-------------------------------------------------------------------------------
+-#  Determine directories, files
+-#-------------------------------------------------------------------------------
+-reldir=`dirname $0`/..
+-basedir=`cd $reldir; pwd;`
+-bindir=$basedir/bin
+-etcdir=$basedir/etc
+-docdir=$basedir/doc
+-tmpdir=$basedir/tmp
+-usrdir=$basedir/usr
+-
+-
+-#-------------------------------------------------------------------------------
+ #  Print the usage information for this script.
+ #-------------------------------------------------------------------------------
+ printUsage()
+Index: campcaster/src/modules/storageServer/etc/Makefile.in
+===================================================================
+--- campcaster.orig/src/modules/storageServer/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/storageServer/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -95,11 +95,14 @@
+ SCHEDULER_URL_PREFIX =
+ SCHEDULER_XML_RPC_PREFIX = RC2
+ 
+-USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+SHR_WWW_DIR_S=$(shell ${ECHO} /usr/share/campcaster/www | ${SED} -e "s/\//\\\\\\\\\//g")
+USR_LIB_DIR_S=$(shell ${ECHO} "/usr/lib/campcaster" | ${SED} -e "s/\//\\\\\\\\\//g")
+
+ PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g")
+ 
+ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
+               s/ls_dbuser/${DB_USER}/; \
+              s/ls_shr_www/${SHR_WWW_DIR_S}/; \
+               s/ls_dbpassword/${DB_PASSWORD}/; \
+               s/ls_dbserver/${DB_SERVER}/; \
+               s/ls_database/${DATABASE}/; \
+Index: campcaster/src/modules/storageServer/var/conf.php.template
+===================================================================
+--- campcaster.orig/src/modules/storageServer/var/conf.php.template	2010-07-22 15:21:30.000000000 +0200
+++ campcaster/src/modules/storageServer/var/conf.php.template	2010-08-26 14:51:22.000000000 +0200
+@@ -53,12 +53,12 @@
+     'StationPrefsGr'=> 'StationPrefs',
+     'AllGr'         => 'All',
+     'TrashName'     => 'trash_',
+-    'storageDir'    => dirname(__FILE__).'/../../storageServer/var/stor',
+-    'bufferDir'     => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
+-    'transDir'      => dirname(__FILE__).'/../../storageServer/var/trans',
+-    'accessDir'     => dirname(__FILE__).'/../../storageServer/var/access',
+    'storageDir'    => 'ls_shr_www/storageServer/var/stor',
+    'bufferDir'     => 'ls_shr_www/storageServer/var/stor/buffer',
+    'transDir'      => 'ls_shr_www/storageServer/var/trans',
+    'accessDir'     => 'ls_shr_www/storageServer/var/access',
+     'pearPath'      => 'ls_lib_dir/pear',
+-    'cronDir'       => dirname(__FILE__).'/../../storageServer/var/cron',
+    'cronDir'       => 'ls_shr_www/storageServer/var/cron',
+     'isArchive'     =>  FALSE,
+     'validate'      =>  TRUE,
+     'useTrash'      =>  TRUE,
+@@ -113,9 +113,10 @@
+ 
+     /* =================================================== cron configuration */
+     'cronUserName'      => 'ls_apache_group',
+-    'lockfile'          => dirname(__FILE__).'/cron/cron.lock',
+-    'cronfile'          => dirname(__FILE__).'/cron/croncall.php',
+-    'paramdir'          => dirname(__FILE__).'/cron/params',
+    'lockfile'          => '/var/lock/campcaster-cron.lock',
+    'cronfile'          => 'ls_shr_www/storageServer/var/cron/croncall.php',
+    'paramdir'          => '/var/cache/campcaster/cronparams',
+
+ );
+ 
+ // Add database table names
+Index: campcaster/src/products/gLiveSupport/bin/campcaster-studio.sh
+===================================================================
+--- campcaster.orig/src/products/gLiveSupport/bin/campcaster-studio.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/products/gLiveSupport/bin/campcaster-studio.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -29,17 +29,15 @@
+ #-------------------------------------------------------------------------------
+ #  Determine directories, files
+ #-------------------------------------------------------------------------------
+-reldir=`dirname $0`/..
+-basedir=`cd $reldir; pwd;`
+-bindir=$basedir/bin
+-etcdir=$basedir/etc
+-libdir=$basedir/lib
+-tmpdir=$basedir/tmp
+bindir=/usr/lib/campcaster/bin/
+etcdir=/etc
+libdir=/usr/lib/campcaster/
+ 
+ 
+ #-------------------------------------------------------------------------------
+ #  Set up the environment
+ #-------------------------------------------------------------------------------
+export PATH=$bindir:$PATH
+ export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ export GST_REGISTRY=$etcdir/gst-registry.xml
+ studio_exe=$bindir/campcaster-studio
+Index: campcaster/src/products/gLiveSupport/etc/Makefile.in
+===================================================================
+--- campcaster.orig/src/products/gLiveSupport/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/products/gLiveSupport/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -61,6 +61,7 @@
+ USR_LIB_DIR     = ${USR_DIR}/lib
+ USR_VAR_DIR     = ${USR_DIR}/var
+ STORAGE_TMP_DIR = "/tmp"
+REAL_SHR_DIR    = "/usr/share/campcaster/www"
+ 
+ HOSTNAME       = @HOSTNAME@
+ WWW_PORT       = @WWW_PORT@
+@@ -75,9 +76,10 @@
+ PHP_URL_PREFIX=campcaster
+ ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php
+ SCHEDULER_XML_RPC_PREFIX=RC2
+-SCHEDULER_DAEMON_COMMAND="sudo ${USR_BIN_DIR}/campcaster-scheduler.sh"
+SCHEDULER_DAEMON_COMMAND="sudo /etc/init.d/campcaster"
+ 
+-USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+
+USR_VAR_DIR_S=$(shell ${ECHO} ${REAL_SHR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+ PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \
+                                             ${SED} -e "s/\//\\\\\\\\\//g")
+ ALIB_XML_RPC_PREFIX_S=$(shell ${ECHO} ${ALIB_XML_RPC_PREFIX} | \
+Index: campcaster/src/products/scheduler/bin/campcaster-scheduler.sh
+===================================================================
+--- campcaster.orig/src/products/scheduler/bin/campcaster-scheduler.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/products/scheduler/bin/campcaster-scheduler.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -28,17 +28,15 @@
+ #-------------------------------------------------------------------------------
+ #  Determine directories, files
+ #-------------------------------------------------------------------------------
+-reldir=`dirname $0`/..
+-basedir=`cd $reldir; pwd;`
+-bindir=$basedir/bin
+-etcdir=$basedir/etc
+-libdir=$basedir/lib
+-vardir=$basedir/var/Campcaster/scheduler/var
+-
+bindir=/usr/lib/campcaster/bin
+etcdir=/etc
+libdir=/usr/lib/campcaster/
+vardir=/usr/share/campcaster/www/scheduler/var
+ 
+ #-------------------------------------------------------------------------------
+ #  Set up the environment
+ #-------------------------------------------------------------------------------
+export PATH=$bindir:$PATH
+ export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+ export GST_REGISTRY=$etcdir/gst-registry.xml
+ scheduler_exe=$bindir/campcaster-scheduler
+Index: campcaster/src/products/scheduler/bin/createDatabase.sh
+===================================================================
+--- campcaster.orig/src/products/scheduler/bin/createDatabase.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/products/scheduler/bin/createDatabase.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -30,18 +30,6 @@
+ #-------------------------------------------------------------------------------
+ 
+ #-------------------------------------------------------------------------------
+-#  Determine directories, files
+-#-------------------------------------------------------------------------------
+-reldir=`dirname $0`/..
+-basedir=`cd $reldir; pwd;`
+-bindir=$basedir/bin
+-etcdir=$basedir/etc
+-docdir=$basedir/doc
+-tmpdir=$basedir/tmp
+-usrdir=$basedir/usr
+-
+-
+-#-------------------------------------------------------------------------------
+ #  Print the usage information for this script.
+ #-------------------------------------------------------------------------------
+ printUsage()
+Index: campcaster/src/products/scheduler/bin/createOdbcDataSource.sh
+===================================================================
+--- campcaster.orig/src/products/scheduler/bin/createOdbcDataSource.sh	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/products/scheduler/bin/createOdbcDataSource.sh	2010-08-26 14:51:22.000000000 +0200
+@@ -32,14 +32,7 @@
+ #-------------------------------------------------------------------------------
+ #  Determine directories, files
+ #-------------------------------------------------------------------------------
+-reldir=`dirname $0`/..
+-basedir=`cd $reldir; pwd;`
+-bindir=$basedir/bin
+-etcdir=$basedir/etc
+-docdir=$basedir/doc
+-tmpdir=$basedir/tmp
+-usrdir=$basedir/usr
+-
+etcdir=/usr/share/campcaster/etc/
+ 
+ #-------------------------------------------------------------------------------
+ #  Print the usage information for this script.
+Index: campcaster/src/products/scheduler/etc/Makefile.in
+===================================================================
+--- campcaster.orig/src/products/scheduler/etc/Makefile.in	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/products/scheduler/etc/Makefile.in	2010-08-26 14:51:22.000000000 +0200
+@@ -76,6 +76,8 @@
+ POSTGRES_USER=postgres
+ 
+ USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
+STORAGE_PID_DIR_S=$(shell ${ECHO} /var/run/ | \
+                        ${SED} -e "s/\//\\\\\\\\\//g")
+ STORAGE_TMP_DIR_S=$(shell ${ECHO} ${STORAGE_TMP_DIR} | \
+                         ${SED} -e "s/\//\\\\\\\\\//g")
+ PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \
+@@ -95,6 +97,7 @@
+               s/ls_php_port/${WWW_PORT}/; \
+               s/ls_alib_xmlRpcPrefix/${ALIB_XML_RPC_PREFIX_S}/; \
+               s/ls_tmp_dir/${STORAGE_TMP_DIR_S}/; \
+              s/ls_pid_dir/${STORAGE_PID_DIR_S}/; \
+               s/ls_audio_output_device/${AUDIO_OUT_S}/; \
+               s/ls_scheduler_host/${HOSTNAME}/; \
+               s/ls_scheduler_port/${SCHEDULER_PORT}/;"
+Index: campcaster/src/products/scheduler/etc/campcaster-scheduler.xml.template
+===================================================================
+--- campcaster.orig/src/products/scheduler/etc/campcaster-scheduler.xml.template	2010-07-22 15:21:30.000000000 +0200
+++ campcaster/src/products/scheduler/etc/campcaster-scheduler.xml.template	2010-08-26 14:51:22.000000000 +0200
+@@ -124,7 +124,7 @@
+ 
+     <xmlRpcDaemon xmlRpcHost  = "ls_scheduler_host"
+                   xmlRpcPort  = "ls_scheduler_port"
+-                  pidFileName = "ls_tmp_dir/scheduler.pid"
+                  pidFileName = "ls_pid_dir/campcaster.pid"
+     />
+ </scheduler>
+ 
--- a/debian/patches/fix_storageClient_tests.diff
+++ b/debian/patches/fix_storageClient_tests.diff
@ -0,0 +1,28 @@
+Description: change paths used during "make check" 
+ they should be generated from .template files during
+ the setup stage but are not.
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-02-15
+Index: campcaster/src/modules/storageClient/etc/webAuthenticationClient.xml
+===================================================================
+--- campcaster.orig/src/modules/storageClient/etc/webAuthenticationClient.xml	2010-02-16 00:13:07.000000000 +0100
+++ campcaster/src/modules/storageClient/etc/webAuthenticationClient.xml	2010-02-16 00:15:23.000000000 +0100
+@@ -14,6 +14,6 @@
+ <authenticationClientFactory>
+     <webAuthentication>
+         <location server="localhost" port="80"
+-                  path="/campcasterStorageServer/xmlrpc/xrLocStor.php" />
+                  path="/campcaster/storageServer/var/xmlrpc/xrLocStor.php" />
+     </webAuthentication>
+ </authenticationClientFactory>
+Index: campcaster/src/modules/storageClient/etc/webStorage.xml
+===================================================================
+--- campcaster.orig/src/modules/storageClient/etc/webStorage.xml	2010-02-16 00:12:34.000000000 +0100
+++ campcaster/src/modules/storageClient/etc/webStorage.xml	2010-02-16 00:14:53.000000000 +0100
+@@ -12,5 +12,5 @@
+ ]>
+ <webStorage tempFiles="file:///tmp/webStorageClient" >
+     <location server="localhost" port="80" 
+-              path="/campcasterStorageServer/xmlrpc/xrLocStor.php" />
+              path="/campcaster/storageServer/var/xmlrpc/xrLocStor.php" />
+ </webStorage>
--- a/debian/patches/fix_xml_paths.diff
+++ b/debian/patches/fix_xml_paths.diff
@ -0,0 +1,52 @@
+Subject: Change paths in XML templates for Debian/Ubuntu
+Forwarded: no
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-08-26
+Index: campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template
+===================================================================
+--- campcaster.orig/src/products/gLiveSupport/etc/campcaster-studio.xml.template	2010-04-13 22:36:12.000000000 +0200
+++ campcaster/src/products/gLiveSupport/etc/campcaster-studio.xml.template	2010-04-13 22:37:32.000000000 +0200
+@@ -140,7 +140,7 @@
+ ]>
+ 
+ <gLiveSupport>
+-    <resourceBundle path   = "ls_var_dir/Campcaster/studio-localization"
+    <resourceBundle path   = "ls_var_dir/studio-localization"
+                     locale = "en"
+     />
+ 
+@@ -156,9 +156,9 @@
+         <language locale="sv"               name="Svenska"/>
+     </supportedLanguages>
+ 
+-    <gladeDirectory     path = "ls_var_dir/Campcaster/glade/" />
+    <gladeDirectory     path = "ls_var_dir/glade/" />
+ 
+-    <widgetFactory    path = "ls_var_dir/Campcaster/Widgets/" />
+    <widgetFactory    path = "ls_var_dir/Widgets/" />
+ 
+     <authenticationClientFactory>
+         <webAuthentication>
+@@ -196,16 +196,16 @@
+         </audioPlayer>
+     </cuePlayer>
+ 
+-    <stationLogo    path = "ls_var_dir/Campcaster/stationLogo.png" />
+    <stationLogo    path = "ls_var_dir/stationLogo.png" />
+ 
+     <taskbarIcons>
+-        <icon       path = "ls_var_dir/Campcaster/icon16.png" />
+-        <icon       path = "ls_var_dir/Campcaster/icon22.png" />
+-        <icon       path = "ls_var_dir/Campcaster/icon32.png" />
+-        <icon       path = "ls_var_dir/Campcaster/icon48.png" />
+        <icon       path = "ls_var_dir/icon16.png" />
+        <icon       path = "ls_var_dir/icon22.png" />
+        <icon       path = "ls_var_dir/icon32.png" />
+        <icon       path = "ls_var_dir/icon48.png" />
+     </taskbarIcons>
+ 
+-    <testAudioUrl   path = "file://ls_var_dir/Campcaster/testAudio.ogg" />
+    <testAudioUrl   path = "file://ls_var_dir/testAudio.ogg" />
+ 
+     <serialPort     path = "/dev/ttyS0" />
+ 
--- a/debian/patches/gconfsink.diff
+++ b/debian/patches/gconfsink.diff
@ -0,0 +1,27 @@
+Subject: Allow to configure the player's audio-device with gconf
+Forwarded: no
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-08-26
+Index: campcaster/src/modules/playlistExecutor/src/GstreamerPlayContext.h
+===================================================================
+--- campcaster.orig/src/modules/playlistExecutor/src/GstreamerPlayContext.h	2010-08-26 13:40:02.000000000 +0200
+++ campcaster/src/modules/playlistExecutor/src/GstreamerPlayContext.h	2010-08-26 14:51:50.000000000 +0200
+@@ -292,6 +292,7 @@
+         // and ALSA can emulate it.
+         // const bool oss = m_audioDevice.find("/dev") == 0;
+         const bool autosink = m_audioDevice.find("auto") == 0;
+        const bool gconfsink = m_audioDevice.find("gconf") == 0;
+ 
+         m_sink = gst_bin_new ("audiobin");
+         if(m_sink == NULL){
+@@ -301,7 +302,9 @@
+         audiopad = gst_element_get_pad (conv, "sink");
+ 
+         // set the string to be sent to gstreamer. the option here is to set it to autoaudiosink.
+-        GstElement *sink = (autosink ? gst_element_factory_make("autoaudiosink", NULL) : gst_element_factory_make("alsasink", NULL));
+        GstElement *sink = (autosink ? gst_element_factory_make("autoaudiosink", NULL) :
+			   (gconfsink? gst_element_factory_make("gconfaudiosink", NULL):
+				       gst_element_factory_make("alsasink", NULL)));
+         if(sink == NULL){
+             return false;
+         }
--- a/debian/patches/icon_xpm.diff
+++ b/debian/patches/icon_xpm.diff
@ -0,0 +1,194 @@
+Subject: Add icon in xpm format
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-02-14
+diff --git a/src/products/gLiveSupport/var/icon32.xpm b/src/products/gLiveSupport/var/icon32.xpm
+new file mode 100644
+index 0000000..90f2a46
+--- /dev/null
+++ b/src/products/gLiveSupport/var/icon32.xpm
+@@ -0,0 +1,185 @@
+/* XPM */
+static char *icon__[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 147 2",
+"   c #B6480F",
+".  c #BB4D16",
+"X  c #BE4D14",
+"o  c #BE4E16",
+"O  c #C2521C",
+"+  c #D9521C",
+"@  c #C45925",
+"#  c #C95923",
+"$  c #CD5D27",
+"%  c #CD5E2C",
+"&  c #D75A25",
+"*  c #DF5E2A",
+"=  c #D46632",
+"-  c #DF6732",
+";  c #D86C3D",
+":  c #DB6D3C",
+">  c #DF6E3E",
+",  c #E6642E",
+"<  c #E26330",
+"1  c #E06735",
+"2  c #E26837",
+"3  c #E56938",
+"4  c #E26D39",
+"5  c #E56C3B",
+"6  c #E56D3D",
+"7  c #E96A38",
+"8  c #DC7040",
+"9  c #DD7242",
+"0  c #DE7245",
+"q  c #E27343",
+"w  c #E47242",
+"e  c #E37546",
+"r  c #E37547",
+"t  c #EB7241",
+"y  c #E97343",
+"u  c #EA7647",
+"i  c #E37548",
+"p  c #E77749",
+"a  c #EA7749",
+"s  c #E27E4E",
+"d  c #E9794C",
+"f  c #E97A4E",
+"g  c #E57B50",
+"h  c #E37D50",
+"j  c #E27C52",
+"k  c #EE7D50",
+"l  c #E87E54",
+"z  c #E68055",
+"x  c #EB8050",
+"c  c #EA8052",
+"v  c #E98056",
+"b  c #ED8157",
+"n  c #EE8157",
+"m  c #E5845C",
+"M  c #E7875F",
+"N  c #E98158",
+"B  c #E88359",
+"V  c #E98459",
+"C  c #EE865B",
+"Z  c #E8855D",
+"A  c #E9865E",
+"S  c #EE875F",
+"D  c #F1855A",
+"F  c #EA8860",
+"G  c #EC8A60",
+"H  c #EE8A62",
+"J  c #EB8C64",
+"K  c #E98C66",
+"L  c #EE8C66",
+"P  c #EF8D66",
+"I  c #EB926C",
+"U  c #EB926D",
+"Y  c #EF946F",
+"T  c #F1916B",
+"R  c #F1936E",
+"E  c #EF9470",
+"W  c #ED9775",
+"Q  c #EF9976",
+"!  c #EE9978",
+"~  c #EE9D7A",
+"^  c #F19571",
+"/  c #F59872",
+"(  c #F39974",
+")  c #F09A77",
+"_  c #F79B78",
+"`  c #F19D78",
+"'  c #F39C79",
+"]  c #F49E7B",
+"[  c #F79E7B",
+"{  c #F39C7C",
+"}  c #F29D7C",
+"|  c #EFA07E",
+" . c #F7A17F",
+".. c #F5A282",
+"X. c #F7A282",
+"o. c #F7A382",
+"O. c #F7A785",
+"+. c #F8A585",
+"@. c #F8A687",
+"#. c #F4A98A",
+"$. c #F7A98B",
+"%. c #F7AB8D",
+"&. c #F5AC8D",
+"*. c #F9AA8A",
+"=. c #FAAC8D",
+"-. c #F7AF92",
+";. c #F9AE91",
+":. c #F7B091",
+">. c #F8B196",
+",. c #FAB59B",
+"<. c #FCB699",
+"1. c #FAB79C",
+"2. c #FABB9F",
+"3. c #FBBCA1",
+"4. c #FCBEA6",
+"5. c #FBC0A6",
+"6. c #FDC1AA",
+"7. c #FCC2AC",
+"8. c #FDC4AE",
+"9. c #FEC5AF",
+"0. c #FDC5B0",
+"q. c #FFC6B0",
+"w. c #FFC6B1",
+"e. c #FEC7B2",
+"r. c #FFCBB4",
+"t. c #FECBB6",
+"y. c #FECCB6",
+"u. c #FFCDB7",
+"i. c #FFCBB9",
+"p. c #FFCCB8",
+"a. c #FECCB9",
+"s. c #FFCEBA",
+"d. c #FFD1BF",
+"f. c #FFD2BF",
+"g. c #FFD2C1",
+"h. c #FFD3C1",
+"j. c #FFD2C2",
+"k. c #FFD4C4",
+"l. c #FFD5C4",
+"z. c #FFD5C5",
+"x. c #FFD6C7",
+"c. c #FFD7C7",
+"v. c #FFD8C7",
+"b. c #FFD7C9",
+"n. c #FFD9C9",
+"m. c #FFD9CA",
+"M. c None",
+/* pixels */
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.k / +.+.] D , M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.< ' 8.c.n.b.c.n.v.a.=.u M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.] c.c.7.#.^ F B A Y %.e.d.<.y M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.f t.a.( : o M.M.M.M.M.M.M.. :  .6.[ M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.( 8.K o M.M.M.M.M.M.M.M.M.M.M.M.M.@ U *.7 M.M.M.M.M.",
+"M.M.M.M.M. .Q O M.M.M.M.M.& f S H C a M.M.M.M.M.M.M.T y M.M.M.M.",
+"M.M.M.M.R 0 M.M.M.M.M.p ;.i.j.c.j.j.j.e.o.3 M.M.M.M.M.l 6 M.M.M.",
+"M.M.M.b M.M.M.M.M.5 >.d.4.{ v e e e f Y 1.e.o.* M.M.M.M.M.+ M.M.",
+"M.M.2 M.M.M.M.M.L e.#.>   M.M.M.M.M.M.M.M.% ) ,.n M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M...:.: M.M.M.M.M.M.M.M.M.M.M.M.M.M.Q L M.M.M.M.M.M.",
+"M.M.M.M.M.M.{ h M.M.M.M.M.M.1 x c 4 M.M.M.M.M.M.M.M.B M.M.M.M.M.",
+"M.M.M.M.M.A M.M.M.M.M.M.V 3.a.a.r.y.5.' M.M.M.M.M.M.M.1 M.M.M.M.",
+"M.M.M.M.i M.M.M.M.M.M.%.2.I 9 $ # = s ~ :.H M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.w O.h M.M.M.M.M.M.M.M.M.M K M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.z M.M.M.M.M.M.M.M.M.M.M.M.M.m M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.",
+"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M."
+};
--- a/debian/patches/postgres_fixes.diff
+++ b/debian/patches/postgres_fixes.diff
@ -0,0 +1,90 @@
+Subject: Change pgsql setup scripts for debian postgres 8.4
+Author: Robin Gareus <robin@gareus.org>
+Last-Update: 2010-02-14
+Index: campcaster/bin/postInstallStation.sh
+===================================================================
+--- campcaster.orig/bin/postInstallStation.sh	2010-08-26 14:51:38.000000000 +0200
+++ campcaster/bin/postInstallStation.sh	2010-08-26 14:51:40.000000000 +0200
+@@ -235,22 +235,22 @@
+ #-------------------------------------------------------------------------------
+ #  Install the new pg_hba.conf file
+ #-------------------------------------------------------------------------------
+-echo "Modifying postgresql access permissions...";
+-
+-pg_config_dir=$postgresql_dir
+-pg_config_file=pg_hba.conf
+-pg_config_file_saved=pg_hba.conf.before-campcaster
+-
+-if [ -f $pg_config_dir/$pg_config_file ] ; then
+-    mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ;
+-fi
+-cp $install_etc/$pg_config_file $pg_config_dir/$pg_config_file
+-chown root:$postgres_user $pg_config_dir/$pg_config_file
+-
+-# don't use restart for the init script, as it might return prematurely
+-# and in the later call to psql we wouldn't be able to connect
+-${postgresql_init_script} stop
+-${postgresql_init_script} start
+#echo "Modifying postgresql access permissions...";
+#
+#pg_config_dir=$postgresql_dir
+#pg_config_file=pg_hba.conf
+#pg_config_file_saved=pg_hba.conf.before-campcaster
+#
+#if [ -f $pg_config_dir/$pg_config_file ] ; then
+#    mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ;
+#fi
+#cp $install_etc/$pg_config_file $pg_config_dir/$pg_config_file
+#chown root:$postgres_user $pg_config_dir/$pg_config_file
+#
+## don't use restart for the init script, as it might return prematurely
+## and in the later call to psql we wouldn't be able to connect
+#${postgresql_init_script} stop
+#${postgresql_init_script} start
+ 
+ 
+ #-------------------------------------------------------------------------------
+Index: campcaster/src/modules/storageServer/bin/createDatabase.sh
+===================================================================
+--- campcaster.orig/src/modules/storageServer/bin/createDatabase.sh	2010-08-26 14:51:38.000000000 +0200
+++ campcaster/src/modules/storageServer/bin/createDatabase.sh	2010-08-26 14:51:40.000000000 +0200
+@@ -171,7 +171,7 @@
+         || echo "Couldn't create database user $ls_dbuser.";
+ 
+     su - $postgres_user -c "echo \"CREATE DATABASE \\\"$ls_database\\\" \
+-                                    OWNER $ls_dbuser ENCODING 'utf-8';\" \
+                                    OWNER $ls_dbuser;\" \
+                             | psql template1" \
+         || echo "Couldn't create database $ls_database.";
+ else
+@@ -187,7 +187,7 @@
+     echo "    ENCRYPTED PASSWORD '$ls_dbpassword'";
+     echo "    CREATEDB NOCREATEUSER;";
+     echo "CREATE DATABASE \"$ls_database\"";
+-    echo "    OWNER $ls_dbuser ENCODING 'utf-8';";
+    echo "    OWNER $ls_dbuser;";
+ fi
+ 
+ 
+Index: campcaster/src/products/scheduler/bin/createDatabase.sh
+===================================================================
+--- campcaster.orig/src/products/scheduler/bin/createDatabase.sh	2010-08-26 14:51:38.000000000 +0200
+++ campcaster/src/products/scheduler/bin/createDatabase.sh	2010-08-26 14:51:40.000000000 +0200
+@@ -166,7 +166,7 @@
+         || echo "Couldn't create database user $dbuser.";
+ 
+     su - $postgres_user -c "echo \"CREATE DATABASE \\\"$database\\\" \
+-                                    OWNER $dbuser ENCODING 'utf-8';\" \
+                                    OWNER $dbuser;\" \
+                             | psql template1" \
+         || echo "Couldn't create database $database.";
+ else
+@@ -182,7 +182,7 @@
+     echo "    ENCRYPTED PASSWORD '$dbpassword'";
+     echo "    CREATEDB NOCREATEUSER;";
+     echo "CREATE DATABASE \"$database\"";
+-    echo "    OWNER $dbuser ENCODING 'utf-8';";
+    echo "    OWNER $dbuser;";
+ fi
+ 
+ 
--- a/debian/patches/remove_upstream_deb.diff
+++ b/debian/patches/remove_upstream_deb.diff
--- a/debian/patches/series
+++ b/debian/patches/series
@ -0,0 +1,8 @@
+remove_upstream_deb.diff
+icon_xpm.diff
+fix_xml_paths.diff
+fix_storageClient_tests.diff
+debianize_paths.diff
+postgres_fixes.diff
+apache_setup.diff
+gconfsink.diff
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,166 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+%:
+	dh $@
+
+override_dh_auto_configure:
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
+        ./configure --prefix=$(CURDIR)/debian/tmp \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--sysconfdir=$(CURDIR)/debian/tmp/etc\
+		--with-www-docroot=$(CURDIR)/debian/tmp/var/www \
+		--with-apache-group=www-data \
+		--with-station-audio-out=hw:0,0 \
+		--with-studio-audio-out=hw:1,0 \
+		--with-studio-audio-cue=hw:2,0 \
+		--with-storage-server=/usr/share/campcaster\
+		--with-hostname=localhost
+
+override_dh_prep:
+	#dh_prep
+	rm -f debian/campcaster.substvars
+	rm -f debian/campcaster.*.debhelper
+	rm -rf debian/campcaster-libs/
+	rm -rf debian/campcaster-studio/
+	rm -rf debian/campcaster-station/
+	#
+	# CUSTOMIZED LIBS..
+	mkdir -p debian/campcaster-libs/usr/lib/campcaster
+	mv debian/tmp/lib/libodbc++-mt.so* debian/campcaster-libs/usr/lib/campcaster/
+	mv debian/tmp/lib/libtag.so* debian/campcaster-libs/usr/lib/campcaster/
+	mv debian/tmp/lib/libxmlrpc++.so* debian/campcaster-libs/usr/lib/campcaster/
+	mv debian/tmp/lib/pear debian/campcaster-libs/usr/lib/campcaster/pear
+	#
+	rm -rf debian/tmp
+	#
+	# campcaster installs a symlink here and will fail if the dir does not exist
+	mkdir -p debian/tmp/var/www
+
+
+override_dh_install:
+	dh_install
+	#
+	mkdir -p debian/campcaster-studio/usr/share/pixmaps/
+	cp src/products/gLiveSupport/var/icon32.xpm debian/campcaster-studio/usr/share/pixmaps/campcaster.xpm
+	# 
+	mkdir -p debian/campcaster-studio/usr/lib/campcaster/bin
+	# 
+	# station (server) 
+	mkdir -p debian/campcaster-station/usr/lib/campcaster/bin
+	mkdir -p debian/campcaster-station/usr/share/campcaster/etc
+	mkdir -p debian/campcaster-station/usr/share/campcaster/www
+	mkdir -p debian/campcaster-station/etc/
+	mv -f debian/tmp/bin/campcaster-scheduler \
+	      debian/tmp/bin/campcaster-scheduler.sh \
+	      debian/tmp/bin/postInstallStation.sh \
+	      debian/tmp/bin/createDatabase.sh \
+	      debian/tmp/bin/createOdbcDataSource.sh \
+	      debian/tmp/bin/campcaster-backup \
+	      debian/tmp/bin/campcaster-import \
+	      debian/tmp/bin/dumpDbSchema.sh \
+	      debian/tmp/bin/campcaster-restore \
+			debian/campcaster-station/usr/lib/campcaster/bin/
+	mv -f debian/tmp/etc/campcaster-scheduler.xml \
+			debian/campcaster-station/etc/
+	# CONFIG templates (for postinst and cc-scripts)
+	mv -f   debian/tmp/etc/pg_hba.conf \
+		debian/tmp/etc/odbc_template \
+		debian/tmp/etc/odbcinst_template \
+		debian/tmp/etc/odbcinst_old_debian_template \
+		debian/tmp/etc/odbcinst_new_debian_template \
+		debian/tmp/etc/apache/90_php_campcaster.conf \
+			debian/campcaster-station/usr/share/campcaster/etc/
+	# CONFIG files
+	mkdir -p debian/campcaster-station/etc/campcaster/archiveServer
+	mkdir -p debian/campcaster-station/etc/campcaster/storageServer
+	mkdir -p debian/campcaster-station/etc/campcaster/storageAdmin
+	mkdir -p debian/campcaster-station/etc/campcaster/htmlUI
+	#
+	mv -f debian/tmp/var/Campcaster/archiveServer/var/conf.php \
+			debian/campcaster-station/etc/campcaster/archiveServer/conf.php
+	mv -f debian/tmp/var/Campcaster/storageServer/var/conf.php \
+			debian/campcaster-station/etc/campcaster/storageServer/conf.php
+	mv -f debian/tmp/var/Campcaster/storageServer/var/campcaster_version.php \
+			debian/campcaster-station/etc/campcaster/storageServer/
+	mv -f debian/tmp/var/Campcaster/storageAdmin/var/conf.php \
+			debian/campcaster-station/etc/campcaster/storageAdmin/conf.php
+	mv -f debian/tmp/var/Campcaster/htmlUI/var/ui_conf.php \
+			debian/campcaster-station/etc/campcaster/htmlUI/ui_conf.php
+	#
+	mv -f debian/tmp/var/Campcaster/alib \
+	      debian/tmp/var/Campcaster/archiveServer \
+	      debian/tmp/var/Campcaster/getid3 \
+	      debian/tmp/var/Campcaster/htmlUI \
+	      debian/tmp/var/Campcaster/index.php \
+	      debian/tmp/var/Campcaster/scheduler \
+	      debian/tmp/var/Campcaster/storageServer \
+	      debian/tmp/var/Campcaster/storageAdmin \
+			debian/campcaster-station/usr/share/campcaster/www
+	# symlink CONFIG files
+	ln -s  /etc/campcaster/archiveServer/conf.php debian/campcaster-station/usr/share/campcaster/www/archiveServer/var/conf.php
+	ln -s  /etc/campcaster/storageServer/conf.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/conf.php
+	ln -s  /etc/campcaster/storageServer/campcaster_version.php debian/campcaster-station/usr/share/campcaster/www/storageServer/var/
+	ln -s  /etc/campcaster/storageAdmin/conf.php  debian/campcaster-station/usr/share/campcaster/www/storageAdmin/var/conf.php
+	ln -s  /etc/campcaster/htmlUI/ui_conf.php  debian/campcaster-station/usr/share/campcaster/www/htmlUI/var/ui_conf.php
+	#	
+	mkdir -p debian/campcaster-station/usr/bin/
+	ln -s /usr/lib/campcaster/bin/campcaster-scheduler.sh debian/campcaster-station/usr/bin/campcaster-scheduler
+	ln -s /usr/lib/campcaster/bin/campcaster-import debian/campcaster-station/usr/bin/campcaster-import
+	#ln -s /usr/lib/campcaster/bin/campcaster-backup debian/campcaster-station/usr/bin/campcaster-backup
+	#ln -s /usr/lib/campcaster/bin/campcaster-restore debian/campcaster-station/usr/sbin/campcaster-restore
+	#
+	# studio (client)
+	mkdir -p debian/campcaster-studio/usr/lib/campcaster/bin
+	mkdir -p debian/campcaster-studio/usr/share/campcaster/etc
+	mkdir -p debian/campcaster-studio/etc/
+	mkdir -p debian/campcaster-studio/usr/share/campcaster/www
+	
+	mv debian/tmp/lib/liblivesupport* debian/campcaster-studio/usr/lib/
+	mv -f debian/tmp/bin/campcaster-studio \
+	      debian/tmp/bin/campcaster-studio.sh \
+			debian/campcaster-studio/usr/lib/campcaster/bin/
+	mv -f debian/tmp/etc/campcaster-studio.xml debian/campcaster-studio/etc/
+	mv -f debian/tmp/etc/campcaster-studio.xml.template debian/campcaster-studio/usr/share/campcaster/etc/
+	mv -f debian/tmp/var/Campcaster/Widgets \
+	      debian/tmp/var/Campcaster/studio-localization \
+	      debian/tmp/var/Campcaster/glade \
+	      debian/tmp/var/Campcaster/campcaster.png \
+	      debian/tmp/var/Campcaster/icon*.png \
+	      debian/tmp/var/Campcaster/stationLogo.png \
+	      debian/tmp/var/Campcaster/testAudio.ogg \
+			debian/campcaster-studio/usr/share/campcaster/www/
+	mkdir -p debian/campcaster-studio/usr/bin/
+	ln -s /usr/lib/campcaster/bin/campcaster-studio.sh debian/campcaster-studio/usr/bin/campcaster-studio
+	# move -studio's share to -data
+	mkdir -p debian/campcaster-data/usr/share/
+	mv debian/campcaster-station/usr/share/campcaster debian/campcaster-data/usr/share/	
+	rmdir  debian/campcaster-station/usr/share/
+
+override_dh_fixperms:
+	dh_fixperms
+	#
+	chmod +x debian/campcaster-data/usr/share/campcaster/www/storageServer/var/install/campcaster-user.php
+	chmod -x debian/campcaster-data/usr/share/campcaster/www/storageServer/var/cron/Crontab.php \
+		 debian/campcaster-data/usr/share/campcaster/www/storageServer/var/cron/CronJob.php \
+		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/templates/popup/PLAYLIST.downloadExportedFile.tpl \
+		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/Smarty/libs/plugins/outputfilter.localizer.php \
+		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/templates/playlist/import.tpl \
+		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/Smarty/libs/Smarty.class.php \
+		 debian/campcaster-data/usr/share/campcaster/www/storageServer/var/Backup.php \
+		 debian/campcaster-data/usr/share/campcaster/www/storageServer/var/cron/Cron.php \
+		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/templates/popup/PLAYLIST.export.tpl \
+		 debian/campcaster-data/usr/share/campcaster/www/htmlUI/var/Smarty/libs/plugins/postfilter.template_marker.php
+
+override_dh_shlibdeps:
+	LD_LIBRARY_PATH=debian/campcaster-libs/usr/lib/campcaster/ dh_shlibdeps
+
+override_dh_makeshlibs:
+	dh_makeshlibs -n
+
+override_dh_installinit:
+	dh_installinit --params "defaults 92"
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@ -0,0 +1,2 @@
+version=3
+http://sf.net/campcaster/campcaster-([0-9].+)\.tar\.bz2