[SCM] jigsaw packaging branch, master, updated. 0ddad19c4cfeb6633856f00d0553c7e1d80b11ad

[Guillaume Mazoyer]

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 "jigsaw packaging".

The branch, master has been updated
       via  0ddad19c4cfeb6633856f00d0553c7e1d80b11ad (commit)
       via  bf71b556ca1191470c4ce608953265e70c5925b0 (commit)
      from  da9a21503954aec806443d8076992def8a77e8e4 (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 0ddad19c4cfeb6633856f00d0553c7e1d80b11ad
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date:   Sun Aug 21 16:08:58 2011 +0200

    Also replace OpenJDK 6 dependency by OpenJDK 7.

commit bf71b556ca1191470c4ce608953265e70c5925b0
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date:   Sun Aug 21 15:58:28 2011 +0200

    Check that we use OpenJDK 7 to build Jigsaw.

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

Summary of changes:
 debian-wip/control |    2 +-
 debian-wip/rules   |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian-wip/control b/debian-wip/control
index ecbf370..fdf06ba 100644
--- a/debian-wip/control
+++ b/debian-wip/control
@@ -39,7 +39,7 @@ Build-Depends: ant,
                m4,
                mauve,
                metacity | twm,
-               openjdk-6-jdk (>= 6b18),
+               openjdk-7-jdk,
                pkg-config,
                procps,
                rhino (>= 1.7R3~),
diff --git a/debian-wip/rules b/debian-wip/rules
index 29d95db..76bebc1 100755
--- a/debian-wip/rules
+++ b/debian-wip/rules
@@ -13,6 +13,8 @@ unexport LD_LIBRARY_PATH
 
 dh_override_auto_configure:
 	$(MAKE) sanity
+	java -version 2>&1 | grep "java -version \"1.7" ; \
+	if [ $$? -eq 1 ] ; then echo "OpenJDK 7 needed to build" ; exit 1 ; fi
 
 dh_override_auto_build:
 	$(MAKE) all


hooks/post-receive
-- 
jigsaw packaging