[Debian-live-changes] r1278 - in dists/trunk/live-initramfs: debian doc

[Daniel Baumann]

Author: daniel
Date: 2007-05-05 22:29:51 +0000 (Sat, 05 May 2007)
New Revision: 1278

Modified:
   dists/trunk/live-initramfs/debian/rules
   dists/trunk/live-initramfs/doc/ChangeLog
Log:


Modified: dists/trunk/live-initramfs/debian/rules
===================================================================
--- dists/trunk/live-initramfs/debian/rules	2007-05-05 22:08:14 UTC (rev 1277)
+++ dists/trunk/live-initramfs/debian/rules	2007-05-05 22:29:51 UTC (rev 1278)
@@ -3,70 +3,79 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+# Looking in which build system we are
+BUILD_SYSTEM := $(shell lsb_release --short --id)
+
 upstream:
 	# Needs: subversion
 	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-initramfs || true
 	find . -type d -name .svn | xargs rm -rf
 
-# Looking in which build system we are
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
-build:
+build: build-stamp
+build-stamp:
 	dh_testdir
 
+	# Checking scripts
+	for SCRIPT in bin/* scripts/casper scripts/casper-bottom/*; \
+	do \
+		sh -n $$SCRIPT || exit 1; \
+	done
+
 	# Setting BUILD_SYSTEM in the binary package
 	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' casper.conf
 
-	$(MAKE) -C casper-md5check
-	set -e; \
-	for x in bin/* scripts/casper scripts/casper-bottom/* \
-	         ubiquity-hooks/*; do \
-		sh -n $$x; \
-	done
+	# Building package
+	CFLAGS="$(CFLAGS)" $(MAKE) -C casper-md5check
 
+	touch build-stamp
+
 clean:
 	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Cleaning package
 	$(MAKE) -C casper-md5check clean
 
 	dh_clean
 
 install: build
 	dh_testdir
+	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install
-	install -m755 casper-md5check/casper-md5check debian/casper/usr/lib/casper
-	install -m644 casper.conf debian/casper/etc/casper.conf
 
+	# Installing package
+	install -m 0755 casper-md5check/casper-md5check debian/casper/usr/lib/casper
+	install -m 0644 casper.conf debian/casper/etc/casper.conf
+
 binary-indep: build install
-	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
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -a
-	dh_installman -a
-	dh_installexamples -a
-	dh_installinit -a -r --no-start -- start 89 0 6 .
-	dh_installchangelogs -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installchangelogs doc/ChangeLog
+	dh_installdocs doc/ChangeLog.casper
+	dh_installexamples
+	dh_install
+	dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 .
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-05 22:08:14 UTC (rev 1277)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-05 22:29:51 UTC (rev 1278)
@@ -13,11 +13,9 @@
 	  - Renamed, removed package prefix from filename.
 	* debian/examples, links:
 	  - Added.
-	* debian/compat, control, copyright, dirs, manpages:
+	* debian/compat, control, copyright, dirs, manpages, rules:
 	  - Updated.
 	* debian/postinst:
 	  - Running 'update-initramfs' for all kernel versions instead of
 	    latest only.
-	* debian/rules:
-	  - Added upstream target.
 	* Uploaded 1.87.1-1.