CVS eclipse/debian

[Michael Koch]

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

Modified Files:
	changelog eclipse-platform-common.install rules 
Added Files:
	eclipse-platform-common.menu 
Log Message:
* eclipse-platform-common.install, eclipse-platform-common.menu, rules,
  extra/eclipse.desktop, extra/eclipse32.xpm: Implemented menu entry for
  X11 desktops the Debian way. Closes: #343114


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/15 22:50:44	1.42
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/17 23:23:43	1.43
@@ -16,12 +16,15 @@
     is the same as the eclipse arch name. Closes: #342579
   * debian/control.in: libswt3.1-gtk-java: Alternatively Depends on firefox
     (>= 1.4.99). Closes: 342505
-  * debian/control.in: eclipse-pde-common: Don't depend on eclipse-pde
-    (Closes: #341854).
+  * debian/control.in: eclipse-pde-common: Don't depend on eclipse-pde.
+    Closes: #341854
   * debian/control.in: eclipse-platform-common: Don't depend on
     eclise-platform-common.
+  * eclipse-platform-common.install, eclipse-platform-common.menu, rules,
+    extra/eclipse.desktop, extra/eclipse32.xpm: Implemented menu entry for
+    X11 desktops the Debian way. Closes: #343114
 
- -- Michael Koch <konqueror at gmx.de>  Thu, 15 Dec 2005 23:50:22 +0000
+ -- Michael Koch <konqueror at gmx.de>  Sun, 18 Dec 2005 00:26:28 +0000
 
 eclipse (3.1.1-6) unstable; urgency=low
 
--- /cvsroot/pkg-java/eclipse/debian/eclipse-platform-common.install	2005/10/31 13:28:53	1.2
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-platform-common.install	2005/12/17 23:23:43	1.3
@@ -1,7 +1,7 @@
 debian/extra/java_home				etc/eclipse
 
-debian/tmp/usr/share/applications/eclipse.desktop
 debian/tmp/usr/share/pixmaps/eclipse*.png
+debian/tmp/usr/share/pixmaps/eclipse32.xpm
 debian/tmp/usr/bin/eclipse
 
 debian/tmp/usr/share/eclipse/links
--- /cvsroot/pkg-java/eclipse/debian/rules	2005/12/15 09:59:16	1.16
+++ /cvsroot/pkg-java/eclipse/debian/rules	2005/12/17 23:23:44	1.17
@@ -459,7 +459,6 @@
 	
 	# 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
 	mkdir -p $(DEBIAN_TMP)/usr/share/pixmaps
 	cp $(SOURCE_TREE)/plugins/org.eclipse.platform/eclipse*.png $(DEBIAN_TMP)/usr/share/pixmaps/
 	
@@ -575,12 +574,12 @@
 	# Install extra Debian-specific Eclipse files into our installation
 	# directory. We don't use dh_install to do this purely for
 	# organization.
-	mkdir -p                                    $(DEBIAN_TMP)/usr/share/applications/
-	cp $(EXTRA)/eclipse.desktop                 $(DEBIAN_TMP)/usr/share/applications/eclipse.desktop
 	mkdir -p                                    $(DEBIAN_TMP)/usr/bin/
 	cp $(EXTRA)/eclipse.sh                      $(DEBIAN_TMP)/usr/bin/eclipse
 	cp $(EXTRA)/ecj.sh                          $(DEBIAN_TMP)/usr/bin/ecj-java
 	cp $(EXTRA)/efj.sh                          $(DEBIAN_TMP)/usr/bin/efj
+	mkdir -p                                    $(DEBIAN_TMP)/usr/share/pixmaps/
+	cp $(EXTRA)/eclipse32.xpm                   $(DEBIAN_TMP)/usr/share/pixmaps/eclipse32.xpm
 	mkdir -p                                    $(DEBIAN_TMP)/usr/share/man/man1/
 	cp $(EXTRA)/ecj.1                           $(DEBIAN_TMP)/usr/share/man/man1/ecj-java.1
 	mkdir -p                                    $(DEBIAN_TMP)/$(ECLIPSE_HOME)/links/