[insubstantial] 03/04: Simplified no_android.patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository insubstantial.

commit fc6b6f2802abe9a5174580b878a524b54e95ea6b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 4 10:29:07 2016 +0200

    Simplified no_android.patch
---
 debian/changelog                |   1 +
 debian/patches/no_android.patch | 114 ++++++----------------------------------
 2 files changed, 17 insertions(+), 98 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94af048..6a5c3d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ insubstantial (7.3+dfsg3-2) UNRELEASED; urgency=medium
   * Transition to libswt-gtk-4-java
   * Use substitution rules instead of a patch for building with the system jars
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
+  * Simplified no_android.patch
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 04 Aug 2016 09:59:55 +0200
 
diff --git a/debian/patches/no_android.patch b/debian/patches/no_android.patch
index 770f80a..d07871b 100644
--- a/debian/patches/no_android.patch
+++ b/debian/patches/no_android.patch
@@ -3,113 +3,31 @@ Author: Andrew Ross <ubuntu at rossfamily.co.uk>
 Origin: other
 Forwarded: not-needed
 Last-Update: 2011-03-29
---- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintCallback.java
-+++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintCallback.java
-@@ -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.
-  */
--package org.pushingpixels.trident.android;
-+/*package org.pushingpixels.trident.android;
- 
- import org.pushingpixels.trident.Timeline.TimelineState;
- import org.pushingpixels.trident.callback.RunOnUIThread;
-@@ -74,3 +74,4 @@
- 					this.rect.right, this.rect.bottom);
- 	}
- }
-+*/
---- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintTimeline.java
-+++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidRepaintTimeline.java
-@@ -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. 
-  */
--package org.pushingpixels.trident.android;
-+/*package org.pushingpixels.trident.android;
- 
- import org.pushingpixels.trident.Timeline;
- 
-@@ -78,4 +78,4 @@
- 		}
- 		super.playLoop(loopCount, repeatBehavior);
- 	}
--}
-\ No newline at end of file
-+}*/
---- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidToolkitHandler.java
-+++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidToolkitHandler.java
-@@ -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. 
-  */
--package org.pushingpixels.trident.android;
-+/*package org.pushingpixels.trident.android;
- 
- import org.pushingpixels.trident.UIToolkitHandler;
- 
-@@ -49,3 +49,4 @@
- 		((View) mainTimelineObject).post(runnable);
- 	}
- }
-+*/
---- a/trident/src/main/java/org/pushingpixels/trident/android/TimelineAsyncTask.java
-+++ b/trident/src/main/java/org/pushingpixels/trident/android/TimelineAsyncTask.java
-@@ -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. 
-  */
--package org.pushingpixels.trident.android;
-+/*package org.pushingpixels.trident.android;
- 
- import org.pushingpixels.trident.TimelineScenario;
- 
-@@ -50,3 +50,4 @@
- 		throw new UnsupportedOperationException();
- 	}
- }
-+*/
 --- a/trident/src/main/resources/META-INF/trident-plugin.properties
 +++ b/trident/src/main/resources/META-INF/trident-plugin.properties
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,5 @@
  UIToolkitHandler=org.pushingpixels.trident.swt.SWTToolkitHandler
  PropertyInterpolatorSource=org.pushingpixels.trident.swt.SWTPropertyInterpolators
  
 -UIToolkitHandler=org.pushingpixels.trident.android.AndroidToolkitHandler
 -PropertyInterpolatorSource=org.pushingpixels.trident.android.AndroidPropertyInterpolators
-+#UIToolkitHandler=org.pushingpixels.trident.android.AndroidToolkitHandler
-+#PropertyInterpolatorSource=org.pushingpixels.trident.android.AndroidPropertyInterpolators
  
  PropertyInterpolatorSource=org.pushingpixels.trident.interpolator.CorePropertyInterpolators
 \ No newline at end of file
---- a/trident/src/main/java/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java
-+++ b/trident/src/main/java/org/pushingpixels/trident/android/AndroidPropertyInterpolators.java
-@@ -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. 
-  */
--package org.pushingpixels.trident.android;
-+/*package org.pushingpixels.trident.android;
- 
- import java.util.*;
- 
-@@ -35,12 +35,13 @@
- import org.pushingpixels.trident.interpolator.PropertyInterpolatorSource;
+--- a/trident/build.gradle
++++ b/trident/build.gradle
+@@ -4,6 +4,14 @@
+   compile group: 'net.jcip', name:'jcip-annotations', version: '1.0'
+ }
  
- import android.graphics.*;
--
-+*/
- /**
-  * Built-in interpolators for Android classes.
-  * 
-  * @author Kirill Grouchnikov
-  */
-+/*
- public class AndroidPropertyInterpolators implements PropertyInterpolatorSource {
- 	private Set<PropertyInterpolator> interpolators;
++sourceSets {
++  main {
++    java {
++      exclude "**/android*"
++    }
++  }
++}
++
+ jar {
+   exclude 'META-INF/trident-plugin-*.properties'
  
-@@ -162,3 +163,4 @@
- 		}
- 	}
- }
-+*/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/insubstantial.git