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

Christoph Martin chrism at debian.org
Wed Jun 22 08:28:32 UTC 2016 

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

chrism pushed a commit to branch master
in repository likwid.

commit 3ebeacc96ab1ed593ab8f166639233c2be6fe421
Author: Christoph Martin <martin at uni-mainz.de>
Date:   Tue Jun 21 15:29:46 2016 +0200

    adapt patches, changelog, control and copyright to new release
---
 debian/patches/10-debianize.patch | 21 +++++++++++----------
 debian/rules                      |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 1c0a5b4..0ecd4bc 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -63,16 +63,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  all: $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_LIB) $(FORTRAN_IF)  $(PINLIB) $(L_APPS) $(L_HELPER) $(DAEMON_TARGET) $(FREQ_TARGET) $(BENCH_TARGET)
  
-@@ -108,7 +108,7 @@ docs:
+@@ -108,7 +108,8 @@ docs:
  $(L_APPS):  $(addprefix $(SRC_DIR)/applications/,$(addsuffix  .lua,$(L_APPS)))
  	@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 \
 +	$(Q)sed -e s/'<INSTALLED_BINPREFIX>'\\/likwid-lua/$(subst /,\\/,$(INSTALLED_BINPREFIX))\\/lua5.2/g \
++		-e s/'<INSTALLED_BINPREFIX>'/$(subst /,\\/,$(INSTALLED_BINPREFIX))/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
+@@ -117,7 +118,7 @@ $(L_APPS):  $(addprefix $(SRC_DIR)/appli
  
  $(L_HELPER):
  	@echo "===>  ADJUSTING  $@"
@@ -81,7 +82,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		-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):
+@@ -126,29 +127,29 @@ $(L_HELPER):
  		-e s/'<RELEASE>'/$(RELEASE)/g \
  		$(SRC_DIR)/applications/$@ > $@
  
@@ -117,7 +118,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  $(GENGROUPLOCK): $(foreach directory,$(shell ls $(GROUP_DIR)), $(wildcard $(GROUP_DIR)/$(directory)/*.txt))
  	@echo "===>  GENERATE GROUP HEADERS"
-@@ -207,7 +207,7 @@ endif
+@@ -207,7 +208,7 @@ endif
  .NOTPARALLEL:
  
  
@@ -126,7 +127,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===>  CLEAN"
  	@for APP in $(L_APPS); do \
  		rm -f $$APP; \
-@@ -219,7 +219,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
+@@ -219,7 +220,7 @@ clean: $(TARGET_LUA_LIB) $(TARGET_HWLOC_
  	@rm -f $(FORTRAN_IF_NAME)
  	@rm -f $(FREQ_TARGET) $(DAEMON_TARGET)
  
@@ -135,7 +136,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===>  DIST CLEAN"
  	@for APP in $(L_APPS); do \
  		rm -f $$APP; \
-@@ -319,7 +319,7 @@ install: install_daemon install_freq
+@@ -319,7 +320,7 @@ install: install_daemon install_freq
  	@for APP in $(C_APPS); do \
  		install -m 755 $$APP  $(BINPREFIX); \
  	done
@@ -144,7 +145,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo "===> INSTALL helper applications to $(BINPREFIX)"
  	@install -m 755 perl/feedGnuplot $(BINPREFIX)
  	@echo "===> INSTALL lua to likwid interface to $(PREFIX)/share/lua"
-@@ -332,20 +332,20 @@ install: install_daemon install_freq
+@@ -332,20 +333,20 @@ install: install_daemon install_freq
  	@install -m 755 $(TARGET_LIB) $(LIBPREFIX)/$(TARGET_LIB).$(VERSION).$(RELEASE)
  	@install -m 755 liblikwidpin.so $(LIBPREFIX)/liblikwidpin.so.$(VERSION).$(RELEASE)
  	@install -m 755 $(TARGET_HWLOC_LIB) $(LIBPREFIX)/$(shell basename $(TARGET_HWLOC_LIB)).$(VERSION).$(RELEASE)
@@ -169,16 +170,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-powermeter.1 > $(MANPREFIX)/man1/likwid-powermeter.1
  	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/likwid-pin.1 > $(MANPREFIX)/man1/likwid-pin.1
  	@sed -e "s/<VERSION>/$(VERSION)/g" -e "s/<DATE>/$(DATE)/g" < $(DOC_DIR)/feedGnuplot.1 > $(MANPREFIX)/man1/feedGnuplot.1
-@@ -387,7 +387,7 @@ install: install_daemon install_freq
+@@ -387,7 +388,7 @@ install: install_daemon install_freq
  	@chmod 775 $(PREFIX)/share/likwid/examples
  	@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
-+	$(Q)sed -e "s+<PREFIX>+$(INSTALLED_PREFIX)+g" monitoring/likwid-agent.conf > $(PREFIX)/share/likwid/mongroups/likwid-agent.conf
++	$(Q)sed -e "s+<INSTALLED_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)
-@@ -586,4 +586,3 @@ help:
+@@ -586,4 +587,3 @@ help:
  	@echo "The common configuration is INSTALLED_PREFIX = PREFIX, so changing PREFIX is enough."
  	@echo "If PREFIX and INSTALLED_PREFIX differ, you have to move anything after 'make install' to"
  	@echo "the INSTALLED_PREFIX. You can also use 'make move' which does the job for you."
diff --git a/debian/rules b/debian/rules
index a15e68f..c3c2d1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ export DCPPFLAGS DLDFLAGS
 	dh $@
 
 override_dh_auto_build:
-	$(MAKE) PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_BUILD_GNU_TYPE) RPATHS= FORTRAN_INTERFACE=true
+	$(MAKE) PREFIX=/usr LIBPREFIX=/usr/lib/$(DEB_BUILD_GNU_TYPE) INSTALLED_LIBPREFIX=/usr/lib/$(DEB_BUILD_GNU_TYPE) RPATHS= FORTRAN_INTERFACE=true
 
 override_dh_auto_install:
 	$(MAKE) PREFIX=$$(pwd)/debian/likwid/usr INSTALLED_PREFIX=/usr FORTRAN_INTERFACE=true MANPREFIX=$$(pwd)/debian/likwid/usr/share/man LIBPREFIX=$$(pwd)/debian/likwid/usr/lib/$(DEB_BUILD_GNU_TYPE) install

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

More information about the Likwid-commit mailing list