[pkg-java] r9387 - trunk/eclipse/debian

[Matthias Klose]

Author: doko
Date: 2009-07-24 09:31:17 +0000 (Fri, 24 Jul 2009)
New Revision: 9387

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
* Build for unstable.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2009-07-23 19:10:40 UTC (rev 9386)
+++ trunk/eclipse/debian/changelog	2009-07-24 09:31:17 UTC (rev 9387)
@@ -1,13 +1,34 @@
-eclipse (3.4.1-1~exp1) UNRELEASED; urgency=low
+eclipse (3.4.1-1) unstable; urgency=low
 
+  * Build for unstable.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 24 Jul 2009 10:13:56 +0200
+
+eclipse (3.4.1-0ubuntu3) karmic; urgency=low
+
+  * Work around strip failure on lpia.
+  * Fix build failure for "unsupported" eclipse platforms.
+
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 24 Jul 2009 10:02:24 +0200
+
+eclipse (3.4.1-0ubuntu2) karmic; urgency=low
+
+  * debian/rules
+    - Replace occurances of default-java with java-6-openjdk. Fixes FTBFS.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Tue, 14 Jul 2009 07:48:05 +0530
+
+eclipse (3.4.1-0ubuntu1) karmic; urgency=low
+
   * Fix build dependencies.
   * Disable building the -gcj packages (not updated for 3.4.x).
-  * TODO's before uploading to a distribution:
+  * TODO's before releasing with a distribution:
     - Clean tarball (no binaries included, no third party libs included).
     - Add OSGi information to required build dependencies.
     - Build using dependencies from the distribution repository.
+    - Depend on the third party libraries shipped with the distribution,
+      don't include the copies included in eclipse.
     - Disable the eclipse updater for components shipped with the distribution.
-  * Remove everybody from the uploaders control field.
 
  -- Matthias Klose <doko at ubuntu.com>  Sun, 28 Jun 2009 12:18:44 +0200
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2009-07-23 19:10:40 UTC (rev 9386)
+++ trunk/eclipse/debian/rules	2009-07-24 09:31:17 UTC (rev 9387)
@@ -317,7 +317,7 @@
 	## Nasty hack to get support for ppc64, s390{,x}, sparc{,64} and hppa
 	# there is only partial support for ppc64 in 3.3 so we have to remove this 
 	# partial support to get the replacemnt hack to work
-	find source-tree -name \*ppc64\* | xargs rm -r
+	find source-tree -name \*ppc64\* | xargs -r rm -r
 	# remove ppc64 support from features/org.eclipse.platform.source/feature.xml
 	# replace ppc64 with a fake arch (ppc128) so we don't have duplicate ant targets
 	find source-tree -type f -name \*.xml -exec sed --in-place "s/\(rootFileslinux_gtk_\)ppc64/\1ppc128/g" "{}" \;
@@ -364,7 +364,7 @@
 	# Update build ids in configuration files
 	cd $(SOURCE_TREE) && \
 	$(ECJ_ANT_RUN) \
-		-Djava5.home=/usr/lib/jvm/default-java \
+		-Djava5.home=/usr/lib/jvm/java-6-openjdk \
 		-Dnobootstrap=true \
 		-DinstallOs=linux \
 		-DinstallWs=gtk \
@@ -385,13 +385,13 @@
 	# components as well.
 	cd $(SOURCE_TREE) && \
 	$(ECJ_ANT_RUN) \
-		-Djava5.home=/usr/lib/jvm/default-java \
+		-Djava5.home=/usr/lib/jvm/java-6-openjdk \
 		-Dnobootstrap=true \
 		-DinstallOs=linux \
 		-DinstallWs=gtk \
 		-DinstallArch=$(ECLIPSE_PLATFORM) \
 		-Dlibsconfig=true \
-		-DJavaSE-1.6=/usr/lib/jvm/default-java/jre/lib/rt.jar \
+		-DJavaSE-1.6=/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar \
 		compile
 	# Build done
 
@@ -406,7 +406,7 @@
 	# debugging purposes: it takes a long time.
 	cd $(SOURCE_TREE) && \
 	$(ECJ_ANT_RUN) \
-		-Djava5.home=/usr/lib/jvm/default-java \
+		-Djava5.home=/usr/lib/jvm/java-6-openjdk \
 		-Dconfiguration=linux.gtk.$(ECLIPSE_PLATFORM) \
 		-DinstallOs=linux \
 		-DinstallWs=gtk \
@@ -591,7 +591,11 @@
 	dh_link
 	dh_fixperms
 
+ifeq ($(DEB_HOST_ARCH),lpia)
+	dh_strip -Xlibswt-gnome-gtk
+else
 	dh_strip
+endif
 	dh_compress
 	dh_makeshlibs
 	dpkg-shlibdeps \