[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. c7d6447ca108ec2bba302c89db616ecf5cb952d1

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c7d6447ca108ec2bba302c89db616ecf5cb952d1
Merge: db17b429541b1fd2885a0da35830c385411cfcdd 2f57a51a1b18d44544d51f1ad4370ff1c05ac849
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Aug 23 00:32:45 2009 +0200

    Merge branch 'master' of ssh://moeller@git.debian.org/git/pkg-fso/files

diff --combined install.sh
index 397bd79,3a34aad..a938f46
--- a/install.sh
+++ b/install.sh
@@@ -90,7 -90,7 +90,7 @@@ intern_no_partitioning="
  # with packages for a basic debian with network connectivity
  CDEBOOTSTRAP_FLAVOUR=minimal
  CDEBOOTSTRAP_PACKAGE=$INST_MIRROR/pool/main/c/cdebootstrap/cdebootstrap-static_0.5.5_armel.deb
- CDEBOOTSTRAP_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,module-init-tools,wget,openssh-client
+ CDEBOOTSTRAP_EXTRA_PACKAGES=ifupdown,dropbear,udev,procps,netbase,vim-tiny,module-init-tools,wget,openssh-client,install-info
  # This gets passed to cdebuildstrap. currently not used
  CDEBOOTSTRAP_EXCLUDE_PACKAGES=hello
  
@@@ -811,11 -811,10 +811,11 @@@ action_debian () 
  		CDEBOOTSTRAP_EXTRA_FLAGS="$CDEBOOTSTRAP_EXTRA_FLAGS -v"
  	fi
  	cdebootstrap-static $CDEBOOTSTRAP_EXTRA_FLAGS --allow-unauthenticated --flavour $CDEBOOTSTRAP_FLAVOUR \
 -		--include=$CDEBOOTSTRAP_EXTRA_PACKAGES \
  		--exclude=$CDEBOOTSTRAP_EXCLUDE_PACKAGES sid "$INST_DIR" $INST_MIRROR
 +	# Bug #542955 (won't fix) directs us to use apt-get for versioned (direct or indirect) dependencies
 +	# The CDEBOOTSTRAP_EXTRA_PACKAGES are consequently installed in the action_apt
  
 -	echo "I: Basic Debian system installed"
 +	echo "I: Basic Debian system installed - please also install apt"
  }
  
  
@@@ -864,9 -863,6 +864,9 @@@ __END_
  	echo " * Installing pkg-fso keyring"
  	chroot $INST_DIR apt-get $APT_OPTIONS install pkg-fso-keyring
  
 +	echo " * Completing install of Debian basic packages to circumvent bug #542955"
 +	chroot "$INST_DIR" apt-get $APT_OPTIONS install $(echo $CDEBOOTSTRAP_EXTRA_PACKAGES | tr "," " ")
 +
  	echo " * Cleaning APT cache"
  	chroot $INST_DIR apt-get clean
  

-- 
Various non-packaged files