diff options
| author | Bastian Blank <waldi@debian.org> | 2006-03-28 08:55:00 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2006-03-28 08:55:00 +0000 |
| commit | 2f6026856e4c978efa8ba37ac56da41d7b7e971a (patch) | |
| tree | 75ddd82cb0e099350f79d6be58653fbf16d1fa12 | |
| parent | e7d79fde869015423d7ea2d49552f67cfaa58cea (diff) | |
| download | kernel_replicant_linux-2f6026856e4c978efa8ba37ac56da41d7b7e971a.tar.gz kernel_replicant_linux-2f6026856e4c978efa8ba37ac56da41d7b7e971a.tar.bz2 kernel_replicant_linux-2f6026856e4c978efa8ba37ac56da41d7b7e971a.zip | |
* debian/modules/gencontrol.py: Use unique provides of headers all package.
* debian/rules.real: Make provides of headers all package unique.
svn path=/dists/sid/linux-2.6/; revision=6301
| -rwxr-xr-x | debian/modules/gencontrol.py | 2 | ||||
| -rw-r--r-- | debian/rules.real | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/modules/gencontrol.py b/debian/modules/gencontrol.py index 341280b6cca5..fc3935ca71ba 100755 --- a/debian/modules/gencontrol.py +++ b/debian/modules/gencontrol.py @@ -13,7 +13,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol): def do_main_packages(self, packages): l = package_relation_group() - l.extend([package_relation('linux-headers-%s%s-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch)) for arch in self.config['base',]['arches']]) + l.extend([package_relation('linux-headers-%s%s-all-%s [%s]' % (self.version['upstream'], self.abiname, arch, arch)) for arch in self.config['base',]['arches']]) packages['source']['Build-Depends'].append(l) def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra): diff --git a/debian/rules.real b/debian/rules.real index 14c6070741e6..7f937b10bc50 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -310,7 +310,7 @@ install-headers-all: chmod a+x debian/modules/gencontrol.py dh_install $(DH_OPTIONS) debian/arch debian/lib debian/modules '/usr/src/linux-headers-$(VERSION)' dh_python $(DH_OPTIONS) -V 2.4 /usr/src/linux-headers-$(VERSION)/lib/python - $(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=linux-headers-$(UPSTREAMVERSION)$(ABINAME)-$(ARCH)' + $(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -Vkernel:Provides=linux-headers-$(UPSTREAMVERSION)$(ABINAME)-all-$(ARCH)' install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION) install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): PACKAGE_NAME = linux-image-$(REAL_VERSION) |