From 96b74ee063e9d6d0f21bcbc14cf6f1d93c2c0767 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 18 Mar 2012 21:20:26 +0100 Subject: [PATCH] new approach to not doing version check on launch --- core/resources/build.properties | 4 ++-- debian/patches/debian-build.source.diff | 25 +++++++++++++++++++++++-- debian/patches/dont-check-updates.diff | 13 ------------- debian/patches/series | 1 - 4 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 debian/patches/dont-check-updates.diff diff --git a/core/resources/build.properties b/core/resources/build.properties index d12cc3a3..4897a420 100644 --- a/core/resources/build.properties +++ b/core/resources/build.properties @@ -8,9 +8,9 @@ build.version=12.03 # distribution (Debian, Fedora etc.), this should be changed appropriately! # This is included in bug reports to identify the source of the software. -build.source=default +build.source=Debian # Whether checking for updates is enabled by default. -build.checkupdates=true +build.checkupdates=false diff --git a/debian/patches/debian-build.source.diff b/debian/patches/debian-build.source.diff index 21523405..a0d51cc8 100644 --- a/debian/patches/debian-build.source.diff +++ b/debian/patches/debian-build.source.diff @@ -1,8 +1,8 @@ diff --git a/core/resources/build.properties b/core/resources/build.properties -index 73ec3d0..e0cd5fa 100644 +index d12cc3a..4897a42 100644 --- a/core/resources/build.properties +++ b/core/resources/build.properties -@@ -8,7 +8,7 @@ build.version=1.0.0 +@@ -8,9 +8,9 @@ build.version=12.03 # distribution (Debian, Fedora etc.), this should be changed appropriately! # This is included in bug reports to identify the source of the software. @@ -11,3 +11,24 @@ index 73ec3d0..e0cd5fa 100644 # Whether checking for updates is enabled by default. + +-build.checkupdates=true ++build.checkupdates=false +diff --git a/debian/patches/debian-build.source.diff b/debian/patches/debian-build.source.diff +index 2152340..e69de29 100644 +--- a/debian/patches/debian-build.source.diff ++++ b/debian/patches/debian-build.source.diff +@@ -1,13 +0,0 @@ +-diff --git a/core/resources/build.properties b/core/resources/build.properties +-index 73ec3d0..e0cd5fa 100644 +---- a/core/resources/build.properties +-+++ b/core/resources/build.properties +-@@ -8,7 +8,7 @@ build.version=1.0.0 +- # distribution (Debian, Fedora etc.), this should be changed appropriately! +- # This is included in bug reports to identify the source of the software. +- +--build.source=default +-+build.source=Debian +- +- +- # Whether checking for updates is enabled by default. diff --git a/debian/patches/dont-check-updates.diff b/debian/patches/dont-check-updates.diff deleted file mode 100644 index ff46e70b..00000000 --- a/debian/patches/dont-check-updates.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/net/sf/openrocket/util/Prefs.java b/src/net/sf/openrocket/util/Prefs.java -index 9cd9e7a..7dc0f67 100644 ---- a/src/net/sf/openrocket/util/Prefs.java -+++ b/src/net/sf/openrocket/util/Prefs.java -@@ -109,7 +109,7 @@ public class Prefs { - if (value != null) - DEFAULT_CHECK_UPDATES = Boolean.parseBoolean(value); - else -- DEFAULT_CHECK_UPDATES = true; -+ DEFAULT_CHECK_UPDATES = false; - - } catch (IOException e) { - throw new MissingResourceException( diff --git a/debian/patches/series b/debian/patches/series index ed1a7e89..2a882d49 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ debian-build.source.diff use-system-libs.diff skip-unittest.diff -dont-check-updates.diff -- 2.47.2