From 44a580e8f9ed3c33bad9c81b4839e4495ad364b0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 19 Jan 2010 22:12:36 +0100 Subject: Minimizing rules file. --- debian/bug/live-helper.presubj | 11 ----------- debian/bug/live-helper.script | 16 --------------- debian/control | 2 +- debian/live-helper.bug-presubj | 11 +++++++++++ debian/live-helper.bug-script | 16 +++++++++++++++ debian/rules | 45 +++++++----------------------------------- 6 files changed, 35 insertions(+), 66 deletions(-) delete mode 100644 debian/bug/live-helper.presubj delete mode 100644 debian/bug/live-helper.script create mode 100644 debian/live-helper.bug-presubj create mode 100644 debian/live-helper.bug-script diff --git a/debian/bug/live-helper.presubj b/debian/bug/live-helper.presubj deleted file mode 100644 index e59a93a..0000000 --- a/debian/bug/live-helper.presubj +++ /dev/null @@ -1,11 +0,0 @@ -Before submitting a bug report against live-helper, please make sure -that you have read your guidlines for Debian Live bug reports: - - http://live.debian.net/manual/html/bugs.html - -By providing the required information as outlined in the guidlines makes -sure that we can optimally reproduce and fix bugs, not doing so wastes a -lot of time for both the maintainers and the submitters. - -Pleae bear in mind that bugs that lack the required information will -likely be ignored when the submitter doesn't follow up to questions. diff --git a/debian/bug/live-helper.script b/debian/bug/live-helper.script deleted file mode 100644 index 54ef8dd..0000000 --- a/debian/bug/live-helper.script +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -DEFAULT_SETTINGS="/etc/default/live-helper" - -# Checking depends -dpkg -l debootstrap cdebootstrap - -# Checking suggests -dpkg -l dosfstools genisoimage memtest86+ memtest86 mtools parted squashfs-tools genext2fs mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader - -if [ -e "${DEFAULT_SETTINGS}" ]; then - echo "Contents of ${DEFAULT_SETTINGS}:" - cat "${DEFAULT_SETTINGS}" -else - echo "${DEFAULT_SETTINGS} does not exist." -fi diff --git a/debian/control b/debian/control index 2871a69..e97d8c1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: optional Maintainer: Debian Live Uploaders: Daniel Baumann -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: gettext Standards-Version: 3.8.3 Homepage: http://debian-live.alioth.debian.org/ diff --git a/debian/live-helper.bug-presubj b/debian/live-helper.bug-presubj new file mode 100644 index 0000000..e59a93a --- /dev/null +++ b/debian/live-helper.bug-presubj @@ -0,0 +1,11 @@ +Before submitting a bug report against live-helper, please make sure +that you have read your guidlines for Debian Live bug reports: + + http://live.debian.net/manual/html/bugs.html + +By providing the required information as outlined in the guidlines makes +sure that we can optimally reproduce and fix bugs, not doing so wastes a +lot of time for both the maintainers and the submitters. + +Pleae bear in mind that bugs that lack the required information will +likely be ignored when the submitter doesn't follow up to questions. diff --git a/debian/live-helper.bug-script b/debian/live-helper.bug-script new file mode 100644 index 0000000..54ef8dd --- /dev/null +++ b/debian/live-helper.bug-script @@ -0,0 +1,16 @@ +#!/bin/sh + +DEFAULT_SETTINGS="/etc/default/live-helper" + +# Checking depends +dpkg -l debootstrap cdebootstrap + +# Checking suggests +dpkg -l dosfstools genisoimage memtest86+ memtest86 mtools parted squashfs-tools genext2fs mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader + +if [ -e "${DEFAULT_SETTINGS}" ]; then + echo "Contents of ${DEFAULT_SETTINGS}:" + cat "${DEFAULT_SETTINGS}" +else + echo "${DEFAULT_SETTINGS} does not exist." +fi diff --git a/debian/rules b/debian/rules index 4b7ce63..c9fd0ff 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,17 @@ #!/usr/bin/make -f -clean: - dh_testdir - dh_testroot +%: + dh ${@} +override_dh_auto_clean: $(MAKE) -C po clean - dh_clean - -build: - $(MAKE) test +override_dh_auto_build: $(MAKE) -C po update-po -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Installing package - $(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper +override_dh_auto_install: + dh_auto_install - # Installing message catalogs $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/live-helper install -D -m 0644 debian/live-helper.default debian/live-helper/etc/default/live-helper_autobuild @@ -35,27 +25,6 @@ install: build rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package - # Installing bug control - install -D -m 0644 debian/bug/live-helper.presubj debian/live-helper/usr/share/bug/live-helper/presubj - install -D -m 0755 debian/bug/live-helper.script debian/live-helper/usr/share/bug/live-helper/script - -binary: binary-indep - -binary-arch: -binary-indep: install - dh_testdir - dh_testroot +override_dh_installchangelogs: dh_installchangelogs docs/ChangeLog - dh_installdocs - dh_installlogrotate - dh_installcron - dh_installman - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: clean build install binary binary-arch binary-indep -- cgit v1.0