[pkg-java] r6349 - trunk/libjaxp1.2-java/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-04-29 21:55:24 +0000 (Tue, 29 Apr 2008)
New Revision: 6349

Modified:
   trunk/libjaxp1.2-java/debian/
   trunk/libjaxp1.2-java/debian/changelog
   trunk/libjaxp1.2-java/debian/control
   trunk/libjaxp1.2-java/debian/rules
Log:
libjaxp1.2-java (1.2.01-3) unstable; urgency=low

  * Build-Depends on default-jdk-builddep. Closes: #477883
  * Added myself to Uploaders.
  * Updated Standards-Version to 3.7.3.
  * Added Homepage, Vcs-Svn and Vcs-Browser fields.

 -- Michael Koch <konqueror at gmx.de>  Tue, 29 Apr 2008 18:47:59 -0100




Property changes on: trunk/libjaxp1.2-java/debian
___________________________________________________________________
Name: svn:ignore
   + files
build-stamp
libjaxp1.2-java
libjaxp1.2-java-gcj
*.debhelper
*.debhelper.log
*.substvars


Modified: trunk/libjaxp1.2-java/debian/changelog
===================================================================
--- trunk/libjaxp1.2-java/debian/changelog	2008-04-29 21:54:58 UTC (rev 6348)
+++ trunk/libjaxp1.2-java/debian/changelog	2008-04-29 21:55:24 UTC (rev 6349)
@@ -1,3 +1,12 @@
+libjaxp1.2-java (1.2.01-3) unstable; urgency=low
+
+  * Build-Depends on default-jdk-builddep. Closes: #477883
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.7.3.
+  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+
+ -- Michael Koch <konqueror at gmx.de>  Tue, 29 Apr 2008 18:47:59 -0100
+
 libjaxp1.2-java (1.2.01-2) unstable; urgency=low
 
   * Merge from Ubuntu:

Modified: trunk/libjaxp1.2-java/debian/control
===================================================================
--- trunk/libjaxp1.2-java/debian/control	2008-04-29 21:54:58 UTC (rev 6348)
+++ trunk/libjaxp1.2-java/debian/control	2008-04-29 21:55:24 UTC (rev 6349)
@@ -2,9 +2,12 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Matthias Klose <doko at ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 4.1.0), java-gcj-compat-dev (>= 1.0.65-6)
-Standards-Version: 3.7.2
+Uploaders: Stefan Gybas <sgybas at debian.org>, Matthias Klose <doko at ubuntu.com>, Michael Koch <konqueror at gmx.de>
+Build-Depends: cdbs, debhelper (>= 4.1.0), default-jdk-builddep
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjaxp1.2-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxp1.2-java
+Homepage: http://java.sun.com/xml/jaxp/index.jsp
 
 Package: libjaxp1.2-java
 Architecture: all
@@ -21,8 +24,6 @@
  .
  These classes are also used in Sun's reference implementation. A GPL'ed
  implementation of these APIs can be found in the libgnujaxp-java package.
- .
- Sun's JAXP home page: http://java.sun.com/xml/jaxp/index.jsp
 
 Package: libjaxp1.2-java-gcj
 Architecture: any

Modified: trunk/libjaxp1.2-java/debian/rules
===================================================================
--- trunk/libjaxp1.2-java/debian/rules	2008-04-29 21:54:58 UTC (rev 6348)
+++ trunk/libjaxp1.2-java/debian/rules	2008-04-29 21:55:24 UTC (rev 6349)
@@ -8,7 +8,7 @@
   with_gcj_native := yes
 endif
 
-JAVA_HOME:=/usr/lib/jvm/java-gcj
+JAVA_HOME:=/usr/lib/jvm/default-java
 
 clean::
 	rm -rf build debian/build-stamp
@@ -17,9 +17,6 @@
 debian/build-stamp:
 	mkdir -p build/license
 
-	# An alternative would be to build the classes using GCJ
-	#gcj -C -O2 -d build `find javax org -name \*.java`
-	#jikes -bootclasspath /usr/share/classpath/glibj.zip -d build `find javax org -name \*.java`
 	$(JAVA_HOME)/bin/javac -d build `find javax org -name \*.java`
 	cp LICENSE.*.txt README.*.txt build/license
 	cd build && $(JAVA_HOME)/bin/jar -c -m ../manifest.commons -f jaxp-1.2.jar javax license org