[pkg-haskell-tools] 01/02: Fixed files incorrectly being shipped in /var/lib

[Sven Bartscher]

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

kritzefitz pushed a commit to branch master
in repository pkg-haskell-tools.

commit 5f32f72fd33cfa38de160f90f3b4d2729a6bd67a
Author: Sven Bartscher <sven.bartscher at credativ.de>
Date:   Thu Aug 10 12:27:40 2017 -0400

    Fixed files incorrectly being shipped in /var/lib
    
    Private libraries and scripts were previously shipped in
    /var/lib. This commit moves them to /usr/lib in accordance with the
    Debian Policy.
---
 debian/changelog                 | 6 +++++-
 debian/pkg-haskell-tools.install | 6 +++---
 dht                              | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 131d296..1bce965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ pkg-haskell-tools (0.11.0) UNRELEASED; urgency=medium
   * dht upload: New -h option to select the dput upload host.
   * dht upload: Defaults to the dput default_host, not ssh-upload.
 
- -- Sven Bartscher <kritzefitz at debian.org>  Mon, 07 Aug 2017 14:26:35 -0400
+  [ Sven Bartscher ]
+  * Private scripts and libraries are now shipped in /usr/lib rather than
+    /var/lib.
+
+ -- Sven Bartscher <kritzefitz at debian.org>  Thu, 10 Aug 2017 12:27:05 -0400
 
 pkg-haskell-tools (0.10.5) unstable; urgency=medium
 
diff --git a/debian/pkg-haskell-tools.install b/debian/pkg-haskell-tools.install
index a0ea36a..6aef705 100644
--- a/debian/pkg-haskell-tools.install
+++ b/debian/pkg-haskell-tools.install
@@ -1,5 +1,5 @@
-scripts/* var/lib/pkg-haskell-tools/bin
-lib/* var/lib/pkg-haskell-tools/lib
+scripts/* usr/lib/pkg-haskell-tools/bin
+lib/* usr/lib/pkg-haskell-tools/lib
 # order significant, this overwrites the wrapper installed in the first line
-dist-ghc/build/make-all/make-all var/lib/pkg-haskell-tools/bin
+dist-ghc/build/make-all/make-all usr/lib/pkg-haskell-tools/bin
 dht usr/bin
diff --git a/dht b/dht
index 1181348..232392d 100755
--- a/dht
+++ b/dht
@@ -12,8 +12,8 @@ use FindBin  qw($Bin);;
 our $DHT_SCRIPT_DIR;
 $ENV{PERL5LIB} = ":$ENV{PERL5LIB}" if $ENV{PERL5LIB};
 if ($Bin eq "/usr/bin") {
-	$DHT_SCRIPT_DIR="/var/lib/pkg-haskell-tools/bin";
-	$ENV{PERL5LIB} = "/var/lib/pkg-haskell-tools/lib" . ($ENV{PERL5LIB} || "");
+	$DHT_SCRIPT_DIR="/usr/lib/pkg-haskell-tools/bin";
+	$ENV{PERL5LIB} = "/usr/lib/pkg-haskell-tools/lib" . ($ENV{PERL5LIB} || "");
 } else {
 	$DHT_SCRIPT_DIR = "$Bin/scripts";
 	$ENV{PERL5LIB} = "$Bin/lib" . ($ENV{PERL5LIB}|| "");

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