[fcm] 04/17: Fix path of etc/fcm-version.sh

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository fcm.

commit 53d033b468059f480f833123e1053b91dfca38d6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 1 03:25:57 2016 +0000

    Fix path of etc/fcm-version.sh
---
 debian/fcm.install         |  1 +
 debian/patches/paths.patch | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/fcm.install b/debian/fcm.install
index 51b547e..069eaa0 100644
--- a/debian/fcm.install
+++ b/debian/fcm.install
@@ -3,3 +3,4 @@ sbin/fcm-* /usr/sbin
 etc/fcm
 debian/bash_completion.d/*	/usr/share/bash-completion/completions/
 lib/*	/usr/share/perl5/
+doc/etc/fcm-version.js /etc/fcm
diff --git a/debian/patches/paths.patch b/debian/patches/paths.patch
index a258269..dd0c6d8 100644
--- a/debian/patches/paths.patch
+++ b/debian/patches/paths.patch
@@ -1,18 +1,18 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Alter paths to debian norms.
-Last-Updated: 2015-07-06
+Last-Updated: 2016-11-01
 Forwarded: not-needed
 
-Index: fcm-2015.5.0+dfsg.1/lib/FCM/Util.pm
+Index: fcm-2016.10.0/lib/FCM/Util.pm
 ===================================================================
---- fcm-2015.5.0+dfsg.1.orig/lib/FCM/Util.pm
-+++ fcm-2015.5.0+dfsg.1/lib/FCM/Util.pm
-@@ -501,7 +501,7 @@ sub _version {
-         return "FCM " . $value_hash_ref->{o};
-     }
-     # Read fcm-version.js file
--    my $path = catfile($FindBin::Bin, qw{.. doc etc fcm-version.js});
-+    my $path = catfile($FindBin::Bin, qw{.. share doc fcm etc fcm-version.js});
-     open(my($handle), '<', $path) || die("$path: $!");
-     my $content = do {local($/); readline($handle)};
-     close($handle);
+--- fcm-2016.10.0.orig/lib/FCM/Util.pm
++++ fcm-2016.10.0/lib/FCM/Util.pm
+@@ -516,7 +516,7 @@ sub _util_of_func {
+             }
+             else {
+                 # Read fcm-version.js file
+-                my $path = catfile($fcm_home, qw{doc etc fcm-version.js});
++                my $path = catfile("", qw{etc fcm fcm-version.js});
+                 open(my($handle), '<', $path) || die("$path: $!");
+                 my $content = do {local($/); readline($handle)};
+                 close($handle);

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