r1883 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-02-09 05:17:41 +0000 (Thu, 09 Feb 2006)
New Revision: 1883

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/eclipse-jdt-gcj.install
   trunk/eclipse/debian/eclipse-pde-gcj.install
   trunk/eclipse/debian/eclipse-platform-gcj.install
   trunk/eclipse/debian/eclipse-rcp-gcj.install
Log:
Include the native jars in the *-gcj packages. Prepare for upload.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-08 21:14:19 UTC (rev 1882)
+++ trunk/eclipse/debian/changelog	2006-02-09 05:17:41 UTC (rev 1883)
@@ -1,4 +1,4 @@
-eclipse (3.1.2-1) UNRELEASED; urgency=low
+eclipse (3.1.2-1) unstable; urgency=low
 
   [ Stephan Michels ]
   * New upstream version. Release notes:
@@ -40,12 +40,15 @@
   * debian/control.in: Remove ${shlibs:Depends} on most *-gcj packages.
   * debian/rules: Determine upstream version and use a variable containing it
     everywhere.
+  * debian/eclipse-jdt-gcj.install, debian/eclipse-pde-gcj.install,
+    debian/eclipse-platform-gcj.install, debian/eclipse-rcp-gcj.install:
+    Include the native jars in the *-gcj packages.
   * Added watch file.
 
   [ Matthias Klose ]
   * Add support to build using firefox-dev (turned off by default).
 
- -- Michael Koch <konqueror at gmx.de>  Wed,  8 Feb 2006 20:18:43 +0000
+ -- Michael Koch <konqueror at gmx.de>  Thu,  9 Feb 2006 06:23:00 +0000
 
 eclipse (3.1.1-8) unstable; urgency=low
 

Modified: trunk/eclipse/debian/eclipse-jdt-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.install	2006-02-08 21:14:19 UTC (rev 1882)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.install	2006-02-09 05:17:41 UTC (rev 1883)
@@ -1,11 +1,11 @@
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ant.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.debug.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.launching_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.debug_*/jdi.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.debug_*/jdimodel.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jdt.junit_*/junitsupport.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.junit_*
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ant.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.debug.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.launching_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.debug_*/jdi.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.debug_*/jdimodel.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jdt.junit_*/junitsupport.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.junit_*

Modified: trunk/eclipse/debian/eclipse-pde-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-pde-gcj.install	2006-02-08 21:14:19 UTC (rev 1882)
+++ trunk/eclipse/debian/eclipse-pde-gcj.install	2006-02-09 05:17:41 UTC (rev 1883)
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.pde_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.pde.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.pde.runtime_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.pde.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.pde.build_*/pdebuild.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.pde.junit.runtime_*/pdejunit.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.runtime_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.build_*/pdebuild.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.pde.junit.runtime_*/pdejunit.jar.so

Modified: trunk/eclipse/debian/eclipse-platform-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.install	2006-02-08 21:14:19 UTC (rev 1882)
+++ trunk/eclipse/debian/eclipse-platform-gcj.install	2006-02-09 05:17:41 UTC (rev 1883)
@@ -1,51 +1,51 @@
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.apache.lucene_*
+debian/tmp/usr/lib/gcj-4.0/org.apache.lucene_*
 
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.platform_*/platform.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.platform_*/startup.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ant.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.compare_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.boot_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.filebuffers_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.resources_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.resources.compatibility_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.runtime.compatibility_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.variables_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.debug.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.debug.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.help.appserver_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.help.base_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.help.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.help.webapp_*
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jface.text_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ltk.core.refactoring_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ltk.ui.refactoring_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.osgi.services_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.osgi.util_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.search_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.cvs.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.cvs.ssh_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.cvs.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.text_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.tomcat_*/*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.browser_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.cheatsheets_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.console_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.editors_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.externaltools_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.forms_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.ide_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.intro_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.presentations.r21_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.views_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.workbench.texteditor_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.update.core_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.update.scheduler_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.update.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.resources.linux_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.update.core.linux_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.platform_*/platform.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.platform_*/startup.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ant.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.compare_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.boot_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.filebuffers_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.resources_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.resources.compatibility_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.runtime.compatibility_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.variables_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.debug.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.debug.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.appserver_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.base_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.help.webapp_*
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jface.text_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ltk.core.refactoring_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ltk.ui.refactoring_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi.services_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi.util_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.search_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ssh_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.text_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.tomcat_*/*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.browser_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.cheatsheets_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.console_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.editors_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.externaltools_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.forms_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.ide_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.intro_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.presentations.r21_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.views_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench.texteditor_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.core_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.scheduler_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.resources.linux_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.core.linux_*.jar.so

Modified: trunk/eclipse/debian/eclipse-rcp-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.install	2006-02-08 21:14:19 UTC (rev 1882)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.install	2006-02-09 05:17:41 UTC (rev 1883)
@@ -1,14 +1,14 @@
 debian/tmp/usr/sbin/update-gcj-classmaps-eclipse
 
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.rcp_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.commands_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.expressions_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.core.runtime_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.help_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.jface_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.osgi_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.swt_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.swt.gtk.linux.*_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.ui.workbench_*.jar.so
-debian/tmp/usr/lib/eclipse/plugins.gcj/org.eclipse.update.configurator_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.rcp_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.commands_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.expressions_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.core.runtime_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.help_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.jface_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.osgi_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.swt.gtk.linux.*_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.ui.workbench_*.jar.so
+debian/tmp/usr/lib/gcj-4.0/org.eclipse.update.configurator_*.jar.so