[slepc] 01/01: repair merge from master

[Drew Parsons]

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

dparsons pushed a commit to branch experimental
in repository slepc.

commit 647da8de1d398908f7c8ba679429bb5fdf40170b
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Jun 6 17:51:11 2016 +0800

    repair merge from master
---
 debian/rules | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index a3904c2..5c0d413 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,17 +77,9 @@ PACKAGE_COMPLEX_INSTALL_BASEDIR=debian/tmp/$(SLEPC_NAME)-complex
 PACKAGE_COMPLEX_INSTALL_DIR=$(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(SLEPC_COMPLEX_DIR_PREFIX)
 
 PETSC_SONAME_VERSION=$(SLEPC_SONAME_VERSION)
-<<<<<<< HEAD
-PETSC_DEV_PACKAGE=libpetsc$(PETSC_SONAME_VERSION)-dev
-PETSC_VERSION=$(shell dpkg -l $(PETSC_DEV_PACKAGE) | awk '/$(PETSC_DEV_PACKAGE)/ {print $$3}' | sed "s/.dfsg.*//" )
-PETSC_DIR=/usr/lib/petscdir/$(PETSC_VERSION)
-PETSC_DIR_REAL=$(PETSC_DIR)/$(DEB_HOST_MULTIARCH)-real
-PETSC_DIR_COMPLEX=$(PETSC_DIR)/$(DEB_HOST_MULTIARCH)-complex
-=======
 PETSC_DIR=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)
 PETSC_DIR_REAL=$(PETSC_DIR)-real
 PETSC_DIR_COMPLEX=$(PETSC_DIR)-complex
->>>>>>> 10b7bd2e974c999a0cdcf49e0b03b7f96094140a
 
 export SLEPC_DIR=$(CURDIR)
 

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