Author: twerner Date: 2008-04-03 22:46:08 +0000 (Thu, 03 Apr 2008) New Revision: 6084
Added: branches/libjdic-java/openjdk/ Modified: branches/libjdic-java/openjdk/debian/changelog branches/libjdic-java/openjdk/debian/control branches/libjdic-java/openjdk/debian/rules Log: copy openjdk changes to separate branch Copied: branches/libjdic-java/openjdk (from rev 6080, trunk/libjdic-java) Modified: branches/libjdic-java/openjdk/debian/changelog =================================================================== --- trunk/libjdic-java/debian/changelog 2008-04-03 10:50:31 UTC (rev 6080) +++ branches/libjdic-java/openjdk/debian/changelog 2008-04-03 22:46:08 UTC (rev 6084) @@ -1,3 +1,10 @@ +libjdic-java (0.0.20060613-9) UNRELEASED; urgency=low + + * Switch to openjdk-6. + * Move package to main. + + -- Torsten Werner <[EMAIL PROTECTED]> Thu, 03 Apr 2008 14:24:13 +0200 + libjdic-java (0.0.20060613-8) unstable; urgency=low * libjdic-bin: install JNI libraries into /usr/lib/jni Modified: branches/libjdic-java/openjdk/debian/control =================================================================== --- trunk/libjdic-java/debian/control 2008-04-03 10:50:31 UTC (rev 6080) +++ branches/libjdic-java/openjdk/debian/control 2008-04-03 22:46:08 UTC (rev 6084) @@ -1,11 +1,11 @@ Source: libjdic-java -Section: contrib/libs +Section: libs Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL PROTECTED]> Build-Depends: cdbs, debhelper (>= 5), quilt, ant, pkg-config, libgnome2-dev, libgtk2.0-dev, libxt-dev, libxul-dev, libx11-dev -Build-Depends-Indep: sun-java5-jdk, libnetx-java +Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk, libnetx-java Standards-Version: 3.7.3 Homepage: https://jdic.dev.java.net/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjdic-java/ @@ -14,7 +14,8 @@ Package: libjdic-java Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, - sun-java5-jre | java1-runtime | java2-runtime, libjdic-bin (>= ${source:Version}) + openjdk-6-jre | sun-java5-jre | java1-runtime | java2-runtime, + libjdic-bin (>= ${source:Version}) Description: JDesktop Integration Components The JDesktop Integration Components (JDIC) project aims to make Java technology-based applications ("Java applications") first-class Modified: branches/libjdic-java/openjdk/debian/rules =================================================================== --- trunk/libjdic-java/debian/rules 2008-04-03 10:50:31 UTC (rev 6080) +++ branches/libjdic-java/openjdk/debian/rules 2008-04-03 22:46:08 UTC (rev 6084) @@ -12,8 +12,13 @@ common-binary-indep:: debian/stamp-binary-indep debian/stamp-binary-indep: - JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun CLASSPATH=/usr/share/java/netx.jar \ - ant -f jdic/build.xml buildunixjar javadoc builddemo + if [ -d /usr/lib/jvm/java-6-openjdk ]; then \ + JAVA_HOME=/usr/lib/jvm/java-6-openjdk; \ + else \ + JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun; \ + fi; \ + export JAVA_HOME; \ + CLASSPATH=/usr/share/java/netx.jar ant -f jdic/build.xml buildunixjar javadoc builddemo touch $@ common-binary-arch:: debian/stamp-binary-arch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
