[pkg-java] r13472 - in trunk/trident/debian: . patches

[Andrew Ross]

Author: rockclimb-guest
Date: 2011-03-29 17:15:36 +0000 (Tue, 29 Mar 2011)
New Revision: 13472

Modified:
   trunk/trident/debian/changelog
   trunk/trident/debian/patches/no-android.patch
Log:
Updated patch to fix #619986


Modified: trunk/trident/debian/changelog
===================================================================
--- trunk/trident/debian/changelog	2011-03-27 23:36:30 UTC (rev 13471)
+++ trunk/trident/debian/changelog	2011-03-29 17:15:36 UTC (rev 13472)
@@ -1,3 +1,9 @@
+trident (1.3+dfsg-3) unstable; urgency=low
+
+  * Update the no-android patch to fix an Exception (Closes: #619986)
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Tue, 29 Mar 2011 18:09:13 +0100
+
 trident (1.3+dfsg-2) unstable; urgency=low
 
   * Update watch file to fix errors.

Modified: trunk/trident/debian/patches/no-android.patch
===================================================================
--- trunk/trident/debian/patches/no-android.patch	2011-03-27 23:36:30 UTC (rev 13471)
+++ trunk/trident/debian/patches/no-android.patch	2011-03-29 17:15:36 UTC (rev 13472)
@@ -1,10 +1,10 @@
 We don't want to use the android SDK right now, so we patch out these files. They
 could potentially be re-added at a later date if required.
 
-Index: trident-1.3/src/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java
+Index: trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java
 ===================================================================
---- trident-1.3.orig/src/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java	2011-01-17 23:14:36.289000352 +0000
-+++ trident-1.3/src/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java	2011-01-17 23:14:40.060667623 +0000
+--- trident-1.3+dfsg.orig/src/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java	2010-03-11 09:26:30.000000000 +0000
++++ trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java	2011-03-29 18:12:18.026076573 +0100
 @@ -27,7 +27,7 @@
   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
@@ -36,10 +36,10 @@
  	}
 -}
 +}*/
-Index: trident-1.3/src/org/pushingpixels/trident/android/AndroidRepaintCallback.java
+Index: trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidRepaintCallback.java
 ===================================================================
---- trident-1.3.orig/src/org/pushingpixels/trident/android/AndroidRepaintCallback.java	2011-01-17 23:14:52.399001025 +0000
-+++ trident-1.3/src/org/pushingpixels/trident/android/AndroidRepaintCallback.java	2011-01-17 23:15:01.519016085 +0000
+--- trident-1.3+dfsg.orig/src/org/pushingpixels/trident/android/AndroidRepaintCallback.java	2010-03-11 09:26:30.000000000 +0000
++++ trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidRepaintCallback.java	2011-03-29 18:12:18.026076573 +0100
 @@ -27,7 +27,7 @@
   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -55,10 +55,10 @@
  	}
 -}
 +}*/
-Index: trident-1.3/src/org/pushingpixels/trident/android/AndroidRepaintTimeline.java
+Index: trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidRepaintTimeline.java
 ===================================================================
---- trident-1.3.orig/src/org/pushingpixels/trident/android/AndroidRepaintTimeline.java	2011-01-17 23:15:09.239000983 +0000
-+++ trident-1.3/src/org/pushingpixels/trident/android/AndroidRepaintTimeline.java	2011-01-17 23:15:16.469000290 +0000
+--- trident-1.3+dfsg.orig/src/org/pushingpixels/trident/android/AndroidRepaintTimeline.java	2010-03-11 09:26:30.000000000 +0000
++++ trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidRepaintTimeline.java	2011-03-29 18:12:18.026076573 +0100
 @@ -27,7 +27,7 @@
   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
@@ -75,10 +75,10 @@
 -}
 \ No newline at end of file
 +}*/
-Index: trident-1.3/src/org/pushingpixels/trident/android/AndroidToolkitHandler.java
+Index: trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidToolkitHandler.java
 ===================================================================
---- trident-1.3.orig/src/org/pushingpixels/trident/android/AndroidToolkitHandler.java	2011-01-17 23:15:32.478999090 +0000
-+++ trident-1.3/src/org/pushingpixels/trident/android/AndroidToolkitHandler.java	2011-01-17 23:15:38.759834315 +0000
+--- trident-1.3+dfsg.orig/src/org/pushingpixels/trident/android/AndroidToolkitHandler.java	2010-03-11 09:26:30.000000000 +0000
++++ trident-1.3+dfsg/src/org/pushingpixels/trident/android/AndroidToolkitHandler.java	2011-03-29 18:12:18.026076573 +0100
 @@ -27,7 +27,7 @@
   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
@@ -94,10 +94,10 @@
  	}
 -}
 +}*/
-Index: trident-1.3/src/org/pushingpixels/trident/android/TimelineAsyncTask.java
+Index: trident-1.3+dfsg/src/org/pushingpixels/trident/android/TimelineAsyncTask.java
 ===================================================================
---- trident-1.3.orig/src/org/pushingpixels/trident/android/TimelineAsyncTask.java	2011-01-17 23:15:47.831501017 +0000
-+++ trident-1.3/src/org/pushingpixels/trident/android/TimelineAsyncTask.java	2011-01-17 23:15:55.859035013 +0000
+--- trident-1.3+dfsg.orig/src/org/pushingpixels/trident/android/TimelineAsyncTask.java	2010-03-11 09:26:30.000000000 +0000
++++ trident-1.3+dfsg/src/org/pushingpixels/trident/android/TimelineAsyncTask.java	2011-03-29 18:12:18.036076044 +0100
 @@ -27,7 +27,7 @@
   * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
   * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
@@ -113,3 +113,17 @@
  	}
 -}
 +}*/
+Index: trident-1.3+dfsg/src/META-INF/trident-plugin.properties
+===================================================================
+--- trident-1.3+dfsg.orig/src/META-INF/trident-plugin.properties	2011-03-29 18:12:25.107743296 +0100
++++ trident-1.3+dfsg/src/META-INF/trident-plugin.properties	2011-03-29 18:12:28.496075738 +0100
+@@ -4,7 +4,4 @@
+ UIToolkitHandler=org.pushingpixels.trident.swt.SWTToolkitHandler
+ PropertyInterpolatorSource=org.pushingpixels.trident.swt.SWTPropertyInterpolators
+ 
+-UIToolkitHandler=org.pushingpixels.trident.android.AndroidToolkitHandler
+-PropertyInterpolatorSource=org.pushingpixels.trident.android.AndroidPropertyInterpolators
+-
+-PropertyInterpolatorSource=org.pushingpixels.trident.interpolator.CorePropertyInterpolators
+\ No newline at end of file
++PropertyInterpolatorSource=org.pushingpixels.trident.interpolator.CorePropertyInterpolators