[Debian-live-changes] r1749 - in dists/trunk/live-webhelper: . debian

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-25 20:07:01 +0000 (Fri, 25 May 2007)
New Revision: 1749

Removed:
   dists/trunk/live-webhelper/debian/postrm
Modified:
   dists/trunk/live-webhelper/Makefile
   dists/trunk/live-webhelper/cron
   dists/trunk/live-webhelper/debian/control
   dists/trunk/live-webhelper/debian/postinst
   dists/trunk/live-webhelper/live-webhelper
Log:


Modified: dists/trunk/live-webhelper/Makefile
===================================================================
--- dists/trunk/live-webhelper/Makefile	2007-05-25 19:59:22 UTC (rev 1748)
+++ dists/trunk/live-webhelper/Makefile	2007-05-25 20:07:01 UTC (rev 1749)
@@ -26,8 +26,8 @@
 
 	# Installing logfile
 	install -d 0755 $(DESTDIR)/var/log
-	touch $(DESTDIR)/var/log/live-webhelper
-	chown www-data:www-data $(DESTDIR)/var/log/live-webhelper
+	touch $(DESTDIR)/var/log/live
+	chown www-data:www-data $(DESTDIR)/var/log/live
 
 uninstall:
 	# Uninstalling executables
@@ -42,7 +42,7 @@
 	rm -rf $(DESTDIR)/usr/share/doc/live-webhelper
 
 	# Uninstalling logfile
-	rm -f $(DESTDIR)/var/log/live-webhelper*
+	rm -f $(DESTDIR)/var/log/live*
 
 update:
 	sed -i -e 's/VERSION="0.2.7"/VERSION="0.2.x"/' default

Modified: dists/trunk/live-webhelper/cron
===================================================================
--- dists/trunk/live-webhelper/cron	2007-05-25 19:59:22 UTC (rev 1748)
+++ dists/trunk/live-webhelper/cron	2007-05-25 20:07:01 UTC (rev 1749)
@@ -41,7 +41,7 @@
 then
 	rm -rf "${DESTDIR}"/`date -d yesterday +%Y%m%d.%H`*
 
-	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: removing build `date -d yesterday +%Y%m%d.%H`" >> /var/log/live-webhelper
+	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: removing build `date -d yesterday +%Y%m%d.%H`" >> /var/log/live
 fi
 
 # Ok from here spin through the live-webhelper files we have waiting to build
@@ -52,7 +52,7 @@
 		# Reading build file
 		. "${FILE}"
 
-		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin build ${BUILD}" >> /var/log/live-webhelper
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: begin build ${BUILD}" >> /var/log/live
 
 		# Assembling options
 		if [ -n "${BINARY_IMAGE}" ]
@@ -185,6 +185,6 @@
 		# Removing build directory
 		rm -rf "${TEMPDIR}"/"${BUILD}"
 
-		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: end build ${BUILD}" >> /var/log/live-webhelper
+		echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: end build ${BUILD}" >> /var/log/live
 	done
 fi

Modified: dists/trunk/live-webhelper/debian/control
===================================================================
--- dists/trunk/live-webhelper/debian/control	2007-05-25 19:59:22 UTC (rev 1748)
+++ dists/trunk/live-webhelper/debian/control	2007-05-25 20:07:01 UTC (rev 1749)
@@ -10,7 +10,7 @@
 
 Package: live-webhelper
 Architecture: all
-Depends: live-helper
+Depends: live-helper, apache2 | httpd
 Description: Debian Live helper programs (web frontend)
  Live-helper is a collection of programs that can be used to build Debian Live
  system images. The philosophy behind live-helper is to provide a collection of

Modified: dists/trunk/live-webhelper/debian/postinst
===================================================================
--- dists/trunk/live-webhelper/debian/postinst	2007-05-25 19:59:22 UTC (rev 1748)
+++ dists/trunk/live-webhelper/debian/postinst	2007-05-25 20:07:01 UTC (rev 1749)
@@ -4,7 +4,7 @@
 
 case "$1" in
 	configure)
-		chown www-data:www-data /var/log/live-webhelper
+		chown www-data:www-data /var/log/live
 		;;
 
 	abort-upgrade|abort-remove|abort-deconfigure)

Deleted: dists/trunk/live-webhelper/debian/postrm
===================================================================
--- dists/trunk/live-webhelper/debian/postrm	2007-05-25 19:59:22 UTC (rev 1748)
+++ dists/trunk/live-webhelper/debian/postrm	2007-05-25 20:07:01 UTC (rev 1749)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-	purge)
-		rm -f /var/log/live-webhelper*
-		;;
-
-	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-		;;
-
-	*)
-		echo "postrm called with unknown argument \`$1'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0

Modified: dists/trunk/live-webhelper/live-webhelper
===================================================================
--- dists/trunk/live-webhelper/live-webhelper	2007-05-25 19:59:22 UTC (rev 1748)
+++ dists/trunk/live-webhelper/live-webhelper	2007-05-25 20:07:01 UTC (rev 1749)
@@ -100,7 +100,7 @@
 ISO_VOLUME="${ISO_VOLUME}"
 EOF
 
-	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: recieved build ${BUILD}" >> /var/log/live-webhelper
+	echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-webhelper: recieved build ${BUILD}" >> /var/log/live
 fi
 
 sed -e "s/VERSION/${VERSION}/" "${TEMPLATES}"/footer.html