[jtreg] 04/07: Updated the path of the installed files

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jtreg.

commit d7bd2482e2b2f63ee2e70e4b8c13369de6a6ef18
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 18 18:19:10 2015 +0200

    Updated the path of the installed files
---
 debian/changelog     | 1 +
 debian/jtreg.install | 6 +++---
 debian/rules         | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0cc34a8..e354c3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jtreg (4.1-b12-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+    - Updated the path of the installed files
   * Fixed debian/watch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 18 Jun 2015 17:48:42 +0200
diff --git a/debian/jtreg.install b/debian/jtreg.install
index 56bd3b5..5ce7f2b 100644
--- a/debian/jtreg.install
+++ b/debian/jtreg.install
@@ -1,6 +1,6 @@
 dist/jtreg/lib/jtreg.jar /usr/share/java
 dist/jtreg/doc/jtreg/faq.html /usr/share/doc/jtreg
-dist/jtreg/doc/jtreg/tag-spec.txt /usr/share/doc/jtreg
+dist/jtreg/doc/jtreg/tag-spec.html /usr/share/doc/jtreg
 dist/jtreg/doc/jtreg/usage.txt /usr/share/doc/jtreg
-dist/jtreg/linux/bin/jtdiff /usr/bin
-dist/jtreg/linux/bin/jtreg /usr/bin
+dist/jtreg/bin/jtdiff /usr/bin
+dist/jtreg/bin/jtreg /usr/bin
diff --git a/debian/rules b/debian/rules
index ca89fc2..852c988 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ override_dh_auto_build:
 	dh_auto_build
 
 	# Generate the manpages
-	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtdiff > jtdiff.1
-	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/linux/bin/jtreg > jtreg.1
+	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/bin/jtdiff > jtdiff.1
+	JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/bin/jtreg > jtreg.1
 
 override_dh_auto_clean:
 	rm -rf dist

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