diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 300 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/copyright | 35 | ||||
| -rw-r--r-- | debian/live-build.bug-presubj | 4 | ||||
| -rw-r--r-- | debian/live-build.bug-script | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | debian/source/options | 1 |
7 files changed, 46 insertions, 306 deletions
diff --git a/debian/changelog b/debian/changelog index b011c4a22..fb10afccb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,300 +1,8 @@ -live-build (3.0.5-1) unstable; urgency=low +live-build (4.0~a1-1) experimental; urgency=low - * Skipping loadlin inclusion on netboot images. + * Dropping support for squeeze and squeeze-based distributions. - -- Daniel Baumann <daniel@debian.org> Tue, 30 Apr 2013 10:26:09 +0200 - -live-build (3.0.4-1) unstable; urgency=low - - * Correcting variable typo when setting distribution specific defaults - of the backports mirror for the binary image. - - -- Daniel Baumann <daniel@debian.org> Mon, 29 Apr 2013 12:47:24 +0200 - -live-build (3.0.3-1) unstable; urgency=low - - * Updating debian-backports mirrors for wheezy. - * Enabling release updates (formerly known as volatile) for wheezy. - - -- Daniel Baumann <daniel@debian.org> Thu, 25 Apr 2013 17:39:31 +0200 - -live-build (3.0.2-1) unstable; urgency=low - - [ Daniel Baumann ] - * Allowing to use parted its automatic offset handling at the beginning - of a disk, rather than to harcode it to first block (Closes: #647607). - * Aborting with error if hdd label has a whitespace (Closes: #648861). - * Updating d-i suite symlink for wheezy release. - * Correcting typo in grub2 config template. - * Synchronise grub and grub2 splashes with internal live-build splash - for syslinux bootloaders. - * Removing non-existent --apt-indices none references. - * Also showing distribution in lb config initial messages. - * Making messages about reading system conffiles in lb config more - accurate. - * Harmonize handling of pre-existing gnupg dotfiles in chroot when - handling fake signing keys for local repository. - * Making some more debian source-selections conditional on certain image - options. - * Adding source_hooks for hooks on source images like already supported - on binary images. - - [ Richard Nelson ] - * Add sanity check on config type to build for l-b-cgi. - * Add _CGI_CONFIG_APPEND varialbe for appending options to lb config - call on l-b-cgi frontend. - * Change _CGI_CONFIG_APPEND to front of the lb config call on l-b-cgi - frontend. - * Removing quotes around _CGI_CONFIG_APPEND to handle multiple - parameters correctly on l-b-cgi frontend. - * Adding binary image type to config call on l-b-cgi frontend. - * Add log information of git:://url for l-b-cgi frontend. - * Append to log file on errors and not truncate the file on l-b-cgi - frontend. - - [ Daniel Baumann ] - * Correcting spelling typos, thanks to Adam D. Barratt <adam@adam- - barratt.org.uk>. - - [ Raphaël Hertzog ] - * Fixing win32-loader.ini by including the GTK related entries. - - [ Daniel Baumann ] - * Correcting typo directory when dereferencing syslinux symlinks when - building chrooted, thanks to Luigi Capriotti <l.capriotti@xbmc.org>. - * Using dpkg-divert in chroot_upstart script to handle upgrades of - upstart during the build (Closes: #702537). - * Using dpkg-divert for other diversions too to handle upgrades of the - diverted stuff during build. - * Adding generic live-build handle in chroot_dpkg for other live - packages to act upon. - * Updating fallback help message in live-build pseudo-command. - * Correcting grammer error in live-build description. - * Adding set -e in example auto scripts. - - [ Richard Nelson ] - * Converting l-b-cgi frontend to process forms with post. - - [ Daniel Baumann ] - * Cleaning up installer file locations for progress-linux. - * Stripping out comments in package lists. - * Updating derivatives archive-key signature validiation to look by - default at both debian and debian-maintainers keyrings. - * Updating bootstrap mirror for progress-linux. - - -- Daniel Baumann <daniel@debian.org> Thu, 25 Apr 2013 12:41:54 +0200 - -live-build (3.0.1-1) unstable; urgency=low - - * Removing superfluous menu default directive in installer syslinux - menues. - * Updating wheezy release number. - * Updating squeeze point-release number. - * Dropping German manpage translations stubs for the release. - - -- Daniel Baumann <daniel@debian.org> Thu, 14 Feb 2013 19:31:04 +0100 - -live-build (3.0.0-1) unstable; urgency=low - - * Updating wheezy pre-release number for b4. - * Dropping dpkg compression level. - * Correcting spelling typos in changelog to make lintian happy. - * Escaping quotes to workaround a false-positive of checkbashisms in - binary_debian-installer. - * Correcting install path in loadlins install.bat for the gtk d-i - flavour. - * Switching default binary filesystem for hdd images to fat32 to be more - robust on todays flash devices. - * Correcting vshift in syslinux themes to correct display bug with - overlong lines, thanks to Thanatermesis <thanatermesis@gmail.com>. - * Adding bootrap_archive-keys to establish secure trust-chain on top of - debian-keyring for derivatives. - * Updating syslinux configurations and handling for syslinux 5. - * Adding hook to remove systemd machine-id. - * Renumbering hooks. - * Correcting wrong debian-installer syslinux menu files. - * Including HDT in advanced options menu within syslinux menu. - * Updating binary_debian-installer for newer append replacement - variables used in syslinux configs. - * Dropping theme package support, themes are either in the config tree - or the embedded one from live-build is used. - * Correctly remove binary contents and packages file in clean script. - * Adding key-shortcut for advanced options in syslinux menu. - * Removing default menu marker for install entry in syslinux menu. - * Converting splash.svg not just splash.svg.in files as syslinux - bootsplashes. - * Removing dropped syslinux-theme config option from lb_config manpage. - - -- Daniel Baumann <daniel@debian.org> Sat, 09 Feb 2013 00:18:07 +0100 - -live-build (3.0~b6-1) unstable; urgency=low - - [ Daniel Baumann ] - * Updating manpage year handling for 2013. - * Updating wheezy beta-release number. - * Using cat instead of echo to workaround incompatible and conflicting - uses in escaping of \t in dash and bash, and less importantly to - workaround a false-positive in checkbashisms. - * Updating footer link to 'legal information' in cgi html template. - * Cleaning up binary_loadlin. - * Updating for twitter-bootstrap usage on live.debia.net in the cgi html - templates. - * Updating footer in cgi html template. - * Correcting spelling typo in html footer of the cgi, thanks to Jean- - Christophe Saint-Marc <jchristophe.stmarc@free.fr>. - * Removing reference to removed --package-lists option in lb_config - manpage (Closes: #698260). - - [ Richard Nelson ] - * Correcting typo on functions/default.sh, thanks to jhcha54008 - <jhcha54008@free.fr> (Closes: #698397). - - [ Daniel Baumann ] - * Updating samhain workaround in chroot_dpkg to work if live-build is - being used with sudo or fakeroot (Closes: #698423). - * Correcting apt-key cleanup of local dummy signing keys when using - local packages, thanks to jhcha54008 <jhcha54008@free.fr>. - * Falling back to use genisoimage when building squeeze iso-hybrid - images. - * Applying slightly modified patch from Raphaël Hertzog - <hertzog@debian.org> to fix automatic firmware inclusion when using - debian-installer with live-installer and having firmware packages - installed in the live system already. - - -- Daniel Baumann <daniel@debian.org> Sun, 20 Jan 2013 10:17:42 +0100 - -live-build (3.0~b5-1) unstable; urgency=low - - * Omitting binary manifest creation when chroot filesystem is set to - none. - * Omitting memtest in binary if chroot filesystem is set to none. - * Removing redundant check for linux-images in binary_linux-image. - * Correcting glitch with plain chroot filesystems in binary_chroot. - * Switching order of kernel flavours in defaults, the last added one in - the list becomes the default symlink target in the rootfs by apt. - * Using .cfg suffix for consistency with debian-installer on preseed - files in config/preseed. - * Adding sample gitignore file in examples. - * Setting debian-installer to false in all modes by default. - * Updating year in all copyright notices. - * Updating removal of backup files in stripped example hook to also work - with spaces in filenames. - * Don't fail when adding symlinks for firmware in binary/firmware for - debian-installer and the symlink already exists (Closes: #696688). - * Defaulting to obsolete md5 for checksums instead of sha256 on debian, - as debians cdrom-check in d-i only supports md5. - * Defaulting to obsolete filenames for checksums on debian, as debians - cdrom-check in d-i only supports legacy filenames (Closes: #697082). - * Correcting spelling typo in help text within the binary checksums - file. - * Also ignoring legacy checksum filenames when creating checksum files. - * Creating autorun.inf in binary_win32-loader. - * Dropping stable and unstable dist symlinks for d-i in dists for - wheezy. - * Creating install.bat for loadlin. - * Only including gtk d-i in win32-loader config if available on the - target image. - * Updating win32-loader.ini for wheezy. - * Correcting legacy filename for checksum files. - * Removing all checksum files in lb clean. - * Adding support for sha512 checksums. - * Dropping pre-squeeze handling for win32-loader files. - - -- Daniel Baumann <daniel@debian.org> Wed, 02 Jan 2013 11:45:30 +0100 - -live-build (3.0~b4-1) unstable; urgency=low - - [ Daniel Baumann ] - * Moving removal of actual backup files for apt sources into correct - hook. - * Renumbering hooks. - * Disabling accidentally enabled removal of apt sources hook by default. - - [ Richard Nelson ] - * Unify _DEBUG variable values to be true or false for l-b-cgi. - - [ Daniel Baumann ] - * Removing grub package from binary_debian-installer for wheezy. - - -- Daniel Baumann <daniel@debian.org> Sun, 23 Dec 2012 10:50:38 +0100 - -live-build (3.0~b3-1) unstable; urgency=low - - * Removing old code in chroot_hacks for tasks which are not used - anymore. - * Moving kexec-tools default preseeding into its own hook script. - * Marking loop-aes-utils related hack as squeeze only. - * Moving removal of backup and temporary files to their own hook script. - * Adding default hook to truncate log files. - * Also removing man chache in remove-temporary-files hook. - * Adding default hook to use newest nvidia version. - * Using consistent naming for default hooks. - * Adding default hook to use mesa glx renderer. - * Merging remove-linux-image-backups into remove-backup-files hook. - * Renumbering hooks. - * Correcting config tree version check for older versions. - * Correcting config tree version check for the current version. - * Removing some dead default handling code for global includes which do - not exist anymore. - * Removing kubuntu mode, it's not different anymore to standard ubuntu - mode. - - -- Daniel Baumann <daniel@debian.org> Mon, 17 Dec 2012 20:29:56 +0100 - -live-build (3.0~b2-1) unstable; urgency=low - - [ Daniel Baumann ] - * Updating wheezy release number. - * Removing not really useful symlinks example hook. - * Adding default hook to remove mdadm configuration. - * Correcting spelling typo in bug script. - * Adding support for live-images configs and arbitrary configuration - directories in lb_config --config option. - * Avoid re-populating an already populated configuration tree when using - lb config --config. - * Updating removal of adjtime in a split out hook for wheezy. - - [ Richard Nelson ] - * Update l-b-cgi frontend to support new git config structure. - - [ Daniel Baumann ] - * Switching from genisoimage to xorriso. - - -- Daniel Baumann <daniel@debian.org> Sun, 16 Dec 2012 21:57:11 +0100 - -live-build (3.0~b1-1) unstable; urgency=low - - [ Raphaël Hertzog ] - * Adding initial menu entries for debian-installer. - - [ Daniel Baumann ] - * Removing local/bin by default in lb_clean too. - * Skipping creation of soon to be replaced config/templates directory. - - -- Daniel Baumann <daniel@debian.org> Mon, 10 Dec 2012 20:38:58 +0100 - -live-build (3.0~a69-1) unstable; urgency=low - - * Also avoiding to use xz compression for squashfs for kubuntu. - * Removing some leftovers from stripped and minimal package lists. - * Updating powerpc kernel list on ubuntu. - * Adding dropped empty-line separator in defaults. - * Adding dropped empty-line separator in binary_debian-installer. - * Updating wording about regenerating config trees. - * Correcting test for no config tree version number to match all other - cases, not just lower-than-1. - * Harmonizing apt configuration handling in chroot_archives. - * Adding support for local apt conf.d snippets in archive definitions - (Closes: #685791). - * Ensuring that functions are either sources locally or globally, but - not both. - * Adding proper header to build.sh include. - * Dropping ubuntu guards on firmware selection code, we're not enabling - firmware inclusion in ubuntu mode anyway. - * Adding back legacy filtering for firmware packages on squeeze when - contrib or non-free is not enabled. - - -- Daniel Baumann <daniel@debian.org> Thu, 06 Dec 2012 21:09:00 +0100 + -- Daniel Baumann <daniel@debian.org> Fri, 30 Nov 2012 15:22:32 +0100 live-build (3.0~a68-1) unstable; urgency=low @@ -4504,7 +4212,7 @@ live-helper (1.0~a38-1) unstable; urgency=medium * Don't fail if resolv.conf is a symlink, thanks to David Madore <david.madore@ens.fr> (Closes: #457595). * Fixing changelog. - * Consistently using the pipe as separator in sed commands now. + * Consistently using the pipe as seperator in sed commands now. * Checking for /sys/class rather than /sys/kernel, avoids problem when running under OpenVZ which doesn't have sys/kernel, thanks to Takeshi Yaegashi <yaegashi@debian.org>. diff --git a/debian/control b/debian/control index bfa5d8916..3b957e9a6 100644 --- a/debian/control +++ b/debian/control @@ -16,11 +16,11 @@ Recommends: live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio, gnu-fdisk Suggests: - dosfstools, debian-keyring, xorriso, git, gpgv, loadlin, memtest86+ | memtest86, - mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub, + dosfstools, genisoimage, git, loadlin, memtest86+ | memtest86, mtools, parted, + squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub, uuid-runtime, win32-loader Description: Live System Build Scripts - live-build contains the scripts to build a live system from a configuration + live-build contains the scripts that build a live system from a configuration directory. Package: live-build-cgi @@ -28,7 +28,7 @@ Architecture: all Depends: ${misc:Depends}, live-build (= ${source:Version}) Recommends: apache2 | httpd, cron Description: Live System Build Scripts (CGI frontend) - live-build contains the scripts to build a live system from a configuration + live-build contains the scripts that build a live system from a configuration directory. . This package contains the CGI frontend (experimental!). diff --git a/debian/copyright b/debian/copyright index c96991b50..0c57bbebc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,11 +4,15 @@ Upstream-Contact: Debian Live Project <debian-live@lists.debian.org> Source: http://live.debian.net/archive/packages/live-build/ Files: * -Copyright: 2006-2013 Daniel Baumann <daniel@debian.org> +Copyright: 2006-2012 Daniel Baumann <daniel@debian.org> License: GPL-3+ +Files: contrib/grub-splash/lenny +Copyright: n/a +License: other + Files: share/bootloaders/*/splash.svg.in -Copyright: 2006-2013 Daniel Baumann <daniel@debian.org> +Copyright: 2006-2012 Daniel Baumann <daniel@debian.org> License: other License: GPL-3+ @@ -30,6 +34,33 @@ License: GPL-3+ License: other The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based + on the original work of Mark Riedesel. + . + The contribution of Daniel is hereby placed in the public domain (no rights + reserved). + . + --------------- + http://dugnet.com/klown/pics/klowner_debboot.png + by Mark Riedesel, license same as open use logo + . + To create klowner.rle: + . + 1. convert klowner.png klowner.bmp + 2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle + (FBFDFA is the color used for the inside of the "n" in Debian.) + --------------- + . + Debian Open Use Logo License + . + Copyright (c) 1999 Software in the Public Interest + This logo or a modified version may be used by anyone to refer to the Debian + project, but does not indicate endorsement by the project. + . + Note: we would appreciate that you make the image a link to + http://www.debian.org/ if you use it on a web page. + +License: other + The splash for Debian Live was made by Daniel Baumann <daniel@debian.org> based on the Debian Open Use Logo. . The contribution of Daniel is hereby placed in the public domain (no rights diff --git a/debian/live-build.bug-presubj b/debian/live-build.bug-presubj index e804d8195..3c9a0b00e 100644 --- a/debian/live-build.bug-presubj +++ b/debian/live-build.bug-presubj @@ -1,9 +1,9 @@ Before submitting a bug report against live-build, please make sure -that you have read your guidelines for Debian Live bug reports: +that you have read your guidlines for Debian Live bug reports: http://live.debian.net/manual/ -By providing the required information as outlined in the guidelines makes +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. diff --git a/debian/live-build.bug-script b/debian/live-build.bug-script index a9f5a6f7f..79276241f 100644 --- a/debian/live-build.bug-script +++ b/debian/live-build.bug-script @@ -6,7 +6,7 @@ DEFAULT_SETTINGS="/etc/live/build.conf" dpkg -l debootstrap cdebootstrap # Checking suggests -dpkg -l dosfstools xorriso loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader +dpkg -l dosfstools genisoimage loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader if [ -e "${DEFAULT_SETTINGS}" ]; then echo "Contents of ${DEFAULT_SETTINGS}:" diff --git a/debian/rules b/debian/rules index c76471ff5..a5248b03a 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ override_dh_auto_install: mv debian/live-build/usr/share/live/build/cgi debian/live-build-cgi/usr/share/live/build override_dh_builddeb: - dh_builddeb -- -Zxz + dh_builddeb -- -Zxz -z9 override_dh_installchangelogs: dh_installchangelogs docs/ChangeLog diff --git a/debian/source/options b/debian/source/options index 5bd47b78d..22a4de9f6 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1,2 @@ compression = xz +compression-level = 9 |