[SCM] UNNAMED PROJECT branch, master, updated. 0.31-39-g92a6574

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  92a65741893d2875e453fa3f248c5c94f6c824fc (commit)
      from  1be4126acc23ef2fd9f39113351488ad67f6d26e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 92a65741893d2875e453fa3f248c5c94f6c824fc
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Feb 17 15:57:45 2011 +0100

    Refactored the source to allow tests to be run as a part of the build

-----------------------------------------------------------------------

Summary of changes:
 debian/javahelper.install                          |    5 +----
 debian/rules                                       |   12 ++++++++----
 Eclipse.pm => lib/Debian/Javahelper/Eclipse.pm     |    0
 Java.pm => lib/Debian/Javahelper/Java.pm           |    0
 Manifest.pm => lib/Debian/Javahelper/Manifest.pm   |    0
 .../Debian/Javahelper/ManifestSection.pm           |    0
 tests/tests.sh                                     |    2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/javahelper.install b/debian/javahelper.install
index e54eb42..3ac2d20 100644
--- a/debian/javahelper.install
+++ b/debian/javahelper.install
@@ -22,7 +22,4 @@ java-arch.sh /usr/share/javahelper
 javahelper.mk /usr/share/cdbs/1/class
 javahelper.pm /usr/share/perl5/Debian/Debhelper/Sequence
 eclipse_helper.pm /usr/share/perl5/Debian/Debhelper/Sequence
-Eclipse.pm /usr/share/perl5/Debian/Javahelper/
-Java.pm /usr/share/perl5/Debian/Javahelper/
-Manifest.pm /usr/share/perl5/Debian/Javahelper/
-ManifestSection.pm /usr/share/perl5/Debian/Javahelper/
+lib/Debian/ /usr/share/perl5/
diff --git a/debian/rules b/debian/rules
index 433f971..edd9c2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@ VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 
 POD2MAN=pod2man --stderr --utf8 -c Javahelper -r "$(VERSION)"
 
+MOD_PATH:=lib/Debian/Javahelper
+
 %:
 	dh $@
 
@@ -18,14 +20,16 @@ override_dh_auto_build:
 	$(POD2MAN) jh_manifest tmp/jh_manifest.1
 	$(POD2MAN) fetch-eclipse-source.pod tmp/fetch-eclipse-source.1
 	$(POD2MAN) -s 1 jh_clean.pod tmp/jh_clean.1
-	$(POD2MAN) Eclipse.pm tmp/Debian::Javahelper::Eclipse.3
-	$(POD2MAN) Java.pm tmp/Debian::Javahelper::Java.3
-	$(POD2MAN) Manifest.pm tmp/Debian::Javahelper::Manifest.3
-	$(POD2MAN) ManifestSection.pm tmp/Debian::Javahelper::ManifestSection.3
+	$(POD2MAN) $(MOD_PATH)/Eclipse.pm tmp/Debian::Javahelper::Eclipse.3
+	$(POD2MAN) $(MOD_PATH)/Java.pm tmp/Debian::Javahelper::Java.3
+	$(POD2MAN) $(MOD_PATH)/Manifest.pm tmp/Debian::Javahelper::Manifest.3
+	$(POD2MAN) $(MOD_PATH)/ManifestSection.pm tmp/Debian::Javahelper::ManifestSection.3
 	# jarwrapper pod-based manpages
 	$(POD2MAN) -s 1 jarwrapper.pod tmp.jarwrapper/jarwrapper.1
 	$(POD2MAN) -s 1 jardetector.pod tmp.jarwrapper/jardetector.1
 
+override_dh_auto_test:
+	cd tests && ./tests.sh
 
 override_dh_auto_clean:
 	rm -f jh_lib.sh
diff --git a/Eclipse.pm b/lib/Debian/Javahelper/Eclipse.pm
similarity index 100%
rename from Eclipse.pm
rename to lib/Debian/Javahelper/Eclipse.pm
diff --git a/Java.pm b/lib/Debian/Javahelper/Java.pm
similarity index 100%
rename from Java.pm
rename to lib/Debian/Javahelper/Java.pm
diff --git a/Manifest.pm b/lib/Debian/Javahelper/Manifest.pm
similarity index 100%
rename from Manifest.pm
rename to lib/Debian/Javahelper/Manifest.pm
diff --git a/ManifestSection.pm b/lib/Debian/Javahelper/ManifestSection.pm
similarity index 100%
rename from ManifestSection.pm
rename to lib/Debian/Javahelper/ManifestSection.pm
diff --git a/tests/tests.sh b/tests/tests.sh
index 774e624..27d7e40 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -7,7 +7,7 @@ _DIR=`pwd`
 run_jh_manifest()
 {
     cd ..
-    ./jh_manifest "$@"
+    perl -I./lib ./jh_manifest "$@"
     cd "$_DIR"
 }
 


hooks/post-receive
-- 
UNNAMED PROJECT