From: Bdale Garbee Date: Sun, 16 Sep 2012 22:26:50 +0000 (-0600) Subject: Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream X-Git-Tag: upstream/12.09 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=9349577cdfdff682b2aabd6daa24fdc3a7449b58;hp=42b2e5ca519766e37ce6941ba4faecc9691cc403;p=debian%2Fopenrocket 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 index 1fbeba09..00000000 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 index 00000000..4bac64e3 --- /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 index 84e5f01d..00000000 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 index 1195cb7f..00000000 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 index 8e6568b5..00000000 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 index a846450f..00000000 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 index 129e5613..00000000 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 index f28b4ef0..00000000 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 index eb396763..00000000 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 index ed956531..00000000 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 index 4cd68074..00000000 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 index 83c69931..00000000 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 index 2e530125..00000000 Binary files a/core/lib/miglayout15-swing.jar and /dev/null differ