[pkg-java] r5452 - in trunk/eclipse/debian: . patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-01-15 07:27:35 +0000 (Tue, 15 Jan 2008)
New Revision: 5452

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
   trunk/eclipse/debian/patches/eclipse-build.dpatch
   trunk/eclipse/debian/rules
Log:
* Add additional Depends on libgtk2.0-0 (>= 2.12.0-3) for libswt3.2-gtk-jni.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2008-01-14 20:07:03 UTC (rev 5451)
+++ trunk/eclipse/debian/changelog	2008-01-15 07:27:35 UTC (rev 5452)
@@ -11,6 +11,7 @@
     Closes: #460364.
   * Updated (Build-)Depends on libjsch-java (>= 0.1.36).
   * Added JAVA_HOME for icedtea to debian/extra/java_home.
+  * Add additional Depends on libgtk2.0-0 (>= 2.12.0-3) for libswt3.2-gtk-jni.
 
  -- Michael Koch <konqueror at gmx.de>  Sun, 30 Dec 2007 17:53:29 +0100
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2008-01-14 20:07:03 UTC (rev 5451)
+++ trunk/eclipse/debian/control	2008-01-15 07:27:35 UTC (rev 5452)
@@ -215,7 +215,7 @@
 
 Package: libswt3.2-gtk-jni
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libgtk2.0-0 (>= 2.12.0-3)
 Recommends: ${shlibs:Recommends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
 Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni, libswt-gtk-3.2-jni (<< 3.2.1-5), libswt-gnome-gtk-3.2-jni (<< 3.2.1-5)

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2008-01-14 20:07:03 UTC (rev 5451)
+++ trunk/eclipse/debian/control.in	2008-01-15 07:27:35 UTC (rev 5452)
@@ -215,7 +215,7 @@
 
 Package: libswt3.2-gtk-jni
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libgtk2.0-0 (>= 2.12.0-3)
 Recommends: ${shlibs:Recommends}
 Replaces: libswt2.1-gtk2-jni, libswt-gtk3-jni
 Conflicts: libswt2.1-gtk2-jni, libswt-gtk3-jni, libswt-gtk-3.1-jni, libswt-gnome-gtk-3.1-jni, libswt-mozilla-gtk-3.1-jni, libswt-gtk-3.2-jni (<< 3.2.1-5), libswt-gnome-gtk-3.2-jni (<< 3.2.1-5)

Modified: trunk/eclipse/debian/patches/eclipse-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-build.dpatch	2008-01-14 20:07:03 UTC (rev 5451)
+++ trunk/eclipse/debian/patches/eclipse-build.dpatch	2008-01-15 07:27:35 UTC (rev 5452)
@@ -57,3 +57,14 @@
  
  		<!--set the compiler and compiler arguments-->
  		<!--the default compiler is set to the one used by eclipse rel. eng. -->
+--- source-tree/plugins/org.eclipse.platform.doc.isv/build.xml.orig	2007-10-26 11:22:24.000000000 +0200
++++ source-tree/plugins/org.eclipse.platform.doc.isv/build.xml	2007-10-26 11:23:25.000000000 +0200
+@@ -197,7 +197,7 @@
+ 		</subant>
+ 		<available property="activeHelpSample.jar" file="${build.result.folder}/activeHelpSample.jar"/>
+ 		<antcall target="activeHelpSample.jar"/>
+-		<subant antfile="${customBuildCallbacks}" target="post.build.jars" failonerror="false" buildpath=".">
++		<subant antfile="${customBuildCallbacks}" target="post.build.jars" failonerror="false" buildpath="." verbose="true">
+ 			<property name="build.result.folder" value="${build.result.folder}"/>
+ 		</subant>
+ 	</target>

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2008-01-14 20:07:03 UTC (rev 5451)
+++ trunk/eclipse/debian/rules	2008-01-15 07:27:35 UTC (rev 5452)
@@ -366,7 +366,17 @@
 	find . -type f -name "build.xml" -exec \
 		perl -pi -e 's| verbose="true"| verbose="false"|g' \
 		{} ';'
+	
+	# Make subant invocations fail on error.
+#	find . -type f -name "build.xml" -exec \
+#		perl -pi -e 's| failonerror="false"| failonerror="true"|g' \
+#		{} ';'
 
+	# Disable compiler warnings.
+	find . -type f -name "build.xml" -exec \
+		perl -pi -e 's|<javac|<javac nowarn="true"|g' \
+		{} ';'
+
 	# Replace all jars by links to previous install libraries.	
 ifeq ($(with_tomcat),yes)
 	cat $(EXTRA)/links.txt | while read FROM TO; do \