CVS eclipse/debian

[Michael Koch]

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

Modified Files:
	changelog eclipse-ecj.install eclipse-ecj.links rules 
Log Message:
eclipse (3.1.1-2) unstable; urgency=low

  * eclipse-ecj: Fix dangling symlinks in /usr/share/ant/lib.
  * Move the dh_installdirs/dh_install calls from the binary targets
    to the install target. Fixes FTBFS when only building the architecture
    dependent packages.

  -- Matthias Klose <doko at debian.org>  Wed, 12 Oct 2005 14:02:50 +0200



--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/10/15 13:20:36	1.2
@@ -1,3 +1,12 @@
+eclipse (3.1.1-2) unstable; urgency=low
+
+  * eclipse-ecj: Fix dangling symlinks in /usr/share/ant/lib.
+  * Move the dh_installdirs/dh_install calls from the binary targets
+    to the install target. Fixes FTBFS when only building the architecture
+    dependent packages.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 12 Oct 2005 14:02:50 +0200
+
 eclipse (3.1.1-1) unstable; urgency=low
 
   * Upload to contrib, the remaining reason is tomcat5 beeing in contrib.
--- /cvsroot/pkg-java/eclipse/debian/eclipse-ecj.install	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-ecj.install	2005/10/15 13:20:36	1.2
@@ -1,3 +1,5 @@
+debian/tmp/usr/share/ant/lib/jdtCompilerAdapter.jar
+
 debian/tmp/usr/bin/ecj-java
 
 debian/tmp/usr/share/man/man1/ecj-java.1
--- /cvsroot/pkg-java/eclipse/debian/eclipse-ecj.links	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-ecj.links	2005/10/15 13:20:36	1.2
@@ -1,2 +1 @@
-usr/share/eclipse/plugins/org.eclipse.jdt.core_3.1.0/jdtcore.jar usr/share/ant/lib/jdtcore.jar
-usr/share/eclipse/plugins/org.eclipse.jdt.core_3.1.0/jdtCompilerAdapter.jar usr/share/ant/lib/jdtCompilerAdapter.jar
+usr/share/eclipse/plugins/org.eclipse.jdt.core_3.1.1.jar usr/share/ant/lib/jdtcore.jar
--- /cvsroot/pkg-java/eclipse/debian/rules	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/rules	2005/10/15 13:20:36	1.2
@@ -426,6 +426,11 @@
 	install -d $(DEBIAN_TMP)/$(ECLIPSE_HOME)
 	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
+	cd $(DEBIAN_TMP)/usr/share/ant/lib && \
+		jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_3.1.1.jar jdtCompilerAdapter.jar
+	
 	# Builds any Debian-specific extra files.
 	
 	mkdir -p $(BUILD_TREE)
@@ -618,15 +623,15 @@
 	done
 endif
 	
+	dh_installdirs
+	dh_install
+	
 	touch install-stamp
 	
 
 binary-indep: install-stamp
 	dh_testdir -i
 	dh_testroot -i
-	dh_installdirs -i
-	
-	dh_install -i
 	dh_installdocs -i
 	dh_installexamples -i
 	dh_installmenu -i
@@ -649,9 +654,9 @@
 	dh_testdir -a
 	dh_testroot -a
 	
-	dh_installdirs -a
-	dh_install -a
+ifeq ($(enable_native),yes)
 	$(MAKE) -f debian/rules generate-classmaps
+endif
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a