CVS eclipse/debian

[Michael Koch]

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

Modified Files:
	changelog eclipse-platform.install rules 
Log Message:
* debian/rules: Don't make /usr/lib/eclipse/features a symlink.
  Closes: #XXXXXX
* debian/eclipse-platform.install: Include only the non-source features.
* debian/rules: Handle eclipse architures with the same name as the
  according Debian architures correctly.
* debian/rules: Don't re-define CURDIR. It's defined by make.
* debian/rules: Don't overwrite LC_ALL. Not needed.


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/23 11:29:29	1.51
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2006/01/06 16:35:47	1.52
@@ -1,3 +1,15 @@
+eclipse (3.1.1-8) unstable; urgency=low
+
+  * debian/rules: Don't make /usr/lib/eclipse/features a symlink.
+    Closes: #XXXXXX
+  * debian/eclipse-platform.install: Include only the non-source features.
+  * debian/rules: Handle eclipse architures with the same name as the
+    according Debian architures correctly.
+  * debian/rules: Don't re-define CURDIR. It's defined by make.
+  * debian/rules: Don't overwrite LC_ALL. Not needed.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri,  6 Jan 2006 17:42:24 +0000
+
 eclipse (3.1.1-7) unstable; urgency=low
 
   [ Stephan Michels ]
--- /cvsroot/pkg-java/eclipse/debian/eclipse-platform.install	2005/11/05 00:02:01	1.2
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-platform.install	2006/01/06 16:35:48	1.3
@@ -8,7 +8,11 @@
 debian/tmp/usr/lib/eclipse/.eclipseproduct
 debian/tmp/usr/lib/eclipse/eclipse
 
-debian/tmp/usr/lib/eclipse/features
+debian/tmp/usr/lib/eclipse/features/org.eclipse.sdk_*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.jdt_*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.pde_*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.platform_*
+debian/tmp/usr/lib/eclipse/features/org.eclipse.rcp_*
 
 debian/tmp/usr/lib/eclipse/plugins/org.apache.ant_*
 debian/tmp/usr/lib/eclipse/plugins/org.apache.lucene_*
--- /cvsroot/pkg-java/eclipse/debian/rules	2005/12/23 11:29:29	1.20
+++ /cvsroot/pkg-java/eclipse/debian/rules	2006/01/06 16:35:48	1.21
@@ -3,9 +3,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-export LC_ALL=C
-CURDIR=$(shell pwd)
-
 DISTRIBUTION := $(shell lsb_release -is)
 
 BUILD_DEPS :=
@@ -31,7 +28,7 @@
     enable_native=yes
     ECLIPSE_PLATFORM=ppc
 endif
-ifeq ($(DEB_HOST_ARCH),)
+ifeq ($(ECLIPSE_PLATFORM),)
     enable_native=yes
     ECLIPSE_PLATFORM=$(DEB_HOST_ARCH)
 endif
@@ -596,6 +593,8 @@
 	cp $(EXTRA)/update-gcj-classmaps-eclipse.sh $(DEBIAN_TMP)/usr/sbin/update-gcj-classmaps-eclipse
 endif
 	
+	# Workaround breakage wiht /usr/lib/eclipse/feartures.
+	mkdir $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/features
 	
 	# Symlink all other files into ECLIPSE_ARCH. We do this by attempting
 	# to link each line of the 'find' output. This appears in parent-child