Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

Conflicts:
	android/libs/android-support-v4.jar

diff --git a/android/libs/android-support-v4.jar b/android/libs/android-support-v4.jar
deleted file mode 100644 (file)
index 1fbeba0..0000000
Binary files a/android/libs/android-support-v4.jar and /dev/null differ

diff --git a/cleanup-script.sh b/cleanup-script.sh
new file mode 100755 (executable)
index 0000000..4bac64e
--- /dev/null
+++ b/cleanup-script.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+#      clean upstream source to achieve DFSG compliance
+#      Copyright 2010 by Bdale Garbee.  GPL v2 or any later version.
+#
+
+git rm -rf dists lib lib-extra lib-test web
+rm -rf dists lib lib-extra lib-test web
+
+exit 0

diff --git a/core/lib-extra/RXTXcomm.jar b/core/lib-extra/RXTXcomm.jar
deleted file mode 100644 (file)
index 84e5f01..0000000
Binary files a/core/lib-extra/RXTXcomm.jar and /dev/null differ

diff --git a/core/lib-test/hamcrest-core-1.3.0RC1.jar b/core/lib-test/hamcrest-core-1.3.0RC1.jar
deleted file mode 100644 (file)
index 1195cb7..0000000
Binary files a/core/lib-test/hamcrest-core-1.3.0RC1.jar and /dev/null differ

diff --git a/core/lib-test/hamcrest-library-1.3.0RC1.jar b/core/lib-test/hamcrest-library-1.3.0RC1.jar
deleted file mode 100644 (file)
index 8e6568b..0000000
Binary files a/core/lib-test/hamcrest-library-1.3.0RC1.jar and /dev/null differ

diff --git a/core/lib-test/jmock-2.6.0-RC2.jar b/core/lib-test/jmock-2.6.0-RC2.jar
deleted file mode 100644 (file)
index a846450..0000000
Binary files a/core/lib-test/jmock-2.6.0-RC2.jar and /dev/null differ

diff --git a/core/lib-test/jmock-junit4-2.6.0-RC2.jar b/core/lib-test/jmock-junit4-2.6.0-RC2.jar
deleted file mode 100644 (file)
index 129e561..0000000
Binary files a/core/lib-test/jmock-junit4-2.6.0-RC2.jar and /dev/null differ

diff --git a/core/lib-test/junit-dep-4.8.2.jar b/core/lib-test/junit-dep-4.8.2.jar
deleted file mode 100644 (file)
index f28b4ef..0000000
Binary files a/core/lib-test/junit-dep-4.8.2.jar and /dev/null differ

diff --git a/core/lib-test/uispec4j-2.3-jdk16.jar b/core/lib-test/uispec4j-2.3-jdk16.jar
deleted file mode 100644 (file)
index eb39676..0000000
Binary files a/core/lib-test/uispec4j-2.3-jdk16.jar and /dev/null differ

diff --git a/core/lib/iText-5.0.2.jar b/core/lib/iText-5.0.2.jar
deleted file mode 100644 (file)
index ed95653..0000000
Binary files a/core/lib/iText-5.0.2.jar and /dev/null differ

diff --git a/core/lib/jcommon-1.0.16.jar b/core/lib/jcommon-1.0.16.jar
deleted file mode 100644 (file)
index 4cd6807..0000000
Binary files a/core/lib/jcommon-1.0.16.jar and /dev/null differ

diff --git a/core/lib/jfreechart-1.0.13.jar b/core/lib/jfreechart-1.0.13.jar
deleted file mode 100644 (file)
index 83c6993..0000000
Binary files a/core/lib/jfreechart-1.0.13.jar and /dev/null differ

diff --git a/core/lib/miglayout15-swing.jar b/core/lib/miglayout15-swing.jar
deleted file mode 100644 (file)
index 2e53012..0000000
Binary files a/core/lib/miglayout15-swing.jar and /dev/null differ