r2468 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-09-18 05:24:37 +0000 (Mon, 18 Sep 2006)
New Revision: 2468

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
- debian/rules: Adjusted list of license files to delete.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-09-17 16:06:38 UTC (rev 2467)
+++ trunk/eclipse/debian/changelog	2006-09-18 05:24:37 UTC (rev 2468)
@@ -29,6 +29,7 @@
     - libswt3.1-gtk-gcj.install, libswt3.1-gtk-gcj.postrm, libswt3.1-gtk-gcj.postinst,
       libswt3.1-gtk-java.install, libswt3.1-gtk-jni.dirs, libswt3.1-gtk-jni.install:
       Removed.
+    - debian/rules: Adjusted list of license files to delete.
       (Thanks to Vladimir Lapacek for patches for Tomcat 5.5 integration)
   * extra/package-links.txt, extra/links.txt: Link tomcat 5.5 jars.
   * debian/rules: Changed list of patches to apply. Updated to version numbers.
@@ -37,7 +38,7 @@
     com.ibm.icu.base_3.4.4.1.jar into the source-tree.
   * debian/extra/ecj-gcj.1, debian/extra/ecj-java.1: Fixed manpage name.
 
- -- Michael Koch <konqueror at gmx.de>  Sun, 17 Sep 2006 13:49:08 +0000
+ -- Michael Koch <konqueror at gmx.de>  Mon, 18 Sep 2006 05:22:34 +0000
 
 eclipse (3.1.2-3) experimental; urgency=low
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-09-17 16:06:38 UTC (rev 2467)
+++ trunk/eclipse/debian/rules	2006-09-18 05:24:37 UTC (rev 2468)
@@ -482,11 +482,13 @@
 	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/*.bat
 	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/runant.*
 	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/complete-ant-cmd.pl
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/LICENSE.dom.txt
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/LICENSE.sax.txt
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.tomcat_*/mx4j.license
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_$(UPSTREAM_VERSION)/src/org.apache.ant_*/LICENSE.sax.txt
-	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_$(UPSTREAM_VERSION)/src/org.eclipse.tomcat_*/mx4j.license
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/about_files/LICENSE.dom.txt
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/about_files/LICENSE.sax.txt
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.tomcat_*/about_files/mx4j.license
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.source_*/src/org.eclipse.jdt.apt.core_*/mirror-api-license.txt
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_*/src/org.apache.ant_*/about_files/LICENSE.sax.txt
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.platform.source_*/src/org.eclipse.tomcat_*/mx4j.license
+	rm -f $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.rcp.source.linux.gtk.x86_*/src/org.eclipse.swt.gtk.linux.x86_*/about_files/pixman-licenses.txt
 	
 	# Move architecture dependent files from ECLIPSE_HOME into
 	# ECLIPSE_ARCH. All non-moved files will be symlinked instead.