From 8522df7beb5b982afc64cc1e428620ca94d9d674 Mon Sep 17 00:00:00 2001 From: codehelp Date: Sat, 18 Jun 2011 15:23:08 +0000 Subject: [PATCH] tweak git-svn-id: http://emdebian.org/svn/current@8026 563faec7-e20c-0410-992a-a66f704d0ccd --- debian/changelog | 12 +++++++++--- debian/multistrap.install | 1 - examples/lenny.conf | 27 --------------------------- pod/multistrap | 4 ++-- 4 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 examples/lenny.conf diff --git a/debian/changelog b/debian/changelog index 0ae45ec..9d76018 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +multistrap (2.1.15) unstable; urgency=low + + * Clean up the retainsources behaviour (Closes: #627179) + * Implement some code for omitpreinst support. + * typo fix in manpage (Closes: #630314) + + -- Neil Williams Sat, 18 Jun 2011 16:17:13 +0100 + multistrap (2.1.14) unstable; urgency=low * Improve device-table incrementing @@ -5,10 +13,8 @@ multistrap (2.1.14) unstable; urgency=low allowed. dpkg does not currently support changes in /var/lib/dpkg/info * Read the dpkg status file to look for source packages even when no packages needed to be downloaded or unpacked. (Closes: #623563) - * Clean up the retainsources behaviour (Closes: #627179) - * Implement some code for omitpreinst support. - -- Neil Williams Wed, 15 Jun 2011 21:44:44 +0100 + -- Neil Williams Wed, 11 May 2011 20:30:03 +0100 multistrap (2.1.13) unstable; urgency=low diff --git a/debian/multistrap.install b/debian/multistrap.install index eadef15..fd05517 100644 --- a/debian/multistrap.install +++ b/debian/multistrap.install @@ -6,7 +6,6 @@ examples/setup.sh ./usr/share/doc/multistrap/examples/ examples/config.sh ./usr/share/doc/multistrap/examples/ examples/sid.conf ./usr/share/multistrap/ examples/squeeze.conf ./usr/share/multistrap/ -examples/lenny.conf ./usr/share/multistrap/ examples/chroot.sh ./usr/share/multistrap/ examples/chroot.conf ./usr/share/multistrap/ check-deps.sh ./usr/share/multistrap/ diff --git a/examples/lenny.conf b/examples/lenny.conf deleted file mode 100644 index 11b4744..0000000 --- a/examples/lenny.conf +++ /dev/null @@ -1,27 +0,0 @@ -# Example multistrap configuration file for the lenny shortcut. - -[General] -arch= -directory= -# same as --tidy-up option if set to true -cleanup=true -# same as --no-auth option if set to true -# keyring packages listed in each debootstrap will -# still be installed. -noauth=false -# whether to add the /suite to be explicit about where apt -# needs to look for packages. Default is false. -explicitsuite=false -# extract all downloaded archives (default is true) -unpack=true -# the order of sections is not important. -# the debootstrap option determines which repository -# is used to calculate the list of Priority: required packages. -debootstrap=Debian -aptsources=Debian - -[Debian] -packages= -source=http://ftp.uk.debian.org/debian -keyring=debian-archive-keyring -suite=stable diff --git a/pod/multistrap b/pod/multistrap index 0ea0004..a737d28 100644 --- a/pod/multistrap +++ b/pod/multistrap @@ -217,7 +217,7 @@ manner. keyring=emdebian-archive-keyring suite=lenny -'source' is the apt source to use for this Section. (To use a local +'source' is the apt source to use for this Section. To use a local source on the same machine, ensure you use C not C, so that apt is told to copy the packages into the rootfs instead of assuming it can try to download them later - because that "later" will @@ -579,7 +579,7 @@ just workarounds and wishlist bugs should be filed in Debian against packages which require the use of these mechanisms (or the packages which would prevent the particular package from operating normally). -head1 Debconf preseeding +=head1 Debconf preseeding Adding a debconf seed can help in configuring packages to a particular setting instead of the package default when running the configuration