X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=6fdc0f97d8e31f7aaeeb882911e35328d1bec695;hb=b6a918ee42b1ae85ccd5fc3cd19b78dc8a42492a;hp=d1d44a5ea42199087010b4e5d35e51bf0164a4a3;hpb=6c1a2cfab139bb4a61e7bcf5f4cafe3b7498f64e;p=live-boot-grml.git

diff --git a/debian/rules b/debian/rules
index d1d44a5..6fdc0f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -9,16 +9,22 @@ 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
+ifeq ($(BUILD_SYSTEM),Ubuntu)
 	cp debian/control.ubuntu debian/control
+else
+	cp debian/control.debian debian/control
 endif
 
 	# Building package
 	$(MAKE) -C casper-md5check
+	set -e; \
+	for x in bin/* scripts/casper scripts/casper-bottom/* \
+	         ubiquity-hooks/*; do \
+		sh -n $$x; \
+	done
 
 	touch build-stamp
 
@@ -48,11 +54,11 @@ install: build
 	# Install md5check
 	install -m 0755 casper-md5check/casper-md5check debian/casper/usr/lib/casper
 
-	# Fixing permission
+	# Fixing permissions
 	chmod 0755 debian/casper/usr/share/initramfs-tools/scripts/casper
-
-	# Installing lintian override
-	install -D -m 0644 debian/lintian debian/casper/usr/share/lintian/overrides/casper
+	
+	# Temporary Fixing permissions (until upstream merge)
+	chmod 0755 debian/casper/usr/share/initramfs-tools/scripts/casper-bottom/02etc_casper_conf
 
 	# Install casper.conf
 	install -m 0644 casper.conf debian/casper/etc/casper.conf
@@ -77,12 +83,9 @@ binary-arch: build install
 
 	dh_testdir
 	dh_testroot
-ifeq ($(BUILD_SYSTEM),Debian)
-	dh_installchangelogs -a debian/changelog.upstream
-else
 	dh_installchangelogs -a
-endif
 	dh_installdocs -a
+	dh_installman -a
 	dh_installexamples -a
 	dh_installinit -a -r --no-start -- start 89 0 6 .
 	dh_link -a