CVS eclipse/debian
Michael Koch
mkoch-guest at haydn.debian.org
Sun Nov 6 11:47:33 UTC 2005
Update of /cvsroot/pkg-java/eclipse/debian
In directory haydn:/tmp/cvs-serv19398
Modified Files:
changelog eclipse-rcp.install libswt3.1-gtk-java.install rules
Log Message:
debian/eclipse-rcp.install, debian/libswt3.1-gtk-java.install, debian/rules:
Reorganized SWT to put its jar into /usr/lib/eclipse/plugins/.
--- /cvsroot/pkg-java/eclipse/debian/changelog 2005/11/06 10:40:19 1.19
+++ /cvsroot/pkg-java/eclipse/debian/changelog 2005/11/06 11:47:33 1.20
@@ -39,8 +39,10 @@
* debian/control: eclipse-platform-common: Conflits and Replaces
eclipse-platform << 3.0. Closes: #336307.
* debian/rules: Added support to build for s390 architecture.
+ * debian/eclipse-rcp.install, debian/libswt3.1-gtk-java.install, debian/rules:
+ Reorganized SWT to put its jar into /usr/lib/eclipse/plugins/.
- -- Michael Koch <konqueror at gmx.de> Sun, 6 Nov 2005 10:32:48 +0000
+ -- Michael Koch <konqueror at gmx.de> Sun, 6 Nov 2005 11:38:49 +0000
eclipse (3.1.1-3) unstable; urgency=low
--- /cvsroot/pkg-java/eclipse/debian/eclipse-rcp.install 2005/10/15 12:29:53 1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-rcp.install 2005/11/06 11:47:33 1.2
@@ -4,11 +4,7 @@
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.help_*.jar
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.jface_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.configurator_*.jar
-
-debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*_*.jar
-
--- /cvsroot/pkg-java/eclipse/debian/libswt3.1-gtk-java.install 2005/10/15 12:29:53 1.1
+++ /cvsroot/pkg-java/eclipse/debian/libswt3.1-gtk-java.install 2005/11/06 11:47:33 1.2
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/java/*.jar
-debian/tmp/usr/share/java-config/*
+debian/tmp/usr/lib/eclipse/plugins/org.eclipse.swt*
+debian/tmp/usr/lib/java/*.jar
--- /cvsroot/pkg-java/eclipse/debian/rules 2005/11/06 10:40:19 1.11
+++ /cvsroot/pkg-java/eclipse/debian/rules 2005/11/06 11:47:33 1.12
@@ -538,22 +538,12 @@
rm -rf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.update.core.linux_*/os
rm -rf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.core.resources.linux_*/os
- # Our SWT Jars live in /usr/share/java.
- install -d $(DEBIAN_TMP)/usr/share/java
- cd $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/ && \
- mv org.eclipse.swt_3.1.0.jar $(DEBIAN_TMP)/usr/share/java/swt-3.1.jar && \
- mv org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar $(DEBIAN_TMP)/usr/share/java/swt-gtk-3.1.jar
-
- # Link those Jars into the plugin directory where it expects them.
- cd $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/ && \
- ln -s ../../../../usr/share/java/swt-3.1.jar org.eclipse.swt_3.1.1.jar && \
- ln -s ../../../../usr/share/java/swt-gtk-3.1.jar org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar
-
# Version-less SWT Jar links.
- cd $(DEBIAN_TMP)/usr/share/java && \
- ln -s swt-3.1.jar swt.jar && \
- ln -s swt-gtk-3.1.jar swt-gtk.jar
-
+ mkdir -p $(DEBIAN_TMP)/usr/lib/java && \
+ cd $(DEBIAN_TMP)/usr/lib/java && \
+ ln -s $(ECLIPSE_HOME)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar swt-3.1.jar && \
+ ln -s $(ECLIPSE_HOME)/plugins/org.eclipse.swt.gtk.linux.$(ECLIPSE_PLATFORM)_3.1.1.jar swt.jar
+
# Missing permissions.
chmod a+x $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/ant
chmod a+x $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.apache.ant_*/bin/antRun*
More information about the pkg-java-commits
mailing list