diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 209 | ||||
| -rw-r--r-- | debian/control | 25 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rw-r--r-- | debian/cron.daily | 103 | ||||
| -rw-r--r-- | debian/default | 17 | ||||
| -rw-r--r-- | debian/docs | 3 | ||||
| -rwxr-xr-x | debian/rules | 17 |
7 files changed, 32 insertions, 348 deletions
diff --git a/debian/changelog b/debian/changelog index 907eb05..053e68a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,208 +1,5 @@ -live-package (0.99.26-1) unstable; urgency=low +live-helper (1.0~a1-1) unstable; urgency=low - * New upstream release. + * Initial release, replacing live-package. - -- Daniel Baumann <daniel@debian.org> Fri, 9 Mar 2007 12:27:00 +0100 - -live-package (0.99.25-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Fri, 9 Mar 2007 01:49:00 +0100 - -live-package (0.99.24-1) unstable; urgency=low - - * New upstream release: - - adds LIVE_INCLUDE_CHROOT to the manual exported variables as reported by - Mathieu Geli <mathieu.geli@gmail.com> (Closes: #412325). - - -- Daniel Baumann <daniel@debian.org> Sun, 3 Mar 2007 12:25:00 +0100 - -live-package (0.99.23-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Wed, 21 Feb 2007 22:08:00 +0100 - -live-package (0.99.22-1) unstable; urgency=low - - * New upstream release: - - updates manpage (Closes: #411008). - - -- Daniel Baumann <daniel@debian.org> Fri, 16 Feb 2007 20:38:00 +0100 - -live-package (0.99.21-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 12 Feb 2007 15:06:00 +0100 - -live-package (0.99.20-1) unstable; urgency=low - - * New upstream release: - - Fixed manual pruning in minimal flavour as suggested by - Bas Wijnen <wijnen@debian.org> (Closes: #410040). - - -- Daniel Baumann <daniel@debian.org> Thu, 1 Feb 2007 17:35:00 +0100 - -live-package (0.99.19-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Wed, 31 Jan 2007 12:38:00 +0100 - -live-package (0.99.18-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Thu, 25 Jan 2007 08:29:00 +0100 - -live-package (0.99.17-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Wed, 24 Jan 2007 22:18:00 +0100 - -live-package (0.99.16-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Thu, 18 Jan 2007 16:25:00 +0100 - -live-package (0.99.15-1) unstable; urgency=low - - * New upstream release: - - switched default distribution back to unstable, as unstable is usable - again from the kernel point of view (Closes: #400457). - - added file to the minimal package list (Closes: #400485). - - -- Daniel Baumann <daniel@debian.org> Tue, 16 Jan 2007 21:24:00 +0100 - -live-package (0.99.14-3) unstable; urgency=high - - * Adding workaround for new xorg packages by including xserver-xorg-input-all - and xserver-xorg-video-all in all X11 package lists. See #405639 for more - information. - * Adding xdebconfigurator to all X11 package lists. - - -- Daniel Baumann <daniel@debian.org> Fri, 5 Jan 2007 22:34:00 +0100 - -live-package (0.99.14-2) unstable; urgency=high - - * Adding workaround for initrd backup files (Closes: #404314). - - -- Daniel Baumann <daniel@debian.org> Thu, 4 Jan 2007 20:52:00 +0100 - -live-package (0.99.14-1) unstable; urgency=medium - - * New upstream release: - - fixed typo for policy-rc.d hack (Closes: #396813), thanks to - Markus Bauer <bauer-markus@web.de>. - - corrected manpage section (Closes: #396083), thanks to - Sune Vuorela <reportbug@pusling.com>. - - fixes script sourcing to exclude files in .svn (Closes: #396861), - thanks to Markus Bauer <bauer-markus@web.de>. - - -- Daniel Baumann <daniel@debian.org> Mon, 6 Nov 2006 00:00:00 +0200 - -live-package (0.99.13-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 30 Oct 2006 00:00:00 +0200 - -live-package (0.99.12-1) unstable; urgency=medium - - * New upstream release. - - Reverted mangling of LIVE_DISTRIBUTION for sources.list generation - (Closes: #394226). - - -- Daniel Baumann <daniel@debian.org> Mon, 23 Oct 2006 00:00:00 +0200 - -live-package (0.99.11-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 16 Oct 2006 00:00:00 +0200 - -live-package (0.99.10-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 9 Oct 2006 00:00:00 +0200 - -live-package (0.99.9-1) unstable; urgency=medium - - * New upstream release: - - adds support for custom repositories (Closes: #387068). - - using proxy for chroot creating too (Closes: #390378). - - -- Daniel Baumann <daniel@debian.org> Mon, 2 Oct 2006 00:00:00 +0200 - -live-package (0.99.8-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 25 Sep 2006 00:00:00 +0200 - -live-package (0.99.7-1) unstable; urgency=medium - - * New upstream release: - - removes the now outdated handling of testing specific kernels - (Closes: #387562). - - added fix from Bas Wijnen <wijnen@debian.org> for space handling in - arguments (Closes: #388204). - - fixes package list handling similar to the fix suggested by Alex Owen - <r.alex.owen@gmail.com> (Closes: #388060). - - -- Daniel Baumann <daniel@debian.org> Mon, 18 Sep 2006 00:00:00 +0200 - -live-package (0.99.6-1) unstable; urgency=medium - - * New upstream release: - - fixing netboot. - - -- Daniel Baumann <daniel@debian.org> Mon, 11 Sep 2006 00:00:00 +0200 - -live-package (0.99.5-1) unstable; urgency=low - - * New upstream release. - * Set maintainer to the project list. - - -- Daniel Baumann <daniel@debian.org> Mon, 4 Sep 2006 00:00:00 +0200 - -live-package (0.99.4-1) unstable; urgency=low - - * New upstream release: - - Added patch from Alex Owen <r.a.owen@qmul.ac.uk> to update pxelinux.cfg - for NFS root in casper (Closes: #380512). - - Temporarily hacks xorg configuration file to remove BusID and set - default driver to vesa (Closes: #382391). - - -- Daniel Baumann <daniel@debian.org> Mon, 28 Aug 2006 00:00:00 +0200 - -live-package (0.99.3-1) unstable; urgency=low - - * New upstream release: - - fixed configuration file handling (Closes: #384598). - * Update long descriptiong (Closes: #382473). - - -- Daniel Baumann <daniel@debian.org> Mon, 21 Aug 2006 00:00:00 +0200 - -live-package (0.99.2-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 31 Jul 2006 00:00:00 +0200 - -live-package (0.99.1-1) unstable; urgency=low - - * New upstream release. - - -- Daniel Baumann <daniel@debian.org> Mon, 24 Jul 2006 00:00:00 +0200 - -live-package (0.99-1) unstable; urgency=low - - * Initial release. - - -- Daniel Baumann <daniel@debian.org> Mon, 17 Jul 2006 00:00:00 +0200 + -- Daniel Baumann <daniel@debian.org> Mon, 12 Mar 2007 00:00:00 +0100 diff --git a/debian/control b/debian/control index 181f4f8..3a4f192 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: live-package +Source: live-helper Section: misc Priority: optional Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org> @@ -6,16 +6,21 @@ Uploaders: Daniel Baumann <daniel@debian.org>, Marco Amadori <marco.amadori@gmai Build-Depends: debhelper (>= 5) Standards-Version: 3.7.2 -Package: live-package +Package: live-helper Architecture: all -Depends: cdebootstrap, genext2fs, genisoimage | mkisofs, squashfs-tools -Recommends: aespipe +Depends: cdebootstrap | debootstrap, genext2fs, genisoimage | mkisofs, squashfs-tools +Conflicts: live-package +Replaces: live-package +Suggests: aesloop Provides: make-live -Description: utility to build Debian Live systems - make-live is a utility to build Debian Live systems. It takes a Debian mirror - as an input and outputs a live system image (ISO image for CDs and DVDs, - tarballs for netboot, or images for USB sticks). make-live is still in the - early stage of development, but has basic functionality and can be run - successfully. +Description: Debian Live helper programs + Live-helper is a collection of programs that can be used to build Debian Live + system images. The philosophy behind live-helper is to provide a collection of + small, simple, and easily understood tools that can be used in your own program + to automate building of a Live system. + . + A typical program that uses live-helper will call several live-helper commands + in sequence. Live-helper commands are all named with a "lh_" prefix. Examples + of such a program that uses live-helper is make-live (included here). . Homepage: <http://debian-live.alioth.debian.org/> diff --git a/debian/copyright b/debian/copyright index a5b3f42..7e2baf5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,9 @@ This package was debianized by Daniel Baumann <daniel@debian.org> on -Mon, 17 Jul 2006 00:00:00 +0200. +Mon, 12 Mar 2007 00:00:00 +0100. It was downloaded from <http://debian-live.alioth.debian.org/>. -Upstream: Debian Live Project <debian-live-devel@lists.alioth.debian.org> +Upstream Author: Debian Live <debian-live-devel@lists.alioth.debian.org> License: @@ -27,7 +27,7 @@ License: On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL file. -License (contrib/syslinux-splash/*, templates/isolinux/splash.rle): +License (contrib/syslinux-splash/*, templates/syslinux/splash.rle): The derivated splash for Debian Live was done by Daniel Baumann <daniel@debian.org> from the original of Mark Riedesel. Daniels own diff --git a/debian/cron.daily b/debian/cron.daily deleted file mode 100644 index db65e90..0000000 --- a/debian/cron.daily +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -# Check for make-live executable -if [ ! -x /usr/sbin/make-live ] -then - exit 0 -fi - -# Check for make-live default -if [ -r /etc/default/make-live ] -then - . /etc/default/make-live -else - echo "E: /etc/default/make-live missing." - exit 1 -fi - -# Check for autobuild -if [ "${AUTOBUILD}" = "false" ] -then - exit 0 -fi - -# Check for build directory -if [ ! -d "${AUTOBUILD_DIRECTORY}" ] -then - mkdir -p "${AUTOBUILD_DIRECTORY}" -else - # FIXME: maybe we should just remove the left overs. - echo "E: ${AUTOBUILD_DIRECTORY} needs cleanup." - exit 1 -fi - -# Process image autobuilding -cd "${AUTOBUILD_DIRECTORY}" - -for AUTOBUILD_DISTRIBUTION in ${AUTOBUILD_DISTRIBUTIONS} -do - for AUTOBUILD_PACKAGE_LIST in ${AUTOBUILD_PACKAGE_LISTS} - do - if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-log.txt ] - then - # Generating images - mkdir debian-live - make-live -t iso -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_PACKAGE_LIST} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 - fi - - if [ -f debian-live/binary.iso ] && [ -f debian-live/source.iso ] - then - # Moving logs - mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log - mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-log.txt - mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-iso-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE} - mv debian-live/binary.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}.iso - - mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source - mv debian-live/source.iso "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/source/debian-live-${AUTOBUILD_DISTRIBUTION}-source-${AUTOBUILD_PACKAGE_LIST}.iso - fi - - # Cleanup - rm -rf debian-live - - if [ ! -f "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-log.txt ] - then - # Generating images - mkdir debian-live - make-live -t usb -d ${AUTOBUILD_DISTRIBUTION} -p ${AUTOBUILD_PACKAGE_LIST} -m ${LIVE_MIRROR} ${AUTOBUILD_OPTIONS} > debian-live/log.txt 2>&1 - fi - - if [ -f debian-live/binary.img ] - then - # Moving logs - mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log - mv debian-live/log.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-log.txt - mv debian-live/packages.txt "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/log/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}_${AUTOBUILD_DATE}-usb-packages.txt - - # Moving images - mkdir -p "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE} - mv debian-live/binary.img "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/${AUTOBUILD_ARCHITECTURE}/debian-live-${AUTOBUILD_DISTRIBUTION}-${AUTOBUILD_ARCHITECTURE}-${AUTOBUILD_PACKAGE_LIST}.img - fi - - # Cleanup - rm -rf debian-live - done -done - -# Cleanup -umount -f "${AUTOBUILD_DIRECTORY}"/debian-live/chroot/proc > /dev/null 2>&1 -rm -rf "${AUTOBUILD_DIRECTORY}" - -# MD5SUMS -for DIRECTORY in "${AUTOBUILD_SERVER}"/daily-builds/${AUTOBUILD_DATE}/* -do - cd "${DIRECTORY}" - md5sum * > MD5SUMS -done - -# Current symlink -rm -f "${AUTOBUILD_SERVER}"/daily-builds/current -ln -s ${AUTOBUILD_DATE} "${AUTOBUILD_SERVER}"/daily-builds/current diff --git a/debian/default b/debian/default deleted file mode 100644 index 43d17d7..0000000 --- a/debian/default +++ /dev/null @@ -1,17 +0,0 @@ -# Defaults for make-live cron.daily - -AUTOBUILD="false" - -AUTOBUILD_DISTRIBUTIONS="etch sid" -AUTOBUILD_PACKAGE_LISTS="standard kde-desktop gnome-desktop xfce-desktop" -AUTOBUILD_OPTIONS="--with-source" - -AUTOBUILD_DIRECTORY="/srv/tmp/make-live" -AUTOBUILD_SERVER="/srv/debian-live" -AUTOBUILD_ARCHITECTURE="`dpkg --print-architecture`" -AUTOBUILD_DATE="`date +%Y%m%d`" - -LIVE_MIRROR="http://ftp.debian.org/debian/" - -# Source /etc/make-live.conf -# . /etc/make-live.conf diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 2b0402c..0000000 --- a/debian/docs +++ /dev/null @@ -1,3 +0,0 @@ -AUTHORS -HISTORY -TODO diff --git a/debian/rules b/debian/rules index ef72dea..1d9b92c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -upstream: # Needs svn - cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-package || exit 0 +upstream: + # Needs: subversion + cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-helper || exit 0 find . -type d -name .svn -exec rm -rf {} \; || exit 0 build: @@ -22,18 +23,22 @@ install: build dh_installdirs # Installing package - $(MAKE) install DESTDIR=$(CURDIR)/debian/live-package - install -D debian/default debian/live-package/etc/default/make-live + $(MAKE) install DESTDIR=$(CURDIR)/debian/live-helper + + # Removing double files + rm -f debian/live-helper/usr/share/doc/live-helper/COPYING + rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog + mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.old \ + debian/live-helper/usr/share/doc/live-helper/changelog.old binary-arch: build install binary-indep: build install dh_testdir dh_testroot - dh_installchangelogs ChangeLog + dh_installchangelogs doc/ChangeLog dh_installdocs dh_install - dh_installcron dh_compress dh_fixperms dh_installdeb |