[pkg-java] r11215 - trunk/tijmp/debian

[Onkar Shinde]

Author: onkarshinde-guest
Date: 2009-12-08 05:36:49 +0000 (Tue, 08 Dec 2009)
New Revision: 11215

Modified:
   trunk/tijmp/debian/changelog
   trunk/tijmp/debian/control
   trunk/tijmp/debian/rules
Log:
merged ubuntu changes

Modified: trunk/tijmp/debian/changelog
===================================================================
--- trunk/tijmp/debian/changelog	2009-12-07 20:18:15 UTC (rev 11214)
+++ trunk/tijmp/debian/changelog	2009-12-08 05:36:49 UTC (rev 11215)
@@ -1,3 +1,15 @@
+tijmp (0.8+dfsg-2) unstable; urgency=low
+
+  [ Onkar Shinde ]
+  * debian/control
+    - Replace build dependency openjdk-6-jdk with default-jdk.
+    - Add runtime dependency default-jre | java2-runtime.
+  * debian/rules
+    - Change JAVA_HOME to the value corresponding to default-jdk.
+    - Delete the setting of JAR variable. Not really needed.
+
+ -- Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>  Tue, 08 Dec 2009 10:46:27 +0530
+
 tijmp (0.8+dfsg-1) unstable; urgency=low
 
   * Moved to main.

Modified: trunk/tijmp/debian/control
===================================================================
--- trunk/tijmp/debian/control	2009-12-07 20:18:15 UTC (rev 11214)
+++ trunk/tijmp/debian/control	2009-12-08 05:36:49 UTC (rev 11215)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: cdbs, debhelper (>= 7), openjdk-6-jdk
+Build-Depends: cdbs, debhelper (>= 7), default-jdk
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/tijmp
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tijmp
@@ -12,7 +12,7 @@
 
 Package: tijmp
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java2-runtime
 Description: Profiler for Java to trace object and method timings
  TIJMP is a memory profiler for Java 6 or later. It is similar to the jmp memory
  profiler, but unlike it, works with Java 6 (using JVMTI).

Modified: trunk/tijmp/debian/rules
===================================================================
--- trunk/tijmp/debian/rules	2009-12-07 20:18:15 UTC (rev 11214)
+++ trunk/tijmp/debian/rules	2009-12-08 05:36:49 UTC (rev 11215)
@@ -4,10 +4,8 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
+DEB_CONFIGURE_SCRIPT_ENV += JAVA_HOME="/usr/lib/jvm/default-java"
 
-DEB_MAKE_INVOKE += JAR=/usr/lib/jvm/java-6-openjdk/bin/jar
-
 UPSTREAM_VERSION=$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/\+dfsg//' )
 
 WGET?=wget