[kernel] r7043 - in people/waldi/linux-modules-extra-2.6/debian: templates

[Bastian Blank]

Author: waldi
Date: Wed Jul 19 21:18:55 2006
New Revision: 7043

Modified:
   people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py
   people/waldi/linux-modules-extra-2.6/debian/templates/control.modules.in

Log:
* debian/bin/gencontrol.py: Fix target names.
* debian/templates/control.modules.in: Add -modules to package names.


Modified: people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-modules-extra-2.6/debian/bin/gencontrol.py	Wed Jul 19 21:18:55 2006
@@ -65,11 +65,11 @@
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_arch = []
-        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
+        cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch %s" % makeflags_string,))
         cmds_build = []
         cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
         cmds_setup = []
-        cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
+        cmds_setup.append(("$(MAKE) -f debian/rules.real setup %s" % makeflags_string,))
         makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
         makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
         makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))

Modified: people/waldi/linux-modules-extra-2.6/debian/templates/control.modules.in
==============================================================================
--- people/waldi/linux-modules-extra-2.6/debian/templates/control.modules.in	(original)
+++ people/waldi/linux-modules-extra-2.6/debian/templates/control.modules.in	Wed Jul 19 21:18:55 2006
@@ -1,11 +1,11 @@
-Package: @module at -@upstreamversion@@abiname@@localversion@
+Package: @module at -modules-@upstreamversion@@abiname@@localversion@
 Section: admin
 Priority: optional
 Description: @desc@ modules for Linux kernel @upstreamversion@ on @class@ machines
  This package provides the @desc@ modules for the Linux kernel version
  @upstreamversion@ on @longclass@ machines.
 
-Package: @module at -@major@@localversion@
+Package: @module at -modules-@major@@localversion@
 Section: admin
 Priority: optional
 Description: @desc@ modules for Linux kernel @major@ on @class@ machines