Adding casper 1.66+debian-1.

10 files changed, 114 insertions, 16 deletions

diff --git a/debian/dirs b/debian/casper.dirs
index bb225f1..bb225f1 100644
--- a/debian/dirs
+++ b/debian/casper.dirs
diff --git a/debian/init.d b/debian/casper.init
index 424c024..e0522e0 100644
--- a/debian/init.d
+++ b/debian/casper.init
@@ -33,7 +33,7 @@ done
 eject -p -m /live_media >/dev/null 2>&1
 
 # XXX - i18n
-echo -n "Please remove the disc (if any), close the tray (if any) and press ENTER: "
+echo -n "Please remove the disc and close the tray (if any) then press ENTER: "
 if [ -x /sbin/usplash_write ]; then
     /sbin/usplash_write "TIMEOUT 0"
     /sbin/usplash_write "TEXT Please remove the disc, close the tray (if any)"
diff --git a/debian/install b/debian/casper.install
index 2514756..2514756 100644
--- a/debian/install
+++ b/debian/casper.install
diff --git a/debian/postinst b/debian/casper.postinst
index d7bc14d..d7bc14d 100644
--- a/debian/postinst
+++ b/debian/casper.postinst
diff --git a/debian/changelog b/debian/changelog
index 9da2e97..33da0a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+casper (1.66+debian-1) unstable; urgency=low
+
+  * Added "magic" to make it work seamlessy also on ubuntu systems.
+  * Default user password now "live".
+
+ -- Marco Amadori <marco.amadori@gmail.com>  Fri,  1 Sep 2006 17:18:07 +0200
+
 casper (1.65+debian-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/changelog.upstream b/debian/changelog.upstream
index 8e20a26..6eb6873 100644
--- a/debian/changelog.upstream
+++ b/debian/changelog.upstream
@@ -1,3 +1,13 @@
+casper (1.66) edgy; urgency=low
+
+  * Fix use of db_get in ubiquity accessibility hook.
+  * Use sudo instead of su to get to the live session user from the
+    initramfs or to the newly-installed user from ubiquity. su's argument
+    handling has changed so that the previous code no longer worked, and su
+    was never all that good for arguments containing spaces anyway.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon,  4 Sep 2006 15:46:55 +0100
+
 casper (1.65) edgy; urgency=low
 
   * Update to call udevsettle/udevtrigger instead of udevplug
diff --git a/debian/control b/debian/control
index 4445546..cd9eee6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: casper
 Section: misc
-Priority: optional
+Priority: extra
 Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
 Uploaders: Marco Amadori <marco.amadori@gmail.com>, Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 4), lsb-release
 Standards-Version: 3.7.2
 
 Package: casper
diff --git a/debian/control.debian b/debian/control.debian
new file mode 100644
index 0000000..cd9eee6
--- /dev/null
+++ b/debian/control.debian
@@ -0,0 +1,17 @@
+Source: casper
+Section: misc
+Priority: extra
+Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
+Uploaders: Marco Amadori <marco.amadori@gmail.com>, Daniel Baumann <daniel@debian.org>
+Build-Depends: debhelper (>= 4), lsb-release
+Standards-Version: 3.7.2
+
+Package: casper
+Architecture: any
+Depends: initramfs-tools (>= 0.40), user-setup
+Conflicts: usplash (<< 0.1-30)
+Recommends: live-package
+Suggests: dmsetup
+Description: Debian Live initramfs generator
+ Casper provides an initramfs generator suited for booting a Debian Live systems
+ from read only media. Useful to build live CDs.
diff --git a/debian/control.ubuntu b/debian/control.ubuntu
new file mode 100644
index 0000000..a8ab8de
--- /dev/null
+++ b/debian/control.ubuntu
@@ -0,0 +1,25 @@
+Source: casper
+Section: misc
+Priority: optional
+Maintainer: Tollef Fog Heen <tfheen@ubuntu.com>
+Build-Depends: debhelper (>> 4.2.0), lsb-release
+Standards-Version: 3.6.1
+
+Package: casper
+Architecture: any
+Section: misc
+Priority: extra
+Depends: initramfs-tools (>= 0.40ubuntu11), dmsetup, user-setup, sudo
+Conflicts: usplash (<< 0.1-30)
+Description: Run a "live" preinstalled system from read-only media
+
+Package: ubiquity-casper
+Architecture: all
+Depends: laptop-detect, sudo
+Conflicts: espresso-casper
+Replaces: espresso-casper
+Enhances: ubiquity
+Description: Configuration hooks for live installer
+ This package provides hook scripts for the Ubiquity live installer that
+ repeat some pieces of configuration done by the live system boot process in
+ the system installed by Ubiquity.
diff --git a/debian/rules b/debian/rules
index bd01663..d1d44a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,25 +3,42 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Looking in which build system we are
+BUILD_SYSTEM := $(shell lsb_release --short --id)
+
 build: build-stamp
 build-stamp:
 	dh_testdir
-	
+	# Setting BUILD_SYSTEM in the binary package
+	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' casper.conf
+ifeq ($(BUILD_SYSTEM),Debian)
+	cp debian/control.debian debian/control
+else
+	cp debian/control.ubuntu debian/control
+endif
+
 	# Building package
 	$(MAKE) -C casper-md5check
 
 	touch build-stamp
 
 clean:
+
 	dh_testdir
 	rm -f build-stamp
 
 	# Cleaning package
 	-$(MAKE) -C casper-md5check clean
 
+	# Putting back default files
+	cp -f debian/control.debian debian/control
+	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'Debian'"/g' casper.conf
+	
 	dh_clean
 
+
 install: build
+
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -37,23 +54,45 @@ install: build
 	# Installing lintian override
 	install -D -m 0644 debian/lintian debian/casper/usr/share/lintian/overrides/casper
 
+	# Install casper.conf
+	install -m 0644 casper.conf debian/casper/etc/casper.conf
+
 binary-indep: build install
+ifneq ($(BUILD_SYSTEM),Debian)
+	# Conditionally build Ubiquity 
+	dh_testdir
+	dh_testroot
+	dh_installexamples -i
+	dh_installdocs -i
+	dh_installchangelogs -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+endif
 
 binary-arch: build install
+
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs debian/changelog.upstream
-	dh_installdocs
-	dh_installexamples
-	dh_installinit -r --no-start -- start 89 0 6 .
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+ifeq ($(BUILD_SYSTEM),Debian)
+	dh_installchangelogs -a debian/changelog.upstream
+else
+	dh_installchangelogs -a
+endif
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installinit -a -r --no-start -- start 89 0 6 .
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install