[SCM] UNNAMED PROJECT branch, master, updated. 0.31-43-g110bfef

[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  110bfef5ff51ecaf9582e755e662276a4c1cda34 (commit)
      from  d37c552c4e21c5488a35264ab927054c31604e86 (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 110bfef5ff51ecaf9582e755e662276a4c1cda34
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Feb 17 17:02:41 2011 +0100

    Reordered cdbs sequence to run jh_installlibs earlier

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

Summary of changes:
 debian/changelog |    1 +
 javahelper.mk    |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8c121f..64da904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ javatools (0.33) unreleased; urgency=low
   * Used gcj-jdk instead of java-gcj-compat-dev in jh_makepkg.
   * Put the JDK dependency in Build-Depends of the control files
     generated by jh_makepkg, since it is needed by the clean rule.
+  * Made cdbs run jh_installlibs before jh_manifest and jh_classpath.
 
  -- Matthew Johnson <mjj29 at debian.org>  Sun, 05 Sep 2010 15:56:31 +0000
 
diff --git a/javahelper.mk b/javahelper.mk
index afa30d0..5935d99 100644
--- a/javahelper.mk
+++ b/javahelper.mk
@@ -1,5 +1,5 @@
 # Copyright © 2009 Matthew Johnson <mjj29 at debian.org>
-# Description: A class to build qmake packages
+# Description: A class to build java packages
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -44,9 +44,9 @@ clean::
 $(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
 	jh_installjavadoc -p$(cdbs_curpkg) $(JH_INSTALLJAVADOC_ARGS)
 $(patsubst %,binary-post-install/%,$(DEB_ALL_PACKAGES)) :: binary-post-install/%:
+	jh_installlibs -p$(cdbs_curpkg) $(JH_INSTALLLIBS_ARGS)
 	jh_classpath -p$(cdbs_curpkg) $(JH_CLASSPATH_ARGS)
 	jh_manifest -p$(cdbs_curpkg) $(JH_MANIFEST_ARGS)
-	jh_installlibs -p$(cdbs_curpkg) $(JH_INSTALLLIBS_ARGS)
 	jh_exec -p$(cdbs_curpkg) $(JH_EXEC_ARGS)
 	jh_depends -p$(cdbs_curpkg) $(JH_DEPENDS_ARGS)
 


hooks/post-receive
-- 
UNNAMED PROJECT