[qgis] 01/01: Disable check for new version of QGIS at startup.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qgis.

commit 8f2b5e3a924f75aa69b6fcc335282d1403fb45d8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue May 3 22:11:46 2016 +0200

    Disable check for new version of QGIS at startup.
    
    To re-enable the version check, edit /etc/defaults/qgis
    and remove --noversioncheck from QGIS_OPTS.
---
 debian/changelog     | 9 +++++++++
 debian/qgis.defaults | 2 ++
 debian/qgis.sh       | 6 +++++-
 debian/rules         | 4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eab7995..c2a6fcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qgis (2.14.2+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Disable check for new version of QGIS at startup.
+    To re-enable the version check, edit /etc/defaults/qgis
+    and remove --noversioncheck from QGIS_OPTS.
+    (closes: #823283)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 03 May 2016 21:38:33 +0200
+
 qgis (2.14.2+dfsg-1~exp1) experimental; urgency=medium
 
   [ Jürgen E. Fischer ]
diff --git a/debian/qgis.defaults b/debian/qgis.defaults
new file mode 100644
index 0000000..89858f7
--- /dev/null
+++ b/debian/qgis.defaults
@@ -0,0 +1,2 @@
+# Options to pass to qgis
+QGIS_OPTS='--noversioncheck'
diff --git a/debian/qgis.sh b/debian/qgis.sh
index 6acef4d..a709000 100644
--- a/debian/qgis.sh
+++ b/debian/qgis.sh
@@ -10,4 +10,8 @@ fi
 
 export LD_LIBRARY_PATH
 
-exec $0.bin "$@"
+if [ -r /etc/default/qgis ]; then
+	. /etc/default/qgis
+fi
+
+exec $0.bin $QGIS_OPTS "$@"
diff --git a/debian/rules b/debian/rules
index ce5630a..ed930c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -288,6 +288,10 @@ install-arch-stamp:
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qbrowser
 
+	# defaults options for wrappers
+	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/etc/defaults
+	install -o root -g root -m 644 $(CURDIR)/debian/qgis.defaults $(CURDIR)/debian/qgis/etc/defaults/qgis
+
 	touch $@
 
 override_dh_auto_install-indep: install-arch-stamp

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