[kernel] r19906 - in dists/trunk/linux-tools/debian: . patches

[Ben Hutchings]

Author: benh
Date: Thu Mar  7 05:00:13 2013
New Revision: 19906

Log:
linux-tools: Install bash_completion script for perf with a version-dependent name (Closes: #701790)

Modified:
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/tools-perf-install.patch
   dists/trunk/linux-tools/debian/patches/tools-perf-version.patch

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Thu Mar  7 04:26:32 2013	(r19905)
+++ dists/trunk/linux-tools/debian/changelog	Thu Mar  7 05:00:13 2013	(r19906)
@@ -2,6 +2,10 @@
 
   * New upstream release (Closes: #702450)
 
+  [ Ben Hutchings ]
+  * linux-tools: Install bash_completion script for perf with a version-
+    dependent name (Closes: #701790)
+
  -- Jonathan Nieder <jrnieder at gmail.com>  Sat, 29 Dec 2012 22:51:43 -0800
 
 linux-tools (3.7.1-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-install.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-install.patch	Thu Mar  7 04:26:32 2013	(r19905)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-install.patch	Thu Mar  7 05:00:13 2013	(r19906)
@@ -17,8 +17,8 @@
 +	$(INSTALL) -m 644 scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
  	$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'
--	$(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'
-+	$(INSTALL) -m 644 bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'
+-	$(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)'
++	$(INSTALL) -m 644 bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
 -	$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
 +	$(INSTALL) -m 644 tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-version.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Thu Mar  7 04:26:32 2013	(r19905)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Thu Mar  7 05:00:13 2013	(r19906)
@@ -9,6 +9,15 @@
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'
  	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
+@@ -1114,7 +1114,7 @@ install: all try-install-man
+ 	$(INSTALL) scripts/python/*.py -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python'
+ 	$(INSTALL) scripts/python/bin/* -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/python/bin'
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'
+-	$(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf'
++	$(INSTALL) bash_completion '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d/perf_$(VERSION)'
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
+ 	$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'
 @@ -1125,7 +1125,7 @@ install-python_ext:
  
  # 'make install-doc' should call 'make -C Documentation install'