[Pkg-ocaml-maint-commits] [coccinelle] 03/06: debian/rules adjust the binary renaming code

[Eugeniy Meshcheryakov]

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

eugen pushed a commit to branch master
in repository coccinelle.

commit 54994ff745cd4e0cf8e22ae97d51c4f6969d9dfa
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Mon Oct 12 01:21:06 2015 +0200

    debian/rules adjust the binary renaming code
---
 debian/changelog | 3 ++-
 debian/rules     | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0137d36..25eb180 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ coccinelle (1.0.2.deb-1) UNRELEASED; urgency=medium
   * New upstream release
   * Depend on libparmap-ocaml (closes: #798263)
   * Disable testing for now
+  * debian/rules adjust the binary renaming code
 
- -- Євгеній Мещеряков <eugen at debian.org>  Mon, 12 Oct 2015 01:09:05 +0200
+ -- Євгеній Мещеряков <eugen at debian.org>  Mon, 12 Oct 2015 01:20:45 +0200
 
 coccinelle (1.0.0.deb-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index e559a55..0418c7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,9 +41,10 @@ override_dh_auto_install-arch:
 	# install the wrapper script, i dont like upstreams one
 	rm $(CURDIR)/debian/coccinelle/usr/bin/spatch*
 	install $(CURDIR)/debian/spatch $(CURDIR)/debian/coccinelle/usr/bin/
-	# move binary into /usr/lib/coccinelle
-	mv $(CURDIR)/debian/coccinelle/usr/share/coccinelle/spatch* \
-		$(CURDIR)/debian/coccinelle/usr/lib/coccinelle/spatch
+	if test -f $(CURDIR)/debian/coccinelle/usr/lib/coccinelle/spatch.opt; then \
+		mv $(CURDIR)/debian/coccinelle/usr/lib/coccinelle/spatch.opt \
+		   $(CURDIR)/debian/coccinelle/usr/lib/coccinelle/spatch; \
+	fi
 
 	# Vim files
 	install -d $(VIM_ADIR)/ftdetect $(VIM_ADIR)/syntax

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/coccinelle.git