[pkg-java] r2525 - in trunk/eclipse/debian: . extra
Matthias Klose
doko at costa.debian.org
Sun Oct 1 07:53:58 UTC 2006
Author: doko
Date: 2006-10-01 07:53:58 +0000 (Sun, 01 Oct 2006)
New Revision: 2525
Removed:
trunk/eclipse/debian/eclipse-jdt-gcj.postinst
trunk/eclipse/debian/eclipse-jdt-gcj.postrm
trunk/eclipse/debian/eclipse-pde-gcj.postinst
trunk/eclipse/debian/eclipse-pde-gcj.postrm
trunk/eclipse/debian/eclipse-platform-gcj.postinst
trunk/eclipse/debian/eclipse-platform-gcj.postrm
trunk/eclipse/debian/eclipse-rcp-gcj.postinst
trunk/eclipse/debian/eclipse-rcp-gcj.postrm
trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh
trunk/eclipse/debian/libswt3.2-gtk-gcj.postinst
trunk/eclipse/debian/libswt3.2-gtk-gcj.postrm
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
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
trunk/eclipse/debian/libswt3.2-gtk-gcj.install
trunk/eclipse/debian/rules
Log:
* Use java-gcj-compat-dev to compile the jar files to native code
and register them.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/changelog 2006-10-01 07:53:58 UTC (rev 2525)
@@ -49,6 +49,8 @@
dependency on ecj-bootstrap-gcj.
* Don't build ecj again, just use the system one.
* Don't build the eclipse-ecj and eclipse-ecj-gcj packages anymore.
+ * Use java-gcj-compat-dev to compile the jar files to native code
+ and register them.
-- Michael Koch <konqueror at gmx.de> Mon, 18 Sep 2006 05:22:34 +0000
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/control 2006-10-01 07:53:58 UTC (rev 2525)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>> 1.0.65-4), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, libxul-dev
Standards-Version: 3.7.2
Package: eclipse-rcp
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/control.in 2006-10-01 07:53:58 UTC (rev 2525)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>> 1.0.65-4), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev at BUILD_DEPS@
Standards-Version: 3.7.2
Package: eclipse-rcp
Modified: trunk/eclipse/debian/eclipse-jdt-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.install 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.install 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,11 +1,11 @@
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ant.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.debug.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.launching_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.debug_*/jdi.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.debug_*/jdimodel.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jdt.junit_*/junitsupport.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.junit_*
+/usr/lib/gcj/eclipse/org.eclipse.ant.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.debug.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.launching_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.debug_*/jdi.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.debug_*/jdimodel.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.junit.runtime_*/junitruntime.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jdt.junit_*/junitsupport.jar.??
+/usr/lib/gcj/eclipse/org.junit_*.jar.??
Deleted: trunk/eclipse/debian/eclipse-jdt-gcj.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.postinst 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.postinst 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-/usr/sbin/update-gcj-classmaps-eclipse
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-jdt-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-jdt-gcj.postrm 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-jdt-gcj.postrm 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-db_update()
-{
- # Merges per-package classmap databases into the system-wide classmap database.
-
- gccversion=4.1
-
- gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
- classmapd=/usr/share/gcj-${gccversion}/classmap.d
- classmaps=/var/lib/gcj-${gccversion}/classmap.db
-
- if [ ! -x $gcjdbtool ]; then
- echo >&2 "skip classmap deregistration, $gcjdbtool not found".
- return 0
- fi
-
- set +x
-
- # Move into a temporary file to avoid editing the existing file. The existing
- # file could be mmap()ed by gij processes.
- find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
- if [ $? -ne 0 ]; then
- echo "error merging classmaps" >&2
- set -x
- return 1
- fi
-
- mv ${classmaps}.tmp ${classmaps}
- if [ $? -ne 0 ]; then
- echo "could not replace existing classmap database" >&2
- set -x
- return 1
- fi
- set -x
-}
-
-db_update
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/eclipse/debian/eclipse-pde-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-pde-gcj.install 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-pde-gcj.install 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.runtime_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.build_*/pdebuild.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.pde.junit.runtime_*/pdejunit.jar.so
+/usr/lib/gcj/eclipse/org.eclipse.pde_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.pde.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.pde.runtime_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.pde.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.pde.build_*/pdebuild.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.pde.junit.runtime_*/pdejunit.jar.??
Deleted: trunk/eclipse/debian/eclipse-pde-gcj.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-pde-gcj.postinst 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-pde-gcj.postinst 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-/usr/sbin/update-gcj-classmaps-eclipse
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-pde-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-pde-gcj.postrm 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-pde-gcj.postrm 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-db_update()
-{
- # Merges per-package classmap databases into the system-wide classmap database.
-
- gccversion=4.1
-
- gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
- classmapd=/usr/share/gcj-${gccversion}/classmap.d
- classmaps=/var/lib/gcj-${gccversion}/classmap.db
-
- if [ ! -x $gcjdbtool ]; then
- echo >&2 "skip classmap deregistration, $gcjdbtool not found".
- return 0
- fi
-
- set +x
-
- # Move into a temporary file to avoid editing the existing file. The existing
- # file could be mmap()ed by gij processes.
- find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
- if [ $? -ne 0 ]; then
- echo "error merging classmaps" >&2
- set -x
- return 1
- fi
-
- mv ${classmaps}.tmp ${classmaps}
- if [ $? -ne 0 ]; then
- echo "could not replace existing classmap database" >&2
- set -x
- return 1
- fi
- set -x
-}
-
-db_update
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/eclipse/debian/eclipse-platform-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.install 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-platform-gcj.install 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,51 +1,51 @@
-debian/tmp/usr/lib/gcj-4.1/org.apache.lucene_*
+/usr/lib/gcj/eclipse/org.apache.lucene_*.jar.??
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.platform_*/platform.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.platform_*/startup.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ant.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.compare_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.boot_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.filebuffers_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.resources_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.resources.compatibility_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.runtime.compatibility_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.variables_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.debug.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.debug.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.appserver_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.base_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.help.webapp_*
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jface.text_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ltk.core.refactoring_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ltk.ui.refactoring_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.osgi.services_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.osgi.util_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.search_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ssh_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.text_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.tomcat_*/*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.browser_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.cheatsheets_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.console_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.editors_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.externaltools_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.forms_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.ide_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.intro_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.presentations.r21_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.views_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.workbench.texteditor_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.core_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.scheduler_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.resources.linux_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.core.linux_*.jar.so
+/usr/lib/gcj/eclipse/org.eclipse.platform_*/platform.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.platform_*/startup.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ant.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.compare_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.boot_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.filebuffers_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.resources_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.resources.compatibility_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.runtime.compatibility_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.variables_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.debug.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.debug.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.help.appserver_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.help.base_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.help.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.help.webapp_*
+/usr/lib/gcj/eclipse/org.eclipse.jface.text_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ltk.core.refactoring_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ltk.ui.refactoring_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.osgi.services_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.platform.doc.isv_*/activeHelpSample.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.osgi.util_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.search_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.cvs.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ssh_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ssh2_*/cvsssh2.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.team.cvs.ssh2_*/jsch-*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.text_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.tomcat_*/*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.browser_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.cheatsheets_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.console_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.editors_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.externaltools_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.forms_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.ide_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.intro_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.presentations.r21_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.views_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.workbench.texteditor_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.workbench.compatibility_*/compatibility.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.update.core_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.update.scheduler_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.update.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.resources.linux_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.update.core.linux_*.jar.??
Deleted: trunk/eclipse/debian/eclipse-platform-gcj.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.postinst 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-platform-gcj.postinst 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-/usr/sbin/update-gcj-classmaps-eclipse
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-platform-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-platform-gcj.postrm 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-platform-gcj.postrm 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-db_update()
-{
- # Merges per-package classmap databases into the system-wide classmap database.
-
- gccversion=4.1
-
- gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
- classmapd=/usr/share/gcj-${gccversion}/classmap.d
- classmaps=/var/lib/gcj-${gccversion}/classmap.db
-
- if [ ! -x $gcjdbtool ]; then
- echo >&2 "skip classmap deregistration, $gcjdbtool not found".
- return 0
- fi
-
- set +x
-
- # Move into a temporary file to avoid editing the existing file. The existing
- # file could be mmap()ed by gij processes.
- find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
- if [ $? -ne 0 ]; then
- echo "error merging classmaps" >&2
- set -x
- return 1
- fi
-
- mv ${classmaps}.tmp ${classmaps}
- if [ $? -ne 0 ]; then
- echo "could not replace existing classmap database" >&2
- set -x
- return 1
- fi
- set -x
-}
-
-db_update
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/eclipse/debian/eclipse-rcp-gcj.install
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.install 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.install 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,11 +1,11 @@
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.rcp_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.commands_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.expressions_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.core.runtime_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.help_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.jface_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.osgi_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.swt_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.ui.workbench_*.jar.so
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.update.configurator_*.jar.so
+/usr/lib/gcj/eclipse/org.eclipse.rcp_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.commands_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.expressions_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.core.runtime_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.help_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.jface_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.osgi_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.swt_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.ui.workbench_*.jar.??
+/usr/lib/gcj/eclipse/org.eclipse.update.configurator_*.jar.??
Deleted: trunk/eclipse/debian/eclipse-rcp-gcj.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.postinst 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.postinst 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-/usr/sbin/update-gcj-classmaps-eclipse
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/eclipse-rcp-gcj.postrm
===================================================================
--- trunk/eclipse/debian/eclipse-rcp-gcj.postrm 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/eclipse-rcp-gcj.postrm 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-db_update()
-{
- # Merges per-package classmap databases into the system-wide classmap database.
-
- gccversion=4.1
-
- gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
- classmapd=/usr/share/gcj-${gccversion}/classmap.d
- classmaps=/var/lib/gcj-${gccversion}/classmap.db
-
- if [ ! -x $gcjdbtool ]; then
- echo >&2 "skip classmap deregistration, $gcjdbtool not found".
- return 0
- fi
-
- set +x
-
- # Move into a temporary file to avoid editing the existing file. The existing
- # file could be mmap()ed by gij processes.
- find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
- if [ $? -ne 0 ]; then
- echo "error merging classmaps" >&2
- set -x
- return 1
- fi
-
- mv ${classmaps}.tmp ${classmaps}
- if [ $? -ne 0 ]; then
- echo "could not replace existing classmap database" >&2
- set -x
- return 1
- fi
- set -x
-}
-
-db_update
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/extra/update-gcj-classmaps-eclipse.sh 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-# Merges per-package classmap databases into the system-wide classmap database.
-
-gccversion=4.1
-
-gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
-classmapd=/usr/share/gcj-${gccversion}/classmap.d
-classmaps=/var/lib/gcj-${gccversion}/classmap.db
-
-# Move into a temporary file to avoid editing the existing file. The existing
-# file could be mmap()ed by gij processes.
-find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
-if [ $? -ne 0 ]; then
- echo "error merging classmaps" >&2
- exit 1
-fi
-
-mv ${classmaps}.tmp ${classmaps}
-if [ $? -ne 0 ]; then
- echo "could not replace existing classmap database" >&2
- exit 1
-fi
-
Modified: trunk/eclipse/debian/libswt3.2-gtk-gcj.install
===================================================================
--- trunk/eclipse/debian/libswt3.2-gtk-gcj.install 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/libswt3.2-gtk-gcj.install 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,2 +1 @@
-debian/tmp/usr/sbin/update-gcj-classmaps-eclipse
-debian/tmp/usr/lib/gcj-4.1/org.eclipse.swt.gtk.linux.*_*.jar.so
+/usr/lib/gcj/eclipse/org.eclipse.swt.gtk.linux.*_*.jar.??
Deleted: trunk/eclipse/debian/libswt3.2-gtk-gcj.postinst
===================================================================
--- trunk/eclipse/debian/libswt3.2-gtk-gcj.postinst 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/libswt3.2-gtk-gcj.postinst 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-/usr/sbin/update-gcj-classmaps-eclipse
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/eclipse/debian/libswt3.2-gtk-gcj.postrm
===================================================================
--- trunk/eclipse/debian/libswt3.2-gtk-gcj.postrm 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/libswt3.2-gtk-gcj.postrm 2006-10-01 07:53:58 UTC (rev 2525)
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-
-db_update()
-{
- # Merges per-package classmap databases into the system-wide classmap database.
-
- gccversion=4.1
-
- gcjdbtool=/usr/bin/gcj-dbtool-${gccversion}
- classmapd=/usr/share/gcj-${gccversion}/classmap.d
- classmaps=/var/lib/gcj-${gccversion}/classmap.db
-
- if [ ! -x $gcjdbtool ]; then
- echo >&2 "skip classmap deregistration, $gcjdbtool not found".
- return 0
- fi
-
- set +x
-
- # Move into a temporary file to avoid editing the existing file. The existing
- # file could be mmap()ed by gij processes.
- find ${classmapd} -name '*.db' -print0 | ${gcjdbtool} -0 -m ${classmaps}.tmp
- if [ $? -ne 0 ]; then
- echo "error merging classmaps" >&2
- set -x
- return 1
- fi
-
- mv ${classmaps}.tmp ${classmaps}
- if [ $? -ne 0 ]; then
- echo "could not replace existing classmap database" >&2
- set -x
- return 1
- fi
- set -x
-}
-
-db_update
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-09-30 16:34:05 UTC (rev 2524)
+++ trunk/eclipse/debian/rules 2006-10-01 07:53:58 UTC (rev 2525)
@@ -7,6 +7,8 @@
BUILD_DEPS :=
+export DH_OPTIONS =
+
DEB_GCJ_PACKAGES := eclipse-rcp eclipse-platform eclipse-jdt eclipse-pde libswt3.2-gtk
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -49,8 +51,8 @@
GCJ_VERSION=4.1
GCJ_RUN=/usr/bin/gcj-$(GCJ_VERSION)
GCJ_DBTOOL=/usr/bin/gcj-dbtool-$(GCJ_VERSION)
-GCJ_JARDIR=/usr/lib/gcj-$(GCJ_VERSION)
-AOT_COMPILE=python $(CURDIR)/debian/aot-compile
+GCJ_JARDIR=/usr/lib/gcj/eclipse
+AOT_COMPILE=/usr/bin/aot-compile
# Virtual machine configuration.
# JAVA_RUN command line to start the virtual machine
@@ -365,7 +367,15 @@
install: install-stamp
-install-stamp: build-java-stamp install-eclipse-stamp
+install-stamp: build-java-stamp install-eclipse-stamp post-install-stamp gcj-install-stamp
+ dh_installdirs
+ dh_install $(foreach p,$(DEB_GCJ_PACKAGES),-N$(p)-gcj)
+ifeq ($(enable_native),yes)
+ dh_install --sourcedir=debian/tmp-native $(foreach p,$(DEB_GCJ_PACKAGES),-p$(p)-gcj)
+endif
+ touch install-stamp
+
+post-install-stamp:
dh_testdir
dh_testroot
@@ -483,80 +493,85 @@
#cd $(DEBIAN_TMP)/$(ECLIPSE_HOME) && \
#ln -s ../../lib/eclipse/eclipse eclipse
-
- # Generate gcj native libraries for every Jar in Eclipse. These get
- # placed into the ECLIPSE_ARCH structure which mirrors that of
- # ECLIPSE_HOME: by plugin.
+
+ touch post-install-stamp
+
+gcj-install: gcj-install-stamp
+gcj-install-stamp: post-install-stamp
ifeq ($(enable_native),yes)
- mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR) && \
- cd $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins && \
- for jar in $$(find . -name '*.jar' | grep -v ant | grep -v 'catalina.jar' | sort); do \
- echo "$$jar" && \
- mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$(dirname $$jar) && \
- $(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$jar.so || exit $$?; \
+ mkdir -p debian/tmp-native
+ for jar in $$(find $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins ! -type l -name '*.jar'); do \
+ case "$$jar" in \
+ *ant*.jar|*catalina.jar) continue;; \
+ *org.eclipse.jface.text) continue;; \
+ *org.eclipse.ui.workbench) continue;; \
+ *org.eclipse.ui.forms) continue;; \
+ esac; \
+ djar=$$(echo $$jar | sed 's,$(DEBIAN_TMP),debian/tmp-native,'); \
+ ddir=$$(dirname $$djar); \
+ if ! cmp --quiet $$jar $$djar; then \
+ mkdir -p $$ddir; \
+ cp -p $$jar $$djar; \
+ fi; \
done
- cd $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins && \
- for jar in $$(find . -name '*swt.gtk.*.jar' | grep -v ant | grep -v 'catalina.jar' | sort); do \
- echo "$$jar" && \
- mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$(dirname $$jar) && \
- $(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$jar.so || exit $$?; \
- done
- # Remove these native plugins for one reason or another.
- for so in \
- org.eclipse.jface.text \
- org.eclipse.ui.workbench \
- org.eclipse.ui.forms; do \
- find $(DEBIAN_TMP)/$(GCJ_JARDIR) -name "$$so_\*.jar.so" -exec \
- rm '{}' ';'; \
- done
+ $(AOT_COMPILE) -L /usr/lib/gcj/eclipse \
+ debian/tmp-native debian/tmp-native/usr/lib/gcj/eclipse
endif
+ touch gcj-install-stamp
- dh_installdirs
- dh_install
-
- touch install-stamp
-
-
+binary-indep: DH_OPTIONS=-i
binary-indep: install-stamp
- dh_testdir -i
- dh_testroot -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installmenu -i
- dh_installman -i
- dh_installinfo -i
- dh_installchangelogs -i
- dh_link -i
- dh_fixperms -i
-
- dh_makeshlibs -i
- dh_shlibdeps -i
- dh_compress -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_fixperms
+ dh_makeshlibs
+ dh_shlibdeps
+ dh_compress
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+ifeq ($(enable_native),yes)
+binary-arch: DH_OPTIONS=-s
+else
+binary-arch: DH_OPTIONS=-s $(foreach p,$(DEB_GCJ_PACKAGES),-N$(p)-gcj)
+endif
binary-arch: install-stamp
- dh_testdir -a
- dh_testroot -a
-
+ dh_testdir
+ dh_testroot
+ dh_listpackages
ifeq ($(enable_native),yes)
- $(MAKE) -f debian/rules generate-classmaps
+ for p in $(DEB_GCJ_PACKAGES); do \
+ mkdir -p debian/$$p-gcj/usr/share/gcj/classmap.d; \
+ mv debian/$$p-gcj/usr/lib/gcj/eclipse/*.db \
+ debian/$$p-gcj/usr/share/gcj/classmap.d/; \
+ done
+# don't merge classmaps yet. makes debugging easier
+# $(MAKE) -f debian/rules generate-classmaps
+ dh_nativejava --onlyscripts $(foreach p,$(DEB_GCJ_PACKAGES),-p$(p)-gcj)
endif
- dh_installdocs -a
- dh_installexamples -a
- dh_installmenu -a
- dh_installman -a
- dh_installinfo -a
- dh_installchangelogs -a
- dh_link -a
- dh_fixperms -a
-
- dh_strip -a
- dh_compress -a
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman
+ dh_installinfo
+ dh_installchangelogs
+ dh_link
+ dh_fixperms
+
+ dh_strip
+ dh_compress
dpkg-shlibdeps \
-dDepends \
debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gtk-3232.so \
@@ -568,14 +583,14 @@
debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-gnome-gtk-3232.so \
debian/libswt3.2-gtk-jni/usr/lib/jni/libswt-mozilla-gtk-3232.so \
-Tdebian/libswt3.2-gtk-jni.substvars
- dh_shlibdeps -a -Nlibswt3.2-gtk-jni
- dh_makeshlibs -a
- dh_installdeb -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
+ dh_shlibdeps -Nlibswt3.2-gtk-jni
+ dh_makeshlibs
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
binary: binary-indep binary-arch
generate-classmaps:
@@ -628,7 +643,7 @@
dh_testdir
rm -rf $(SOURCE_TREE) $(BUILD_TREE) *-stamp patch-stampT dpatch-stampT
- rm -rf $(DEBIAN_TMP) compilelog.txt
+ rm -rf $(DEBIAN_TMP) debian/tmp-native compilelog.txt
rm -rf debian/patched
rm -f debian/patches/00list
dh_clean
More information about the pkg-java-commits
mailing list