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

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 4b92f01ecd1a903112502fbc96456b90414653d0
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sat Feb 8 05:06:44 2014 +0100

    Don't include /usr/share/qgis/resources/srs.db in qgis-providers-common, 
updated in postinst by crssync. Remove srs.db in prerm.
    
    Upstream separately fixed this issue in:
    
    https://github.com/qgis/QGIS/commit/f06e72efcd2de347be6918a2ff278f17dc8a0b0c
    
    This commit merges the upstream changes with the initial changes for Debian.
---
 debian/changelog                      | 7 +++++++
 debian/qgis-providers-common.install  | 2 +-
 debian/qgis-providers-common.postinst | 1 +
 debian/qgis-providers-common.prerm    | 8 ++++++++
 debian/rules                          | 3 +++
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 29caf40..68d0a76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ qgis (2.0.1-2) UNRELEASED; urgency=low
   * Fix broken ARM patch by Konstantinos Margaritis.
   * Fix qreal vs double issues with qmin and qmax.
 
+  [ J├╝rgen E. Fischer ]
+  * run crssync on copy of srs.db
+    (closes: #738117)
+
+  [ Bas Couwenberg ]
+  * Additional checks in qgis-providers-common.postinst 
+
  -- Bas Couwenberg <sebas...@xs4all.nl>  Fri, 31 Jan 2014 19:42:03 +0100
 
 qgis (2.0.1-1) unstable; urgency=low
diff --git a/debian/qgis-providers-common.install 
b/debian/qgis-providers-common.install
index ae057f2..e422e0d 100644
--- a/debian/qgis-providers-common.install
+++ b/debian/qgis-providers-common.install
@@ -1,6 +1,6 @@
 usr/share/qgis/svg/*
 usr/share/qgis/resources/qgis.db
-usr/share/qgis/resources/srs.db
+usr/share/qgis/resources/srs-template.db
 usr/share/qgis/resources/customization.xml
 usr/share/qgis/resources/symbology-ng-style.db
 usr/share/qgis/resources/cpt-city-qgis-min/*
diff --git a/debian/qgis-providers-common.postinst 
b/debian/qgis-providers-common.postinst
index 8558067..e829bf1 100755
--- a/debian/qgis-providers-common.postinst
+++ b/debian/qgis-providers-common.postinst
@@ -2,6 +2,7 @@
 set -e
 
 if [ "$1" = "configure" ] && [ -x /usr/lib/qgis/crssync ]; then
+       cp /usr/share/qgis/resources/srs-template.db 
/usr/share/qgis/resources/srs.db
        /usr/lib/qgis/crssync
 fi
 
diff --git a/debian/qgis-providers-common.prerm 
b/debian/qgis-providers-common.prerm
new file mode 100644
index 0000000..645e28b
--- /dev/null
+++ b/debian/qgis-providers-common.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ] && [ -e /usr/share/qgis/resources/srs.db ]; then
+       rm -f /usr/share/qgis/resources/srs.db || true
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index d227d99..2303558 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,6 +119,9 @@ override_dh_auto_install:
        $(RM) -f $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
        $(RM) -f $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
 
+       # Don't ship srs.db, automatically updated in postinst with crssync
+       mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db 
$(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
+
        # Install menu pixmap
        install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
        install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg 
$(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to