r3639 - in trunk/kernel/source/linux-2.6/debian: bin templates

[Jurij Smakov]

Author: jurij-guest
Date: 2005-07-31 01:42:49 +0000 (Sun, 31 Jul 2005)
New Revision: 3639

Modified:
   trunk/kernel/source/linux-2.6/debian/bin/gencontrol
   trunk/kernel/source/linux-2.6/debian/templates/control.image.in
Log:
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.


Modified: trunk/kernel/source/linux-2.6/debian/bin/gencontrol
===================================================================
--- trunk/kernel/source/linux-2.6/debian/bin/gencontrol	2005-07-31 00:56:28 UTC (rev 3638)
+++ trunk/kernel/source/linux-2.6/debian/bin/gencontrol	2005-07-31 01:42:49 UTC (rev 3639)
@@ -74,7 +74,13 @@
   [ -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}"

Modified: trunk/kernel/source/linux-2.6/debian/templates/control.image.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.image.in	2005-07-31 00:56:28 UTC (rev 3638)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.image.in	2005-07-31 01:42:49 UTC (rev 3639)
@@ -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- at subarch@@version at -@abiname at -@flavour@
 Architecture: @arch@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at 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- at version@ | linux-source- at version@, @arch_suggests@
+Suggests: fdutils, linux-doc- at version@ | linux-source- at 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