[pkg-java] r12614 - trunk/icu4j-4.2/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-06-21 17:28:15 +0000 (Mon, 21 Jun 2010)
New Revision: 12614

Added:
   trunk/icu4j-4.2/debian/clean
   trunk/icu4j-4.2/debian/eclipse.environment
   trunk/icu4j-4.2/debian/libicu4j-4.2-java.install
Removed:
   trunk/icu4j-4.2/debian/icu4j-4.2.jlibs
   trunk/icu4j-4.2/debian/links
Modified:
   trunk/icu4j-4.2/debian/rules
Log:
Correcting the build.

Added: trunk/icu4j-4.2/debian/clean
===================================================================
--- trunk/icu4j-4.2/debian/clean	                        (rev 0)
+++ trunk/icu4j-4.2/debian/clean	2010-06-21 17:28:15 UTC (rev 12614)
@@ -0,0 +1,2 @@
+com.ibm.icu.base.jar
+com.ibm.icu.jar

Added: trunk/icu4j-4.2/debian/eclipse.environment
===================================================================
--- trunk/icu4j-4.2/debian/eclipse.environment	                        (rev 0)
+++ trunk/icu4j-4.2/debian/eclipse.environment	2010-06-21 17:28:15 UTC (rev 12614)
@@ -0,0 +1,7 @@
+build.*
+eclipse*
+*.html
+localespi
+META-INF
+src
+*.txt

Deleted: trunk/icu4j-4.2/debian/icu4j-4.2.jlibs
===================================================================
--- trunk/icu4j-4.2/debian/icu4j-4.2.jlibs	2010-06-21 17:13:55 UTC (rev 12613)
+++ trunk/icu4j-4.2/debian/icu4j-4.2.jlibs	2010-06-21 17:28:15 UTC (rev 12614)
@@ -1,2 +0,0 @@
-com.ibm.icu.jar
-com.ibm.icu.base.jar

Added: trunk/icu4j-4.2/debian/libicu4j-4.2-java.install
===================================================================
--- trunk/icu4j-4.2/debian/libicu4j-4.2-java.install	                        (rev 0)
+++ trunk/icu4j-4.2/debian/libicu4j-4.2-java.install	2010-06-21 17:28:15 UTC (rev 12614)
@@ -0,0 +1,2 @@
+com.ibm.icu.jar usr/share/java
+com.ibm.icu.base.jar usr/share/java

Deleted: trunk/icu4j-4.2/debian/links
===================================================================
--- trunk/icu4j-4.2/debian/links	2010-06-21 17:13:55 UTC (rev 12613)
+++ trunk/icu4j-4.2/debian/links	2010-06-21 17:28:15 UTC (rev 12614)
@@ -1 +0,0 @@
-/usr/share/java/com.ibm.icu.jar /usr/share/java/icu4j.jar

Modified: trunk/icu4j-4.2/debian/rules
===================================================================
--- trunk/icu4j-4.2/debian/rules	2010-06-21 17:13:55 UTC (rev 12613)
+++ trunk/icu4j-4.2/debian/rules	2010-06-21 17:28:15 UTC (rev 12614)
@@ -3,14 +3,15 @@
 export JAVA_HOME:=/usr/lib/jvm/default-java/
 
 %:
-	dh $@ --with javahelper
+	dh $@
 
 override_dh_auto_build:
-	mkdir debian/.eclipse-build
-	cp -a build.properties  build.xml   eclipse* *.html  localespi  META-INF  src  *.txt debian/.eclipse-build
+	# Use the eclipse helper to create an environment - this build does not
+	# clean up "sanely" after itself.
+	jh_setupenvironment
 	cd debian/.eclipse-build &&  ant -Dicu4j.javac.source=1.5 -Dicu4j.javac.target=1.5 \
 	   eclipseProjects eclipseCoreProject eclipseWrapperProject
 	cd debian/.eclipse-build && ant -f $(CURDIR)/debian/build.xml build-jars
 
 override_dh_auto_clean:
-	rm -fr debian/.eclipse-build
+	jh_clean