From 58fd5c470c24386d10130de3da7f71c97dba6309 Mon Sep 17 00:00:00 2001 From: maroy Date: Tue, 2 Aug 2005 08:45:57 +0000 Subject: [PATCH] updated debian package generation files --- livesupport/etc/debian/README.Debian | 3 +- livesupport/etc/debian/changelog | 7 ++++ livesupport/etc/debian/control | 2 - livesupport/etc/debian/copyright | 2 +- .../etc/debian/livesupport-station.conffiles | 5 ++- .../etc/debian/livesupport-station.init.d | 5 +++ .../etc/debian/livesupport-studio.desktop | 4 +- .../etc/debian/livesupport-studio.menu | 2 +- .../etc/debian/livesupport-studio.postinst | 3 +- livesupport/etc/debian/rules | 39 ++++++++----------- 10 files changed, 39 insertions(+), 33 deletions(-) diff --git a/livesupport/etc/debian/README.Debian b/livesupport/etc/debian/README.Debian index 63be9608b..a73d3a01c 100644 --- a/livesupport/etc/debian/README.Debian +++ b/livesupport/etc/debian/README.Debian @@ -3,4 +3,5 @@ livesupport for Debian First debian package of LiveSupport. - -- Akos Maroy , Tue, 19 Apr 2005 07:40:13 -0400 + -- Akos Maroy , Wed, 03 Aug 2005 08:17:25 -0400 + diff --git a/livesupport/etc/debian/changelog b/livesupport/etc/debian/changelog index 60ac55070..72408bcbf 100644 --- a/livesupport/etc/debian/changelog +++ b/livesupport/etc/debian/changelog @@ -1,3 +1,10 @@ +livesupport (1.0-1) unstable; urgency=low + + * final release + + -- Akos Maroy Wed, 03 Aug 2005 08:17:25 -0400 + + livesupport (1.0rc1-1) unstable; urgency=low * first release candidate diff --git a/livesupport/etc/debian/control b/livesupport/etc/debian/control index 3d64371bf..0c8e347e3 100644 --- a/livesupport/etc/debian/control +++ b/livesupport/etc/debian/control @@ -31,7 +31,6 @@ Build-Depends: debhelper (>= 4.0.0), libogg-dev, libvorbis-dev, libboost-dev (>= 1.31), libboost-date-time-dev (>= 1.31), - libgtk2.0-dev (>= 2.6.1) Standards-Version: 3.6.1 Package: livesupport-libs @@ -51,7 +50,6 @@ Depends: ${shlibs:Depends}, libogg0, libvorbis0a, libboost-date-time1.32.0 (>= 1.31), - libgtk2.0-0 (>= 2.6.1) Description: A radio program automation and support tool. This package contains the libraries used by LiveSupport. diff --git a/livesupport/etc/debian/copyright b/livesupport/etc/debian/copyright index 773c0e129..66a6be7c1 100644 --- a/livesupport/etc/debian/copyright +++ b/livesupport/etc/debian/copyright @@ -1,5 +1,5 @@ This package was debianized by Akos Maroy on -Tue, 19 Apr 2005 07:40:13 -0400. +Wed, 03 Aug 2005 08:17:25 -0400 It was downloaded from http://livesupport.campware.org/ diff --git a/livesupport/etc/debian/livesupport-station.conffiles b/livesupport/etc/debian/livesupport-station.conffiles index 6c2ce9a54..d80fae116 100644 --- a/livesupport/etc/debian/livesupport-station.conffiles +++ b/livesupport/etc/debian/livesupport-station.conffiles @@ -1,3 +1,4 @@ -/opt/livesupport/var/storageServer/var/conf.php -/opt/livesupport/var/archiveServer/var/conf.php +/opt/livesupport/var/LiveSupport/storageServer/var/conf.php +/opt/livesupport/var/LiveSupport/archiveServer/var/conf.php /opt/livesupport/etc/scheduler.xml +/etc/apache/conf.d/90_php_livesupport.conf diff --git a/livesupport/etc/debian/livesupport-station.init.d b/livesupport/etc/debian/livesupport-station.init.d index 726fc84cf..7a471fb7e 100644 --- a/livesupport/etc/debian/livesupport-station.init.d +++ b/livesupport/etc/debian/livesupport-station.init.d @@ -45,6 +45,11 @@ case "$1" in $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml start > /dev/null echo "$NAME." ;; + start) + echo -n "Killing $DESC: " + $DAEMON -c $LIVESUPPORT_ETC/scheduler.xml kill > /dev/null + echo "$NAME." + ;; *) N=/etc/init.d/$NAME echo "Usage: $N {start|stop|restart|force-reload|kill}" >&2 diff --git a/livesupport/etc/debian/livesupport-studio.desktop b/livesupport/etc/debian/livesupport-studio.desktop index 3b1ab82e4..057bc2bab 100644 --- a/livesupport/etc/debian/livesupport-studio.desktop +++ b/livesupport/etc/debian/livesupport-studio.desktop @@ -4,11 +4,11 @@ Encoding=UTF-8 Name=LiveSupport-Studio GenericName=LiveSupport Studio GUI Client Comment= -Icon=/opt/livesupport/var/livesupport.png +Icon=/opt/livesupport/var/LiveSupport/livesupport.png Type=Application Categories=Application;AudioVideo;Audio; -Exec=/opt/livesupport/bin/gLiveSupport.sh +Exec=/opt/livesupport/bin/LiveSupport/gLiveSupport.sh Terminal=false diff --git a/livesupport/etc/debian/livesupport-studio.menu b/livesupport/etc/debian/livesupport-studio.menu index ddd32623d..c923e3864 100644 --- a/livesupport/etc/debian/livesupport-studio.menu +++ b/livesupport/etc/debian/livesupport-studio.menu @@ -1,4 +1,4 @@ ?package(livesupport-studio):needs="X11" section="Apps/Sound" \ title="LiveSupport-Studio" command="/opt/livesupport/bin/gLiveSupport.sh" \ - icon="/opt/livesupport/var/livesupport.png" \ + icon="/opt/livesupport/var/LiveSupport/livesupport.png" \ diff --git a/livesupport/etc/debian/livesupport-studio.postinst b/livesupport/etc/debian/livesupport-studio.postinst index ba27878dc..4ce3a5550 100644 --- a/livesupport/etc/debian/livesupport-studio.postinst +++ b/livesupport/etc/debian/livesupport-studio.postinst @@ -23,8 +23,7 @@ apache_docroot=/var/www case "$1" in configure) - # do post-installation configuration - $installdir/bin/postInstallGLiveSupport.sh --directory $installdir + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules index d6290c255..e724c6d43 100755 --- a/livesupport/etc/debian/rules +++ b/livesupport/etc/debian/rules @@ -29,6 +29,7 @@ endif config.status: configure dh_testdir + rm -rf /opt/livesupport/* CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/opt/livesupport @@ -57,16 +58,12 @@ install-arch: dh_clean -k -s dh_installdirs -s - # this will install everything into debian/livesupport - $(MAKE) install prefix=$(CURDIR)/debian/livesupport/opt/livesupport + # this will install everything into /opt/livesupport + $(MAKE) install - # copy the template config files into their final places - # so as to please the conffiles file, and the debian packager - # that such a file really exist - cp -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml.template \ - $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml - cp -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml.template \ - $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml + # move the installation to debian/livesupport + mkdir -p $(CURDIR)/debian/livesupport/opt + mv /opt/livesupport $(CURDIR)/debian/livesupport/opt # now separate the libraries into debian/livesupport-libs mkdir -p $(CURDIR)/debian/livesupport-libs @@ -84,7 +81,7 @@ install-arch: mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/bin mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/etc mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/tmp - mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/var + mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/usr/lib mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \ @@ -93,12 +90,12 @@ install-arch: mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \ $(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \ $(CURDIR)/debian/livesupport-station/opt/livesupport/etc - mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/alib \ - $(CURDIR)/debian/livesupport/opt/livesupport/var/archiveServer \ - $(CURDIR)/debian/livesupport/opt/livesupport/var/getid3 \ - $(CURDIR)/debian/livesupport/opt/livesupport/var/htmlUI \ - $(CURDIR)/debian/livesupport/opt/livesupport/var/storageServer \ - $(CURDIR)/debian/livesupport-station/opt/livesupport/var + mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/alib \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/archiveServer \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/getid3 \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/htmlUI \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageServer \ + $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/lib/pear \ $(CURDIR)/debian/livesupport-station/opt/livesupport/usr/lib mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \ @@ -113,18 +110,16 @@ install-arch: mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/tmp - mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var + mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport.sh \ $(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallGLiveSupport.sh \ $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml* \ - $(CURDIR)/debian/livesupport/opt/livesupport/etc/gtk-2.0 \ - $(CURDIR)/debian/livesupport/opt/livesupport/etc/pango \ $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc - mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/widgets \ - $(CURDIR)/debian/livesupport/opt/livesupport/var/gLiveSupport*.res \ - $(CURDIR)/debian/livesupport/opt/livesupport/var/livesupport.png \ + mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/Widgets \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/gLiveSupport*.res \ + $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/livesupport.png \ $(CURDIR)/debian/livesupport-studio/opt/livesupport/var mkdir -p $(CURDIR)/debian/livesupport-studio/usr/share/applications cp -a $(CURDIR)/debian/livesupport-studio.desktop \