diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in index 3d9d77095..292837266 100644 --- a/livesupport/etc/Makefile.in +++ b/livesupport/etc/Makefile.in @@ -311,9 +311,12 @@ ${TMP_DIR}/modules_setup.stamp: cd ${GETID3_DIR} && ./configure --prefix=${prefix} cd ${HTML_UI_DIR} && ./configure --prefix=${prefix} \ --with-apache-group=${APACHE_GROUP} \ - --with-www-docroot=${WWW_DOCROOT} \ - --with-configure-apache=${CONFIGURE_APACHE} - cd ${STORAGE_ADMIN_DIR} && ./configure --prefix=${prefix} + --with-www-docroot=${WWW_DOCROOT} \ + --with-configure-apache=${CONFIGURE_APACHE} \ + --with-storage-server=${prefix}/var/LiveSupport/storageServer + cd ${STORAGE_ADMIN_DIR} && ./configure --prefix=${prefix} \ + --with-storage-server=${prefix}/var/LiveSupport/storageServer \ + --with-phppart-dir=${prefix}/var/LiveSupport/storageAdmin cd ${STORAGE_SERVER_DIR} && \ ./configure --prefix=${prefix} \ --with-apache-group=${APACHE_GROUP} \ diff --git a/livesupport/etc/debian/changelog b/livesupport/etc/debian/changelog index 463e9a8cf..a9f2aafa9 100644 --- a/livesupport/etc/debian/changelog +++ b/livesupport/etc/debian/changelog @@ -1,3 +1,10 @@ +livesupport (1.0.2-1) unstable; urgency=low + + * 1.0.2 bugfix release + + -- Akos Maroy Sun, 13 Nov 2005 15:10:09 +0200 + + livesupport (1.0.1-1) unstable; urgency=low * 1.0.1 bugfix release diff --git a/livesupport/etc/debian/control b/livesupport/etc/debian/control index 4cd599364..1e46ea9db 100644 --- a/livesupport/etc/debian/control +++ b/livesupport/etc/debian/control @@ -52,7 +52,7 @@ Depends: ${shlibs:Depends}, libmad0, libogg0, libvorbis0a, - libboost-date-time1.32.0 (>= 1.31), + libboost-date-time1.32.0 (>= 1.31) | libboost-date-time1.33.0 (>= 1.31) Description: A radio program automation and support tool. This package contains the libraries used by LiveSupport. diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules index 72a04b002..e6b3424ad 100755 --- a/livesupport/etc/debian/rules +++ b/livesupport/etc/debian/rules @@ -30,14 +30,14 @@ endif config.status: configure dh_testdir CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/opt/livesupport \ - --with-www-docroot=/var/www \ - --with-apache-group=www-data \ - --with-station-audio-out=/dev/dsp \ - --with-studio-audio-out=/dev/dsp1 \ - --with-studio-audio-cue=/dev/dsp2 \ - --with-hostname=localhost + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/opt/livesupport \ + --with-www-docroot=/var/www \ + --with-apache-group=www-data \ + --with-station-audio-out=/dev/dsp \ + --with-studio-audio-out=/dev/dsp1 \ + --with-studio-audio-cue=/dev/dsp2 \ + --with-hostname=localhost build: build-arch @@ -64,7 +64,7 @@ install-arch: dh_clean -k -s dh_installdirs -s - # this will install everything into /opt/livesupport + # this will install everything into /opt/livesupport/usr $(MAKE) install # move the installation to debian/livesupport @@ -110,10 +110,13 @@ install-arch: $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/index.php \ $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/htmlUI \ $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageServer \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageAdmin \ $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport - mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \ - $(CURDIR)/debian/livesupport/opt/livesupport/usr/var \ - $(CURDIR)/debian/livesupport-station/opt/livesupport/usr + mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/backup.sh \ + $(CURDIR)/debian/livesupport/opt/livesupport/bin/dumpDbSchema.sh \ + $(CURDIR)/debian/livesupport/opt/livesupport/bin/import.sh \ + $(CURDIR)/debian/livesupport/opt/livesupport/bin/restore.sh \ + $(CURDIR)/debian/livesupport-station/opt/livesupport/bin mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/cache \ $(CURDIR)/debian/livesupport-station/opt/livesupport/var mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/apache \