CVS eclipse/debian

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse/debian
In directory haydn:/tmp/cvs-serv27183

Modified Files:
	changelog eclipse-platform-common.install 
	eclipse-source.install rules 
Log Message:
Used the png icons, which are delivered with Eclipse.
Add missing features to the eclipse-source package. Closes: #336453


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/10/30 12:10:46	1.10
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/10/31 13:28:53	1.11
@@ -13,6 +13,8 @@
     - Updated debian/control, debian/extra/eclipse.sh
       and debian/patches/eclipse-libswt-mozilla-classic.dpatch
       to make it possible to use Firefox instead of Mozilla. Closes: #336285
+    - Used the png icons, which are delivered with Eclipse.
+    - Add missing features to the eclipse-source package. Closes: #336453
 
  -- Stephan Michels <stephan at apache.org>  Thu, 27 Oct 2005 19:08:02 +0200
 
--- /cvsroot/pkg-java/eclipse/debian/eclipse-platform-common.install	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-platform-common.install	2005/10/31 13:28:53	1.2
@@ -1,7 +1,7 @@
 debian/extra/java_home				etc/eclipse
 
 debian/tmp/usr/share/applications/eclipse.desktop
-build-tree/eclipse.png				usr/share/pixmaps
+debian/tmp/usr/share/pixmaps/eclipse*.png
 debian/tmp/usr/bin/eclipse
 
 debian/tmp/usr/share/eclipse/links
--- /cvsroot/pkg-java/eclipse/debian/eclipse-source.install	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-source.install	2005/10/31 13:28:53	1.2
@@ -1,9 +1,4 @@
-debian/tmp/usr/share/eclipse/features/org.eclipse.rcp.source_*
-debian/tmp/usr/share/eclipse/features/org.eclipse.platform.source_*
-debian/tmp/usr/share/eclipse/features/org.eclipse.jdt.source_*
-debian/tmp/usr/share/eclipse/features/org.eclipse.pde.source_*
-
-debian/tmp/usr/*/eclipse/plugins/org.eclipse.rcp.source*_*
-debian/tmp/usr/*/eclipse/plugins/org.eclipse.platform.source*_*
-debian/tmp/usr/*/eclipse/plugins/org.eclipse.jdt.source*_*
-debian/tmp/usr/*/eclipse/plugins/org.eclipse.pde.source*_*
+debian/tmp/usr/*/eclipse/*/org.eclipse.rcp.source*_*
+debian/tmp/usr/*/eclipse/*/org.eclipse.platform.source*_*
+debian/tmp/usr/*/eclipse/*/org.eclipse.jdt.source*_*
+debian/tmp/usr/*/eclipse/*/org.eclipse.pde.source*_*
--- /cvsroot/pkg-java/eclipse/debian/rules	2005/10/29 23:33:37	1.8
+++ /cvsroot/pkg-java/eclipse/debian/rules	2005/10/31 13:28:53	1.9
@@ -426,7 +426,7 @@
 	tar xzvf $(SOURCE_TREE)/result/*.tar.gz -C $(DEBIAN_TMP)/$(ECLIPSE_HOME)/..
 	
 	# extract the jdtCompilerAdapter.jar file
-	mkdir -p debian/tmp/usr/share/ant/lib
+	mkdir -p $(DEBIAN_TMP)/usr/share/ant/lib
 	cd $(DEBIAN_TMP)/usr/share/ant/lib && \
 		jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_3.1.1.jar jdtCompilerAdapter.jar
 	
@@ -436,13 +436,15 @@
 	
 	# Put debian version into about.mappings of org.eclipse.sdk to show it
 	# in Eclispe about dialog.
-	plugin_dir=debian/tmp/usr/share/eclipse/plugins/org.eclipse.sdk_3.1.1 ; \
+	plugin_dir=$(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_3.1.1 ; \
 	sed -e "s/\(0=.*\)/\1 ($(DISTRIBUTION) version: $(SOURCE_VERSION))/" < $$plugin_dir/about.mappings > $$plugin_dir/about.mappings.tmp ; \
 	mv $$plugin_dir/about.mappings.tmp $$plugin_dir/about.mappings
 	
 	# Extract our icon. It is uuencoded because binary files cannot be
 	# included in a source package.
-	uudecode -o $(BUILD_TREE)/eclipse.png $(EXTRA)/eclipse.png.uu
+	#uudecode -o $(BUILD_TREE)/eclipse.png $(EXTRA)/eclipse.png.uu
+	mkdir -p $(DEBIAN_TMP)/usr/share/pixmaps
+	cp $(SOURCE_TREE)/plugins/org.eclipse.platform/eclipse*.png $(DEBIAN_TMP)/usr/share/pixmaps/
 	
 	# A pure native binary. This reduces startup time in the normal case.
 ifeq ($(enable_native),yes)