BACKPORT: Merge version-tracking sort_deps code from current trunk (r2448)

This commit is contained in:
Steve McIntyre 2012-09-29 12:04:16 +00:00
parent 8f8e026611
commit 4244f204c7
4 changed files with 553 additions and 200 deletions

View File

@ -60,6 +60,7 @@ debian-cd (3.1.6) UNRELEASED-backport; urgency=low
* Explicitly add s390-tools and sysconfig-hardware for s390. * Explicitly add s390-tools and sysconfig-hardware for s390.
* Make grab_md5 more robust * Make grab_md5 more robust
* Remove -e bashisms from Makefile * Remove -e bashisms from Makefile
* Merge version-tracking sort_deps code from current trunk (r2448)
-- Raphaël Hertzog <hertzog@debian.org> Fri, 04 Feb 2011 09:59:21 +0100 -- Raphaël Hertzog <hertzog@debian.org> Fri, 04 Feb 2011 09:59:21 +0100

View File

@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/debian-cd/trunk?op=log
Package: debian-cd Package: debian-cd
Architecture: all Architecture: all
Depends: ${misc:Depends}, curl, perl, dpkg-dev, cpp, libdigest-md5-perl, tofrodos, apt (>= 0.3.11.1), make, genisoimage, lynx-cur | lynx, grep-dctrl, bc, libcompress-zlib-perl Depends: ${misc:Depends}, curl, perl, dpkg-dev, cpp, libdigest-md5-perl, tofrodos, apt (>= 0.3.11.1), make, genisoimage, lynx-cur | lynx, grep-dctrl, bc, libcompress-zlib-perl, libdpkg-perl
Recommends: hfsutils, netpbm, syslinux-common Recommends: hfsutils, netpbm, syslinux-common
Description: Tools for building (Official) Debian CD set Description: Tools for building (Official) Debian CD set
Debian-cd is the official tool for building Debian CD set since the potato Debian-cd is the official tool for building Debian CD set since the potato

View File

@ -32,6 +32,7 @@ options=" -q -o Dir::State::status=$APTTMP/$CODENAME-$ARCH/status \
-o Dir::Cache=$APTTMP/$CODENAME-$ARCH/apt-cache/ \ -o Dir::Cache=$APTTMP/$CODENAME-$ARCH/apt-cache/ \
-o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \ -o Dir::Etc=$APTTMP/$CODENAME-$ARCH/apt/ \
-o APT::Cache::AllVersions=0 \ -o APT::Cache::AllVersions=0 \
-o APT::Cache::ShowVersion=1 \
-o APT::Architecture=$ARCH " -o APT::Architecture=$ARCH "
sections=main sections=main

File diff suppressed because it is too large Load Diff