[pkg-java] r3842 - in trunk/eclipse/debian: . extra
mkoch at alioth.debian.org
mkoch at alioth.debian.org
Sun Jul 15 18:15:24 UTC 2007
Author: mkoch
Date: 2007-07-15 18:15:23 +0000 (Sun, 15 Jul 2007)
New Revision: 3842
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/extra/java_home
trunk/eclipse/debian/rules
Log:
eclipse (3.2.2-2) unstable; urgency=low
* debian/extra/java_home: Use /usr/lib/jvm/java-6-sun instead of
/usr/lib/jvm/java-1.6.0-sun. Closes: #415712.
* debian/rules: Build with source and target version 1.5.
* debian/control.in: Replaced all ${Source-Version} by ${binary:Version}.
-- Michael Koch <konqueror at gmx.de> Sun, 15 Jul 2007 11:01:20 +0200
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2007-07-15 16:43:53 UTC (rev 3841)
+++ trunk/eclipse/debian/changelog 2007-07-15 18:15:23 UTC (rev 3842)
@@ -1,3 +1,12 @@
+eclipse (3.2.2-2) unstable; urgency=low
+
+ * debian/extra/java_home: Use /usr/lib/jvm/java-6-sun instead of
+ /usr/lib/jvm/java-1.6.0-sun. Closes: #415712.
+ * debian/rules: Build with source and target version 1.5.
+ * debian/control.in: Replaced all ${Source-Version} by ${binary:Version}.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 15 Jul 2007 11:01:20 +0200
+
eclipse (3.2.2-1) unstable; urgency=low
[ Michael Koch ]
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2007-07-15 16:43:53 UTC (rev 3841)
+++ trunk/eclipse/debian/control 2007-07-15 18:15:23 UTC (rev 3842)
@@ -8,7 +8,7 @@
Package: eclipse-rcp
Architecture: any
-Depends: libswt3.2-gtk-java (= ${Source-Version})
+Depends: libswt3.2-gtk-java (= ${binary:Version})
Recommends: eclipse-rcp-gcj
Replaces: eclipse-rcp-common, libswt3.1-gtk-java (<= 3.1.2-1)
Conflicts: eclipse-rcp-common
@@ -31,7 +31,7 @@
Package: eclipse-rcp-gcj
Architecture: any
-Depends: eclipse-rcp (= ${Source-Version}), libswt3.2-gtk-gcj (= ${Source-Version})
+Depends: eclipse-rcp (= ${binary:Version}), libswt3.2-gtk-gcj (= ${binary:Version})
Description: Eclipse rich client platform (GCJ version)
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java, ${shlibs:Depends}
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java, ${shlibs:Depends}
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -76,7 +76,7 @@
Package: eclipse-platform-gcj
Architecture: any
-Depends: eclipse-platform (= ${Source-Version}), eclipse-rcp-gcj (= ${Source-Version})
+Depends: eclipse-platform (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version})
Description: Eclipse platform without plug-ins to develop any language (GCJ version)
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -97,7 +97,7 @@
Package: eclipse-jdt
Architecture: any
-Depends: eclipse-platform (= ${Source-Version}), junit (>= 3.8), ant-optional (>= 1.6.5-3)
+Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), ant-optional (>= 1.6.5-3)
Recommends: eclipse-jdt-gcj
Replaces: eclipse-jdt-common
Conflicts: eclipse-jdt-common
@@ -109,7 +109,7 @@
Package: eclipse-jdt-gcj
Architecture: any
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-rcp-gcj (= ${Source-Version})
+Depends: eclipse-jdt (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version})
Description: Java Development Tools plug-ins for Eclipse (GCJ version)
Eclipse JDT plug-ins to develop Java applications with Eclipse.
.
@@ -120,8 +120,8 @@
Package: eclipse-pde
Architecture: any
-Depends: eclipse-platform (= ${Source-Version}), eclipse-jdt (= ${Source-Version})
-Recommends: eclipse-pde-gcj, eclipse-source (>= ${Source-Version})
+Depends: eclipse-platform (= ${binary:Version}), eclipse-jdt (= ${binary:Version})
+Recommends: eclipse-pde-gcj, eclipse-source (>= ${binary:Version})
Replaces: eclipse-pde-common
Conflicts: eclipse-pde-common
Description: Plug-in Development Environment to develop Eclipse plug-ins
@@ -130,7 +130,7 @@
Package: eclipse-pde-gcj
Architecture: any
-Depends: eclipse-pde (= ${Source-Version}), eclipse-rcp-gcj (= ${Source-Version})
+Depends: eclipse-pde (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version})
Description: Plug-in Development Environment to develop Eclipse plug-ins (GCJ version)
Plug-in development environment provides tools to easily develop your own
Eclipse plug-ins.
@@ -139,14 +139,14 @@
Package: eclipse-source
Architecture: any
-Depends: eclipse-platform (= ${Source-Version})
+Depends: eclipse-platform (= ${binary:Version})
Description: Eclipse source code plug-ins
This package provides the additional source code plug-ins used for code lookup
(debugger, code completion) and plug-in development.
Package: eclipse-sdk
Architecture: all
-Depends: eclipse (>= ${Source-Version})
+Depends: eclipse (>= ${binary:Version})
Description: Extensible Tool Platform and Java IDE
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -158,7 +158,7 @@
Package: eclipse
Architecture: any
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version}), zenity
+Depends: eclipse-jdt (= ${binary:Version}), eclipse-pde (= ${binary:Version}), eclipse-source (= ${binary:Version}), zenity
Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
Recommends: eclipse-gcj
Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
@@ -187,7 +187,7 @@
Package: libswt3.2-gtk-java
Architecture: any
-Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
+Depends: libswt3.2-gtk-jni (= ${binary:Version}), java-common
Recommends: libswt3.2-gtk-gcj, ${shlibs:Depends}
Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
@@ -200,7 +200,7 @@
Package: libswt3.2-gtk-gcj
Architecture: any
-Depends: libswt3.2-gtk-java (= ${Source-Version}), gij-4.1
+Depends: libswt3.2-gtk-java (= ${binary:Version}), gij-4.1
Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
@@ -222,7 +222,7 @@
Package: eclipse-efj
Architecture: any
-Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>= 0.22), eclipse-jdt (= ${Source-Version})
+Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>= 0.22), eclipse-jdt (= ${binary:Version})
Recommends: ant-optional (>= 1.6.5-3)
Description: Eclipse Java code formatter
This package provides a script to launch the Eclipse JDT code formatter
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2007-07-15 16:43:53 UTC (rev 3841)
+++ trunk/eclipse/debian/control.in 2007-07-15 18:15:23 UTC (rev 3842)
@@ -8,7 +8,7 @@
Package: eclipse-rcp
Architecture: any
-Depends: libswt3.2-gtk-java (= ${Source-Version})
+Depends: libswt3.2-gtk-java (= ${binary:Version})
Recommends: eclipse-rcp-gcj
Replaces: eclipse-rcp-common, libswt3.1-gtk-java (<= 3.1.2-1)
Conflicts: eclipse-rcp-common
@@ -31,7 +31,7 @@
Package: eclipse-rcp-gcj
Architecture: any
-Depends: eclipse-rcp (= ${Source-Version}), libswt3.2-gtk-gcj (= ${Source-Version})
+Depends: eclipse-rcp (= ${binary:Version}), libswt3.2-gtk-gcj (= ${binary:Version})
Description: Eclipse rich client platform (GCJ version)
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@, @MOZILLA_DEP@
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${binary:Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@, @MOZILLA_DEP@
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -76,7 +76,7 @@
Package: eclipse-platform-gcj
Architecture: any
-Depends: eclipse-platform (= ${Source-Version}), eclipse-rcp-gcj (= ${Source-Version})
+Depends: eclipse-platform (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version})
Description: Eclipse platform without plug-ins to develop any language (GCJ version)
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -97,7 +97,7 @@
Package: eclipse-jdt
Architecture: any
-Depends: eclipse-platform (= ${Source-Version}), junit (>= 3.8), @ANT_DEP@
+Depends: eclipse-platform (= ${binary:Version}), junit (>= 3.8), @ANT_DEP@
Recommends: eclipse-jdt-gcj
Replaces: eclipse-jdt-common
Conflicts: eclipse-jdt-common
@@ -109,7 +109,7 @@
Package: eclipse-jdt-gcj
Architecture: any
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-rcp-gcj (= ${Source-Version})
+Depends: eclipse-jdt (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version})
Description: Java Development Tools plug-ins for Eclipse (GCJ version)
Eclipse JDT plug-ins to develop Java applications with Eclipse.
.
@@ -120,8 +120,8 @@
Package: eclipse-pde
Architecture: any
-Depends: eclipse-platform (= ${Source-Version}), eclipse-jdt (= ${Source-Version})
-Recommends: eclipse-pde-gcj, eclipse-source (>= ${Source-Version})
+Depends: eclipse-platform (= ${binary:Version}), eclipse-jdt (= ${binary:Version})
+Recommends: eclipse-pde-gcj, eclipse-source (>= ${binary:Version})
Replaces: eclipse-pde-common
Conflicts: eclipse-pde-common
Description: Plug-in Development Environment to develop Eclipse plug-ins
@@ -130,7 +130,7 @@
Package: eclipse-pde-gcj
Architecture: any
-Depends: eclipse-pde (= ${Source-Version}), eclipse-rcp-gcj (= ${Source-Version})
+Depends: eclipse-pde (= ${binary:Version}), eclipse-rcp-gcj (= ${binary:Version})
Description: Plug-in Development Environment to develop Eclipse plug-ins (GCJ version)
Plug-in development environment provides tools to easily develop your own
Eclipse plug-ins.
@@ -139,14 +139,14 @@
Package: eclipse-source
Architecture: any
-Depends: eclipse-platform (= ${Source-Version})
+Depends: eclipse-platform (= ${binary:Version})
Description: Eclipse source code plug-ins
This package provides the additional source code plug-ins used for code lookup
(debugger, code completion) and plug-in development.
Package: eclipse-sdk
Architecture: all
-Depends: eclipse (>= ${Source-Version})
+Depends: eclipse (>= ${binary:Version})
Description: Extensible Tool Platform and Java IDE
The Eclipse Platform is an open and extensible platform for anything and yet
nothing in particular. It provides a foundation for constructing and running
@@ -158,7 +158,7 @@
Package: eclipse
Architecture: any
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version}), zenity
+Depends: eclipse-jdt (= ${binary:Version}), eclipse-pde (= ${binary:Version}), eclipse-source (= ${binary:Version}), zenity
Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
Recommends: eclipse-gcj
Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
@@ -187,7 +187,7 @@
Package: libswt3.2-gtk-java
Architecture: any
-Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
+Depends: libswt3.2-gtk-jni (= ${binary:Version}), java-common
Recommends: libswt3.2-gtk-gcj, @MOZILLA_DEP@
Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java (<< 3.2.1-5)
@@ -200,7 +200,7 @@
Package: libswt3.2-gtk-gcj
Architecture: any
-Depends: libswt3.2-gtk-java (= ${Source-Version}), gij-4.1
+Depends: libswt3.2-gtk-java (= ${binary:Version}), gij-4.1
Replaces: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
Conflicts: eclipse-rcp-gcj (<< 3.1.2-2), libswt3.1-gtk-gcj
Description: Fast and rich GUI toolkit for Java, gtk2 (GCJ version)
@@ -222,7 +222,7 @@
Package: eclipse-efj
Architecture: any
-Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>= 0.22), eclipse-jdt (= ${Source-Version})
+Depends: java-runtime, java-gcj-compat | java-virtual-machine, java-common (>= 0.22), eclipse-jdt (= ${binary:Version})
Recommends: @ANT_DEP@
Description: Eclipse Java code formatter
This package provides a script to launch the Eclipse JDT code formatter
Modified: trunk/eclipse/debian/extra/java_home
===================================================================
--- trunk/eclipse/debian/extra/java_home 2007-07-15 16:43:53 UTC (rev 3841)
+++ trunk/eclipse/debian/extra/java_home 2007-07-15 18:15:23 UTC (rev 3842)
@@ -4,7 +4,7 @@
/usr/lib/jvm/java-gcj
/usr/lib/kaffe/pthreads
-/usr/lib/jvm/java-1.6.0-sun
+/usr/lib/jvm/java-6-sun
/usr/lib/jvm/java-1.5.0-sun
/usr/lib/j2se/1.5
/usr/lib/j2se/1.4
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2007-07-15 16:43:53 UTC (rev 3841)
+++ trunk/eclipse/debian/rules 2007-07-15 18:15:23 UTC (rev 3842)
@@ -83,7 +83,7 @@
# use ecj-bootstrap as compiler
ANT_CLASSPATH=/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/java/ecj.jar
ANT_CLASS=org.apache.tools.ant.Main
-ANT_OPTS=-DjavacFailOnError=true -DjavacVerbose=false -DjavacSource=1.3 -DjavacTarget=1.3
+ANT_OPTS=-DjavacFailOnError=true -DjavacVerbose=false -DjavacSource=1.5 -DjavacTarget=1.5
ANT_DEP := ant-optional (>= 1.6.5-3)
BUILD_DEPS += , ant-optional (>= 1.6.5-3)
More information about the pkg-java-commits
mailing list