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

[Matthias Klose]

Author: doko
Date: 2007-05-03 12:10:16 +0000 (Thu, 03 May 2007)
New Revision: 3388

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/eclipse.install
   trunk/eclipse/debian/rules
Log:
  [ Michael Koch ]
  * Sparc build fixes.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2007-05-02 16:07:35 UTC (rev 3387)
+++ trunk/eclipse/debian/changelog	2007-05-03 12:10:16 UTC (rev 3388)
@@ -1,5 +1,7 @@
-eclipse (3.2.2-1) unstable; urgency=low
+eclipse (3.2.2-1) UNRELEASED; urgency=low
 
+  [ Michael Koch ]
+  * Sparc build fixes.
   * debian/extras/java_home: Added paths for SUN JDK 6.
     Closes: #415712, #418877.
 

Modified: trunk/eclipse/debian/eclipse.install
===================================================================
--- trunk/eclipse/debian/eclipse.install	2007-05-02 16:07:35 UTC (rev 3387)
+++ trunk/eclipse/debian/eclipse.install	2007-05-03 12:10:16 UTC (rev 3388)
@@ -4,7 +4,7 @@
 debian/tmp/usr/share/pixmaps/eclipse32.xpm
 debian/tmp/usr/bin/eclipse
 
-debian/tmp/usr/lib/eclipse/eclipse
+source-tree/launchertmp/eclipse usr/lib/eclipse
 
 debian/tmp/usr/share/applications/eclipse.desktop
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2007-05-02 16:07:35 UTC (rev 3387)
+++ trunk/eclipse/debian/rules	2007-05-03 12:10:16 UTC (rev 3388)
@@ -246,6 +246,8 @@
 	@cd $(SOURCE_TREE)/baseLocation/plugins; \
 	tar xfj ../../../$(SOURCE_JSCH); \
 
+	find $(SOURCE_TREE) -name eclipse -type f -print | xargs rm -f
+
 	touch uncompress-stamp
 
 ifeq ($(with_dpatch),yes)
@@ -345,6 +347,7 @@
 	# the ia64 strings with ppc64 or s390(x)
 	for f in $$(find source-tree -name \*ia64\* | grep -v motif | grep -v ia64_32); do \
 		mv $$f $$(echo $$f | sed "s/ia64/$(ECLIPSE_PLATFORM)/") ; \
+		find $$(echo $$f | sed "s/ia64/$(ECLIPSE_PLATFORM)/") -name eclipse -type f -print | xargs rm -f ; \
 	done
 	find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64_32/@eye-eh-64_32@/g" "{}" \;
 	find source-tree -type f ! -name \*.java -a ! -name feature.xml -exec sed --in-place "s/ia64/$(ECLIPSE_PLATFORM)/g" "{}" \;