From: R. Steve McKown Date: Fri, 9 Mar 2012 18:01:35 +0000 (-0700) Subject: Accept openjdk as acceptable dependency X-Git-Tag: debian/1.3.2-2tmi X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=nesc.git;a=commitdiff_plain;h=61d8eb7ff0a42b22277a9f66dd43d28cc28add40 Accept openjdk as acceptable dependency --- diff --git a/debian/changelog b/debian/changelog index 07c57f5..1219c18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +nesc (1.3.2-2tmi) hardy; urgency=low + + * Accept openjdk-6-jdk or openjdk-6-jre as acceptable java dependencies + + -- TMI Packages Fri, 09 Mar 2012 11:00:44 -0600 + nesc (1.3.2-1tmi) hardy; urgency=low * Update to nesc-1.3.2 diff --git a/debian/control b/debian/control index a184b38..f1cc252 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: devel Priority: optional Maintainer: TMI Packages Standards-Version: 3.7.2.0 -Build-Depends: dpkg-dev (>= 1.13.9), autoconf (>= 2.13), bison, flex, gettext, texinfo, binutils (>= 2.9.5.0.12), gcc (>= 4:4.2.2), dejagnu (>= 1.4.2-1.1), dpatch, file, bzip2, lsb-release, sun-java5-jdk|sun-java6-jdk +Build-Depends: dpkg-dev (>= 1.13.9), autoconf (>= 2.13), bison, flex, gettext, texinfo, binutils (>= 2.9.5.0.12), gcc (>= 4:4.2.2), dejagnu (>= 1.4.2-1.1), dpatch, file, bzip2, lsb-release, sun-java5-jdk|sun-java6-jdk|openjdk-6-jre|openjdk-6-jdk Package: nesc Architecture: any -Depends: perl, graphviz, sun-java5-jre|sun-java6-jre, sun-java5-bin|sun-java6-bin, sun-java5-jdk|sun-java6-jdk, ${shlibs:Depends} +Depends: perl, graphviz, sun-java5-jre|sun-java6-jre, sun-java5-bin|sun-java6-bin, sun-java5-jdk|sun-java6-jdk|openjdk-6-jre|openjdk-6-jdk, ${shlibs:Depends} Conflicts: gcj Priority: extra Description: This is the nesC compiler used to compile TinyOS applications