[Debian-live-changes] r2298 - in dists/trunk: live-helper/debian live-helper/functions live-helper/helpers live-initramfs/bin live-initramfs/debian live-magic/debian live-sysvinit/debian live-webhelper/debian live-webhelper/scripts

Sat Jun 30 11:20:45 UTC 2007

Author: daniel
Date: 2007-06-30 11:20:45 +0000 (Sat, 30 Jun 2007)
New Revision: 2298

Modified:
   dists/trunk/live-helper/debian/copyright
   dists/trunk/live-helper/functions/version.sh
   dists/trunk/live-helper/helpers/lh_binary_disk
   dists/trunk/live-helper/helpers/make-live
   dists/trunk/live-initramfs/bin/live-snapshot
   dists/trunk/live-initramfs/debian/copyright
   dists/trunk/live-magic/debian/copyright
   dists/trunk/live-sysvinit/debian/copyright
   dists/trunk/live-webhelper/debian/copyright
   dists/trunk/live-webhelper/scripts/cgi
Log:


Modified: dists/trunk/live-helper/debian/copyright
===================================================================

--- dists/trunk/live-helper/debian/copyright	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-helper/debian/copyright	2007-06-30 11:20:45 UTC (rev 2298)
@@ -28,7 +28,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 License (contrib/grub-splash/*, contrib/syslinux-splash/*,
 templates/syslinux/splash.rle, templates/grub/splash.xpm.gz):
@@ -61,4 +61,4 @@
 	http://www.debian.org/ if you use it on a web page.
 
 The Debian packaging is (C) 2006-2007, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: dists/trunk/live-helper/functions/version.sh
===================================================================
--- dists/trunk/live-helper/functions/version.sh	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-helper/functions/version.sh	2007-06-30 11:20:45 UTC (rev 2298)
@@ -31,7 +31,7 @@
 	echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 	echo
 	echo "On Debian systems, the complete text of the GNU General Public License"
-	echo "can be found in /usr/share/common-licenses/GPL file."
+	echo "can be found in /usr/share/common-licenses/GPL-2 file."
 	echo
 	echo "Homepage: <http://debian-live.alioth.debian.org/>"
 

Modified: dists/trunk/live-helper/helpers/lh_binary_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_disk	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-helper/helpers/lh_binary_disk	2007-06-30 11:20:45 UTC (rev 2298)
@@ -77,6 +77,7 @@
 
 	ubuntu)
 		echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		# Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
 		;;
 esac
 

Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-helper/helpers/make-live	2007-06-30 11:20:45 UTC (rev 2298)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
+# can be found in /usr/share/common-licenses/GPL-2 file.
 
 set -e
 

Modified: dists/trunk/live-initramfs/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-initramfs/bin/live-snapshot	2007-06-30 11:20:45 UTC (rev 2298)
@@ -23,7 +23,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
+# can be found in /usr/share/common-licenses/GPL-2 file.
 
 PROGRAM="`basename $0`"
 VERSION=0.0.1
@@ -120,7 +120,7 @@
 	echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 	echo
 	echo "On Debian systems, the complete text of the GNU General Public License"
-	echo "can be found in /usr/share/common-licenses/GPL file."
+	echo "can be found in /usr/share/common-licenses/GPL-2 file."
 	echo
 	echo "Homepage: <http://debian-live.alioth.debian.org/>"
 	exit 0

Modified: dists/trunk/live-initramfs/debian/copyright
===================================================================
--- dists/trunk/live-initramfs/debian/copyright	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-initramfs/debian/copyright	2007-06-30 11:20:45 UTC (rev 2298)
@@ -34,7 +34,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 License (live-md5check/md5.c, live-md5check/md5,h):
 
@@ -61,4 +61,4 @@
 	distribution.
 
 The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: dists/trunk/live-magic/debian/copyright
===================================================================
--- dists/trunk/live-magic/debian/copyright	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-magic/debian/copyright	2007-06-30 11:20:45 UTC (rev 2298)
@@ -28,7 +28,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 The Debian packaging is (C) 2007, Chris Lamb <chris at chris-lamb.co.uk> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: dists/trunk/live-sysvinit/debian/copyright
===================================================================
--- dists/trunk/live-sysvinit/debian/copyright	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-sysvinit/debian/copyright	2007-06-30 11:20:45 UTC (rev 2298)
@@ -34,31 +34,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
-License (live-md5check/md5.c, live-md5check/md5,h):
-
-	Copyright (C) 1999-2002 Aladdin Enterprises
-	All rights reserved.
-
-	This software is provided 'as-is', without any express or implied
-	warranty.  In no event will the authors be held liable for any damages
-	arising from the use of this software.
-
-	Permission is granted to anyone to use this software for any purpose,
-	including commercial applications, and to alter it and redistribute it
-	freely, subject to the following restrictions:
-
-	1. The origin of this software must not be misrepresented; you must not
-	claim that you wrote the original software. If you use this software in
-	a product, an acknowledgment in the product documentation would be
-	appreciated but is not required.
-
-	2. Altered source versions must be plainly marked as such, and must not
-	be misrepresented as being the original software.
-
-	3. This notice may not be removed or altered from any source
-	distribution.
-
 The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: dists/trunk/live-webhelper/debian/copyright
===================================================================
--- dists/trunk/live-webhelper/debian/copyright	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-webhelper/debian/copyright	2007-06-30 11:20:45 UTC (rev 2298)
@@ -29,7 +29,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 The Debian packaging is (C) 2007, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

Modified: dists/trunk/live-webhelper/scripts/cgi
===================================================================
--- dists/trunk/live-webhelper/scripts/cgi	2007-06-30 11:17:29 UTC (rev 2297)
+++ dists/trunk/live-webhelper/scripts/cgi	2007-06-30 11:20:45 UTC (rev 2298)
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
+# can be found in /usr/share/common-licenses/GPL-2 file.
 
 # Reading common
 . /usr/share/live-webhelper/common


