[Likwid-commit] [likwid] 07/10: adapt patches, changelog, control and copyright to new release

[Christoph Martin]

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

chrism pushed a commit to branch master
in repository likwid.

commit 85368a183df940bcab5952bb3c9ba9ca3026cb9d
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Tue Jun 21 15:01:50 2016 +0200

    adapt patches, changelog, control and copyright to new release
---
 debian/patches/02-man-pages-fix.patch | 18 ++++++++++++++++++
 debian/patches/10-debianize.patch     | 24 ++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/debian/patches/02-man-pages-fix.patch b/debian/patches/02-man-pages-fix.patch
index 1f657d9..3f26670 100644
--- a/debian/patches/02-man-pages-fix.patch
+++ b/debian/patches/02-man-pages-fix.patch
@@ -63,6 +63,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
  Also a custom event set can be specified by a comma separated list of events. Each event has the format
  eventId:register with the the register being one of a architecture supported performance counter registers.
  .TP
+@@ -154,7 +154,7 @@ Using the marker API to measure only par
+ .B likwid-perfctr -m -C 0-4 -g INSTRUCTIONS_RETIRED_SSE:PMC0,CPU_CLOCKS_UNHALTED:PMC3 ./cacheBench
+ .PP
+ You have to link you code against liblikwid.so and use the marker API calls.
+-Examples can be found in examples folder <INSTALLEDPREFIX>/share/likwid/examples.
++Examples can be found in examples folder <INSTALLED_PREFIX>/share/likwid/examples.
+ The following code snippet shows the necessary calls:
+ 
+ .nf
 --- a/doc/likwid-topology.1
 +++ b/doc/likwid-topology.1
 @@ -14,7 +14,7 @@ is a command line application to print t
@@ -74,6 +83,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
  .SH OPTIONS
  .TP
  .B \-h, \-\-\^help
+@@ -38,7 +38,7 @@ measures and output the processor clock.
+ .B \-o, \-\-\^output <file>
+ write the output to file instead of stdout.
+ Likwid applies filter scripts according to filename suffix.
+-Currently available scripts are csv. You can place additional filter scripts in <INSTALLEDPREFIX>/share/likwid/filter.
++Currently available scripts are csv. You can place additional filter scripts in <INSTALLED_PREFIX>/share/likwid/filter.
+ 
+ .SH AUTHOR
+ Written by Thomas Roehl <thomas.roehl at googlemail.com>.
 --- a/doc/feedGnuplot.1
 +++ b/doc/feedGnuplot.1
 @@ -165,7 +165,7 @@ Simple real-time plotting example: plot
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 1f84a92..1c0a5b4 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -68,10 +68,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===>  ADJUSTING  $@"
  	@if [ "$(ACCESSMODE)" = "direct" ]; then sed -i -e s/"access_mode = 1"/"access_mode = 0"/g $(SRC_DIR)/applications/$@.lua;fi
 -	@sed -e s/'<INSTALLED_BINPREFIX>'/$(subst /,\\/,$(INSTALLED_BINPREFIX))/g \
-+	@sed -e s/'<INSTALLED_BINPREFIX>'\\/likwid-lua/$(subst /,\\/,$(INSTALLED_BINPREFIX))\\/lua5.2/g \
++	$(Q)sed -e s/'<INSTALLED_BINPREFIX>'\\/likwid-lua/$(subst /,\\/,$(INSTALLED_BINPREFIX))\\/lua5.2/g \
  		-e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
  		-e s/'<VERSION>'/$(VERSION).$(RELEASE)/g \
  		-e s/'<DATE>'/$(DATE)/g \
+@@ -117,7 +117,7 @@ $(L_APPS):  $(addprefix $(SRC_DIR)/appli
+ 
+ $(L_HELPER):
+ 	@echo "===>  ADJUSTING  $@"
+-	@sed -e s/'<PREFIX>'/$(subst /,\\/,$(PREFIX))/g \
++	$(Q)sed -e s/'<PREFIX>'/$(subst /,\\/,$(PREFIX))/g \
+ 		-e s/'<INSTALLED_LIBPREFIX>'/$(subst /,\\/,$(INSTALLED_LIBPREFIX))/g \
+ 		-e s/'<INSTALLED_PREFIX>'/$(subst /,\\/,$(INSTALLED_PREFIX))/g \
+ 		-e s/'<LIKWIDGROUPPATH>'/$(subst /,\\/,$(LIKWIDGROUPPATH))/g \
 @@ -126,29 +126,29 @@ $(L_HELPER):
  		-e s/'<RELEASE>'/$(RELEASE)/g \
  		$(SRC_DIR)/applications/$@ > $@
@@ -165,7 +174,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@install -m 644 examples/* $(PREFIX)/share/likwid/examples
  	@echo "===> INSTALL default likwid-agent.conf to $(PREFIX)/share/likwid/mongroups"
 -	@sed -e "s+<PREFIX>+$(PREFIX)+g" monitoring/likwid-agent.conf > $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
-+	@sed -e "s+<PREFIX>+$(INSTALLED_PREFIX)+g" monitoring/likwid-agent.conf > $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
++	$(Q)sed -e "s+<PREFIX>+$(INSTALLED_PREFIX)+g" monitoring/likwid-agent.conf > $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
  	@chmod 644 $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
  	@echo "===> INSTALL filters to $(abspath $(PREFIX)/share/likwid/filter)"
  	@mkdir -p $(abspath $(PREFIX)/share/likwid/filter)
@@ -252,3 +261,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  #PATTERN RULES
  $(BUILD_DIR)/%.o:  %.c
+--- a/monitoring/likwid-agent.conf
++++ b/monitoring/likwid-agent.conf
+@@ -1,7 +1,7 @@
+ ### Global section ###
+ 
+ # Set path to monitoring group files. Default is the normal LIKWID group path
+-# <INSTALLEDPREFIX>/share/likwid/mongroups
++# <INSTALLED_PREFIX>/share/likwid/mongroups
+ #GROUPPATH <path_to_mon_groups>
+ # List of monitoring groups that should be measured
+ #EVENTSET <group1> <group2> ...

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