diff --git a/debian/changelog b/debian/changelog index 860d3321..03474fd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.97) UNRELEASED; urgency=low + + * Upgrade to debhelper v7. + + -- Colin Watson Tue, 15 Sep 2009 13:16:34 +0100 + livecd-rootfs (0.96) karmic; urgency=low [ Loïc Minier ] diff --git a/debian/compat b/debian/compat index b8626c4c..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index c26842ab..3e3f0728 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ Source: livecd-rootfs Section: devel Priority: optional -Build-Depends: debhelper (>=4) +Build-Depends: debhelper (>= 7) Maintainer: Adam Conrad Standards-Version: 3.6.1.0 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Package: livecd-rootfs Architecture: all -Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release +Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release Suggests: partimage Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 960aa1a5..00000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -usr/share/doc/livecd-rootfs/examples diff --git a/debian/examples b/debian/examples new file mode 100644 index 00000000..202be4c9 --- /dev/null +++ b/debian/examples @@ -0,0 +1 @@ +BuildLiveCD diff --git a/debian/install b/debian/install new file mode 100644 index 00000000..f960f4ef --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +livecd.sh e2fs-zero.py usr/sbin diff --git a/debian/rules b/debian/rules index 598abfb1..78c7615d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,78 +1,3 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# This file is public domain software, originally written by Joey Hess. -# With liberal additions based on debian-installer's rules. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -#ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -#VERS=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) -#CLOOPIMG=livecd-root-${VERS}-${ARCH}.cloopimg - -build: build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - #$(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - #-$(MAKE) clean - #-$(MAKE) distclean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/ - #$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install - install -m755 livecd.sh e2fs-zero.py debian/livecd-rootfs/usr/sbin - install -m644 BuildLiveCD debian/livecd-rootfs/usr/share/doc/livecd-rootfs/examples - -# Build architecture-dependent files here. -binary-arch: build install -# We have nothing to do by default. - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installcatalogs -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_undocumented - dh_installman - dh_link - dh_compress - dh_fixperms -# dh_perl -# dh_python - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +#! /usr/bin/make -f +%: + dh $@