From 79b6f784534bb01b30c86992094c88f6ce757880 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 24 Jul 2010 16:15:27 +0200 Subject: Renaming live-helper package to its generic name live-build, now all Debian Live are consistently and properly named. --- debian/control | 30 +++++++++++++++++++++--------- debian/live-build.bug-presubj | 11 +++++++++++ debian/live-build.bug-script | 16 ++++++++++++++++ debian/live-helper.bug-presubj | 11 ----------- debian/live-helper.bug-script | 16 ---------------- debian/rules | 10 +++++----- 6 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 debian/live-build.bug-presubj create mode 100644 debian/live-build.bug-script delete mode 100644 debian/live-helper.bug-presubj delete mode 100644 debian/live-helper.bug-script diff --git a/debian/control b/debian/control index 5d3586bf2..7c67a1ffa 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: live-helper +Source: live-build Section: misc Priority: optional Maintainer: Debian Live Project @@ -6,22 +6,34 @@ Uploaders: Daniel Baumann Build-Depends: debhelper (>= 7.0.50~) Build-Depends-Indep: gettext Standards-Version: 3.9.0 -Homepage: http://live.debian.net/devel/live-helper/ -Vcs-Browser: http://live.debian.net/gitweb/?p=live-helper.git -Vcs-Git: git://live.debian.net/git/live-helper.git +Homepage: http://live.debian.net/devel/live-build/ +Vcs-Browser: http://live.debian.net/gitweb/?p=live-build.git +Vcs-Git: git://live.debian.net/git/live-build.git -Package: live-helper +Package: live-build Architecture: all Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static +Conflicts: live-helper (<< 2.0~a20) +Replaces: live-helper Recommends: cpio, gettext-base, gnu-fdisk Suggests: dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted, squashfs-tools | genext2fs | mtd-tools, sudo | fakeroot, syslinux | grub, uuid-runtime, win32-loader -Description: Debian Live build scripts - live-helper is a set of scripts to build Debian Live system images. +Description: Debian Live - System Build Scripts + live-build is a set of scripts to build Debian Live system images. . - The idea behind live-helper is a framework that uses a configuration directory + The idea behind live-build is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image. . - An introduction to live-helper can be found in the live-helper(7) manpage. + An introduction to live-build can be found in the live-build(7) manpage. + +Package: live-helper +Architecture: all +Depends: ${misc:Depends}, live-helper +Description: Debian Live - System Build Scripts (transitional package) + Package to ease upgrading from older live-helper packages to the new + live-build package. + . + This package can be purged at anytime once the live-build package has been + installed. diff --git a/debian/live-build.bug-presubj b/debian/live-build.bug-presubj new file mode 100644 index 000000000..6f64e109d --- /dev/null +++ b/debian/live-build.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. + +Please keep in mind that bugs that lack the required information will +likely be ignored. diff --git a/debian/live-build.bug-script b/debian/live-build.bug-script new file mode 100644 index 000000000..54ef8ddca --- /dev/null +++ b/debian/live-build.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/live-helper.bug-presubj b/debian/live-helper.bug-presubj deleted file mode 100644 index 6f64e109d..000000000 --- a/debian/live-helper.bug-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. - -Please keep in mind that bugs that lack the required information will -likely be ignored. diff --git a/debian/live-helper.bug-script b/debian/live-helper.bug-script deleted file mode 100644 index 54ef8ddca..000000000 --- a/debian/live-helper.bug-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/rules b/debian/rules index 18ba87895..7e5ae5aaf 100755 --- a/debian/rules +++ b/debian/rules @@ -12,13 +12,13 @@ override_dh_auto_build: override_dh_auto_install: dh_auto_install - $(MAKE) -C po DESTDIR=$(CURDIR)/debian/live-helper install + $(MAKE) -C po DESTDIR=$(CURDIR)/debian/live-build install - mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package - mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-webhelper debian/live-helper/usr/share/doc/live-helper/changelog.live-webhelper + mv debian/live-build/usr/share/doc/live-build/ChangeLog.live-package debian/live-build/usr/share/doc/live-build/changelog.live-package + mv debian/live-build/usr/share/doc/live-build/ChangeLog.live-webhelper debian/live-build/usr/share/doc/live-build/changelog.live-webhelper - rm -f debian/live-helper/usr/share/doc/live-helper/COPYING - rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog + rm -f debian/live-build/usr/share/doc/live-build/COPYING + rm -f debian/live-build/usr/share/doc/live-build/ChangeLog override_dh_installchangelogs: dh_installchangelogs docs/ChangeLog -- cgit v1.2.3