From d300e845c9c1bb3be6663b6461993008ac98cd69 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 28 Nov 2009 14:32:25 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/rules.real: Move contents of linux-support package to /usr/share. svn path=/dists/trunk/linux-2.6/; revision=14694 --- debian/changelog | 1 + debian/rules.real | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa1058fe9..c4826d1e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low * [powerpc] Properly enable Apple PMU battery. * [mips/mipsel] Drop remaining OSS drivers. * [powerpc] Enable PCIe support. + * Move contents of linux-support package to /usr/share. -- Martin Michlmayr Sun, 22 Nov 2009 13:56:12 +0000 diff --git a/debian/rules.real b/debian/rules.real index 5b21ab895..5ace32dd6 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -289,7 +289,7 @@ install-libc-dev_$(ARCH): install-support: PACKAGE_NAME = linux-support-$(UPSTREAMVERSION)$(ABINAME) install-support: DH_OPTIONS = -p$(PACKAGE_NAME) install-support: PACKAGE_DIR = debian/$(PACKAGE_NAME) -install-support: PACKAGE_ROOT = /usr/src/$(PACKAGE_NAME) +install-support: PACKAGE_ROOT = /usr/share/$(PACKAGE_NAME) install-support: dh_testdir dh_testroot @@ -299,7 +299,8 @@ install-support: cp debian/lib/python/debian_linux/*.py $(PACKAGE_DIR)$(PACKAGE_ROOT)/lib/python/debian_linux cp debian/modules/* $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules chmod a+x $(PACKAGE_DIR)$(PACKAGE_ROOT)/modules/gencontrol.py - dh_pycentral /usr/src/$(PACKAGE_NAME)/lib/python + dh_pycentral $(PACKAGE_ROOT)/lib/python + dh_link $(PACKAGE_ROOT) /usr/src/$(PACKAGE_NAME) +$(MAKE_SELF) install-base install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): REAL_VERSION = $(UPSTREAMVERSION)$(ABINAME)$(LOCALVERSION)