debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Fixed up the template and gencontrol so that 

the case when arch-specific depends and suggests
substitutions are empty, one does not get
dangling commas.

svn path=/trunk/kernel/source/linux-2.6/; revision=3639
This commit is contained in:
Jurij Smakov 2005-07-31 01:42:49 +00:00
parent af5f4ef3e8
commit b4bef78582
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/bin/gencontrol vendored
View File

@ -74,7 +74,13 @@ substitute() {
[ -z "${longclass}" ] && longclass="${class}"
eval "arch_depends=\${arch_depends_${2}}"
if [ -n "${arch_depends}" ]; then
arch_depends=", ${arch_depends}"
fi
eval "arch_suggests=\${arch_suggests_${2}}"
if [ -n "${arch_suggests}" ]; then
arch_suggests=", ${arch_suggests}"
fi
eval "arch_recommends=\${arch_recommends_${2}}"
if [ -n "${arch_recommends}" ]; then
arch_recommends="Recommends: ${arch_recommends}"

8
debian/templates/control.image.in vendored
View File

@ -1,15 +1,17 @@
#
# If you would like to change the arch-specific Depends, Suggests,
# or Recommends, have a look at the debian/bin/gencontrol file.
# or Recommends, have a look at the debian/bin/gencontrol file. Note
# that arch_depends and arch_suggests substitutions will start with
# a comma and a space if they are non-empty.
#
Package: linux-image-@subarch@@version@-@abiname@-@flavour@
Architecture: @arch@
Section: base
Priority: optional
Provides: linux-image, linux-image-@major@
Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), @arch_depends@
Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)@arch_depends@
Conflicts: hotplug (<< 0.0.20040105-1)
Suggests: fdutils, linux-doc-@version@ | linux-source-@version@, @arch_suggests@
Suggests: fdutils, linux-doc-@version@ | linux-source-@version@@arch_suggests@
@arch_recommends@
Description: Linux kernel @version@ image on @class@ machines
This package provides the binary image and pre-built loadable modules for