[Debian-live-changes] r2487 - in dists/trunk/live-webhelper: . debian docs manpages scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-14 18:53:24 +0000 (Sat, 14 Jul 2007)
New Revision: 2487

Modified:
   dists/trunk/live-webhelper/Makefile
   dists/trunk/live-webhelper/debian/changelog
   dists/trunk/live-webhelper/docs/ChangeLog
   dists/trunk/live-webhelper/manpages/live-webhelper.en.7
   dists/trunk/live-webhelper/scripts/cgi
   dists/trunk/live-webhelper/scripts/common
Log:


Modified: dists/trunk/live-webhelper/Makefile
===================================================================
--- dists/trunk/live-webhelper/Makefile	2007-07-14 18:03:50 UTC (rev 2486)
+++ dists/trunk/live-webhelper/Makefile	2007-07-14 18:53:24 UTC (rev 2487)
@@ -74,13 +74,11 @@
 	done
 
 update:
-	sed -i -e 's/VERSION="1.0~a14"/VERSION="1.0~a15"/' scripts/common
-
-	set -e; for MANPAGE in manpages/*.en.*; \
+	set -e; for FILE in manpages/*.en.* scripts/common; \
 	do \
-		sed -i	-e 's/2007\\-06\\-11/2007\\-06\\-18/' \
-			-e 's/1.0~a14/1.0~a15/' \
-		$$MANPAGE; \
+		sed -i	-e 's/2007\\-07\\-09/2007\\-07\\-16/' \
+			-e 's/1.0~a18/1.0~a19/' \
+		$$FILE; \
 	done
 
 clean:

Modified: dists/trunk/live-webhelper/debian/changelog
===================================================================
--- dists/trunk/live-webhelper/debian/changelog	2007-07-14 18:03:50 UTC (rev 2486)
+++ dists/trunk/live-webhelper/debian/changelog	2007-07-14 18:53:24 UTC (rev 2487)
@@ -1,8 +1,8 @@
-live-webhelper (1.0~a15-1) UNRELEASED; urgency=low
+live-webhelper (1.0~a18-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
- -- Daniel Baumann <daniel at debian.org>  Mon, 18 Jun 2007 00:00:00 +0200
+ -- Daniel Baumann <daniel at debian.org>  Mon,  9 Jul 2007 00:00:00 +0200
 
 live-webhelper (1.0~a14-1) unstable; urgency=low
 

Modified: dists/trunk/live-webhelper/docs/ChangeLog
===================================================================
--- dists/trunk/live-webhelper/docs/ChangeLog	2007-07-14 18:03:50 UTC (rev 2486)
+++ dists/trunk/live-webhelper/docs/ChangeLog	2007-07-14 18:53:24 UTC (rev 2487)
@@ -1,3 +1,8 @@
+2007-07-14  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/cgi:
+	  - Quick fix in EMAIL.
+
 2007-06-04  Daniel Baumann  <daniel at debian.org>
 
 	* templates/form.html:
@@ -2,3 +7,3 @@
 	  - Set default source image to 'generic'.
-	* Uploaded. 1.0~a14-1.
+	* Uploaded 1.0~a14-1.
 

Modified: dists/trunk/live-webhelper/manpages/live-webhelper.en.7
===================================================================
--- dists/trunk/live-webhelper/manpages/live-webhelper.en.7	2007-07-14 18:03:50 UTC (rev 2486)
+++ dists/trunk/live-webhelper/manpages/live-webhelper.en.7	2007-07-14 18:53:24 UTC (rev 2487)
@@ -1,4 +1,4 @@
-.TH LIVE\-WEBHELPER 7 "2007\-06\-18" "1.0~a15" "live\-webhelper"
+.TH LIVE\-WEBHELPER 7 "2007\-07\-09" "1.0~a18" "live\-webhelper"
 
 .SH NAME
 live\-webhelper \- Debian Live helper programs (web frontend)

Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-07-14 18:03:50 UTC (rev 2486)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-07-14 18:53:24 UTC (rev 2487)
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # live-webhelper - web interface to live-helper
 # Copyright (C) 2007 Richard Nelson <rjent at rjent.pair.com>
@@ -65,7 +65,7 @@
 	# echo ${QUERY_STRING}
 
 	# Email
-	EMAIL=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,_,-]+' | cut -f 2 -d '=' | head -n1)
+	EMAIL=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])email=[0-9,a-z,A-Z,.,_,-,@]+' | cut -f 2 -d '=' | head -n1)
 
 	# Standard options
 	BINARY_IMAGES=$(echo ${QUERY_STRING} | grep -oE '(^|[?&])binary_images=[a-z]+' | cut -f 2 -d '=' | head -n1)

Modified: dists/trunk/live-webhelper/scripts/common
===================================================================
--- dists/trunk/live-webhelper/scripts/common	2007-07-14 18:03:50 UTC (rev 2486)
+++ dists/trunk/live-webhelper/scripts/common	2007-07-14 18:53:24 UTC (rev 2487)
@@ -1 +1 @@
-VERSION="1.0~a15"
+VERSION="1.0~a18"