[linux] 03/03: *lockdep*, linux-perf: Remove '-rcN' from installation paths

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit e2f5aae4d1c6e2f625c749901e6f01e5c15d9dac
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Apr 29 10:38:27 2016 +0200

    *lockdep*,linux-perf: Remove '-rcN' from installation paths
    
    Where we include the 'version' in paths, it needs to be what
    debian/rules.real calls UPSTREAMVERSION (no -rcN, no Debian revision).
    
    (We should really make the naming of version variables consistent
    across all our makefiles.)
---
 debian/changelog  | 1 +
 debian/rules.real | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7a9a4bb..2246914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux (4.6~rc5-1~exp1) UNRELEASED; urgency=medium
   * [armhf] Enable EFI, RTC_DRV_EFI
   * Update config for renaming/removal/replacement/merging/splitting of various
     symbols
+  * *lockdep*,linux-perf: Remove '-rcN' from installation paths
 
   [ Martin Michlmayr ]
   * [armel, armhf] Use new Marvell CESA driver.
diff --git a/debian/rules.real b/debian/rules.real
index 3e7839a..bc9af3c 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -485,7 +485,7 @@ install-source: $(BUILD_DIR)/$(SOURCE_PACKAGE_NAME)-source-$(UPSTREAMVERSION).ta
 	+$(MAKE_SELF) install-base BUILDDEB_ARGS='-Zgzip -z1'
 
 define make-tools
-+mkdir -p $(BUILD_DIR)/build-tools/$(1) && $(MAKE_CLEAN) -C $(BUILD_DIR)/build-tools/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1) VERSION=$(UPSTREAMVERSION)
++mkdir -p $(BUILD_DIR)/build-tools/$(1) && $(MAKE_CLEAN) -C $(BUILD_DIR)/build-tools/$(1) -f $(CURDIR)/debian/rules.d/$(1)/Makefile top_srcdir=$(CURDIR) top_rulesdir=$(CURDIR)/debian/rules.d OUTDIR=$(1) VERSION=$(VERSION)
 endef
 
 $(STAMPS_DIR)/build-tools:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git