[SCM] UNNAMED PROJECT branch, policy-dc10, updated. 0.30-52-ga0a89af

[Matthew Johnson]

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, policy-dc10 has been updated
       via  a0a89afdee5c5050b56bab7266d90f4b99e61c78 (commit)
       via  c7b4a4cb1afcfb6cfc5b1a5277f6d69f8cfa386b (commit)
      from  c04e9eeb79e8a271041291189be17ddf061e0208 (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 a0a89afdee5c5050b56bab7266d90f4b99e61c78
Merge: c7b4a4c c04e9ee
Author: Matthew Johnson <mjj29 at qadesh.matthew.ath.cx>
Date:   Sun Aug 8 21:24:13 2010 +0100

    Merge branch 'policy-dc10' of ssh://mjj29@alioth/git/pkg-java/javatools into policy-dc10

commit c7b4a4cb1afcfb6cfc5b1a5277f6d69f8cfa386b
Author: Matthew Johnson <mjj29 at qadesh.matthew.ath.cx>
Date:   Sun Aug 8 21:23:05 2010 +0100

    Add current version of library deps to dependency list as >=

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

Summary of changes:
 debian/changelog |    3 ++-
 jh_depends       |    8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 585d88d..91b0597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ javatools (0.33~1) experimental; urgency=low
   * Implement policy changes from DC10
     - Install jars with soname symlinks and postinst/prerm snippets for
     handling them
+  * Add current version of library deps to dependency list as >=
 
- -- Matthew Johnson <mjj29 at debian.org>  Sun, 08 Aug 2010 20:15:47 +0100
+ -- Matthew Johnson <mjj29 at debian.org>  Sun, 08 Aug 2010 21:10:27 +0100
 
 javatools (0.32) unstable; urgency=low
 
diff --git a/jh_depends b/jh_depends
index 1bce83c..b3bbfea 100755
--- a/jh_depends
+++ b/jh_depends
@@ -157,9 +157,11 @@ for p in $PACKAGES; do
       for j in $PACKAGES; do
 			if ! grep "$j" <<< "$EXCLUDES" > /dev/null; then
 				if [ -n "$VERBOSE" ]; then
-					echo "Checking: " $OLDDIR/debian/$j$realjar
+					echo "Checking: " $OLDDIR/debian/$j/.../`basename "$realjar"`
 				fi
-				if [ -f $OLDDIR/debian/$j$realjar ]; then
+				if [ -f "$OLDDIR/debian/$j/$realjar" ]; then
+					LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
+				elif [ -f "$OLDDIR/debian/$j/usr/share/java/$realjar" ]; then
 					LOCALDEBDEPS="$LOCALDEBDEPS $j (>= \${source:Version})"
 				else 
 					NEWJARDEPS="$NEWJARDEPS $realjar"
@@ -181,7 +183,7 @@ for p in $PACKAGES; do
 		if grep "$d" <<< "$EXCLUDES" > /dev/null; then
 			echo "Excluding package $d from depends"
 		else
-			REALDEBDEPS="$REALDEBDEPS $d"
+			REALDEBDEPS="$REALDEBDEPS $d (>= `grep-status -P "$d" -s Version -n`)"
 		fi
 	done
 	DEBDEPS="$LOCALDEBDEPS $REALDEBDEPS"


hooks/post-receive
-- 
UNNAMED PROJECT