[qgis] 02/06: New upstream version 2.14.20+dfsg

Bas Couwenberg sebastic at debian.org
Sat Oct 28 10:55:09 UTC 2017 

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

sebastic pushed a commit to branch master
in repository qgis.

commit f4072d7194dd6a866b2d1781b985180b9bf4b82b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 28 09:52:03 2017 +0200

    New upstream version 2.14.20+dfsg
---
 CMakeLists.txt                                     |  2 +-
 ChangeLog                                          | 24 ++++++++++++++++++++++
 debian/changelog                                   | 10 +++++++--
 debian/control.in                                  |  1 +
 debian/mime/application/x-adobe-mif.desktop        |  8 --------
 debian/mime/application/x-esri-crs.desktop         |  8 --------
 debian/mime/application/x-esri-shape.desktop       |  8 --------
 debian/mime/application/x-mapinfo-mif.desktop      |  9 --------
 .../mime/application/x-qgis-layer-settings.desktop |  8 --------
 debian/mime/application/x-qgis-project.desktop     |  9 --------
 debian/mime/application/x-raster-aig.desktop       |  8 --------
 debian/mime/application/x-raster-ecw.desktop       |  8 --------
 debian/mime/application/x-raster-mrsid.desktop     |  8 --------
 debian/qgis.install                                |  1 -
 debian/rules                                       |  5 ++---
 python/core/qgscoordinatetransform.sip             |  3 +++
 16 files changed, 39 insertions(+), 81 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d34962..791fa33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "14")
-SET(CPACK_PACKAGE_VERSION_PATCH "19")
+SET(CPACK_PACKAGE_VERSION_PATCH "20")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Essen")
 IF (POLICY CMP0048) # in CMake 3.0.0+
diff --git a/ChangeLog b/ChangeLog
index 475f902..0e87783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+Juergen E. Fischer <jef at norbit.de>	2017-08-22
+
+    bring back sip workaround, but only for the affected versions (followup 7e4345a9d)
+
+    (cherry picked from commit 2abb209d248b27f9716029966eb9a11631fa9e2f)
+
+Juergen E. Fischer <jef at norbit.de>	2017-09-27
+
+    debian package: handle grass RC abis
+
+Juergen E. Fischer <jef at norbit.de>	2017-09-27
+
+    debian packaging: depend on grass abi
+
+    (cherry picked from commit ac890ba2a3f3b59d754b1fcd818d053f8189c96d)
+
+Juergen E. Fischer <jef at norbit.de>	2017-09-18
+
+    debian packaging: drop mimelnk files for KDE3
+
+Juergen E. Fischer <jef at norbit.de>	2017-09-15
+
+    Release of 2.14.19
+
 rldhont <rldhont at gmail.com>	2017-09-12
 
     [BUFIX][Server] GetFeatureInfo on Raster Layer, fix valid identify
diff --git a/debian/changelog b/debian/changelog
index 0a402e8..836db5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-qgis (2.14.19) UNRELEASED; urgency=medium
+qgis (2.14.20) UNRELEASED; urgency=medium
+
+  * Release of 2.14.20
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 27 Oct 2017 14:00:19 +0200
+
+qgis (2.14.19) unstable; urgency=medium
 
   * Release of 2.14.19
 
- -- Jürgen E. Fischer <jef at norbit.de>  Fri, 15 Sep 2017 15:08:40 +0200
+ -- Jürgen E. Fischer <jef at norbit.de>  Fri, 27 Oct 2017 14:00:19 +0200
 
 qgis (2.14.18) unstable; urgency=medium
 
diff --git a/debian/control.in b/debian/control.in
index 4690f4f..b2daa37 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -314,6 +314,7 @@ Depends:
  qgis-provider-grass (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
+ grass{GRASSABI},
 #!precise# grass-core
 #precise# grass
 Replaces: qgis-provider-grass (<< 1:2.11.0+git20151002)
diff --git a/debian/mime/application/x-adobe-mif.desktop b/debian/mime/application/x-adobe-mif.desktop
deleted file mode 100644
index e6a5576..0000000
--- a/debian/mime/application/x-adobe-mif.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-adobe-mif
-Hidden=false
-Comment=Adobe FrameMaker MIF file
-Patterns=*.mif;
-X-KDE-PatternsAccuracy=51
-X-KDE-IsAlso=application/x-mif
diff --git a/debian/mime/application/x-esri-crs.desktop b/debian/mime/application/x-esri-crs.desktop
deleted file mode 100644
index 7c8778d..0000000
--- a/debian/mime/application/x-esri-crs.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-esri-crs
-Hidden=false
-Comment=ESRI coordinate reference system
-Comment[de]=ESRI-Koordinatenbezugssystem
-Icon=qgis-mime
-Patterns=*.prj;
diff --git a/debian/mime/application/x-esri-shape.desktop b/debian/mime/application/x-esri-shape.desktop
deleted file mode 100644
index 9888eeb..0000000
--- a/debian/mime/application/x-esri-shape.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-esri-shape
-Hidden=false
-Comment=ESRI shape file
-Comment[de]=ESRI-Shapedatei
-Icon=qgis-mime
-Patterns=*.shp;*.shx;
diff --git a/debian/mime/application/x-mapinfo-mif.desktop b/debian/mime/application/x-mapinfo-mif.desktop
deleted file mode 100644
index 96d824d..0000000
--- a/debian/mime/application/x-mapinfo-mif.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-mapinfo-mif
-Hidden=false
-Comment=MapInfo file
-Comment[de]=MapInfo-Datei
-Patterns=*.mif;
-Icon=qgis-mime
-X-KDE-PatternsAccuracy=60
diff --git a/debian/mime/application/x-qgis-layer-settings.desktop b/debian/mime/application/x-qgis-layer-settings.desktop
deleted file mode 100644
index 9bfe821..0000000
--- a/debian/mime/application/x-qgis-layer-settings.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-qgis-layer-settings
-Hidden=false
-Comment=QGIS layer settings
-Comment[de]=QGIS Layer Einstellungen
-Icon=qgis-mime
-Patterns=*.qml;
diff --git a/debian/mime/application/x-qgis-project.desktop b/debian/mime/application/x-qgis-project.desktop
deleted file mode 100644
index 05aa74e..0000000
--- a/debian/mime/application/x-qgis-project.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-qgis-project
-Hidden=false
-Comment=QGIS Project
-Comment[de]=QGIS-Projekt
-Patterns=*.qgs;
-Icon=qgis-mime
-X-KDE-IsAlso=application/x-qgis
diff --git a/debian/mime/application/x-raster-aig.desktop b/debian/mime/application/x-raster-aig.desktop
deleted file mode 100644
index 888f55c..0000000
--- a/debian/mime/application/x-raster-aig.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-raster-aig
-Hidden=false
-Comment=AIG raster data
-Comment[de]=AIG-Rasterdaten
-Icon=qgis-mime
-Patterns=*.aig;
diff --git a/debian/mime/application/x-raster-ecw.desktop b/debian/mime/application/x-raster-ecw.desktop
deleted file mode 100644
index 9bea266..0000000
--- a/debian/mime/application/x-raster-ecw.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-raster-ecw
-Hidden=false
-Comment=ECW raster data
-Comment[de]=ECW-Rasterdaten
-Icon=qgis-mime
-Patterns=*.ecw;
diff --git a/debian/mime/application/x-raster-mrsid.desktop b/debian/mime/application/x-raster-mrsid.desktop
deleted file mode 100644
index 32a2afb..0000000
--- a/debian/mime/application/x-raster-mrsid.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=MimeType
-MimeType=application/x-raster-mrsid
-Hidden=false
-Comment=MrSID raster data
-Comment[de]=MrSID-Rasterdaten
-Icon=qgis-mime
-Patterns=*.sid;
diff --git a/debian/qgis.install b/debian/qgis.install
index b452705..a940eed 100644
--- a/debian/qgis.install
+++ b/debian/qgis.install
@@ -18,5 +18,4 @@ usr/lib/qgis/qgis_help
 usr/share/pixmaps/
 usr/share/applications/
 usr/share/mime/packages/
-usr/share/mimelnk/
 usr/share/icons/hicolor/
diff --git a/debian/rules b/debian/rules
index 846152b..4523b91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p
 QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
 GRASSVER=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1))
+GRASSABI=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2,3|sed -e 's/RC/-/'))
 
 WITH_GLOBE=$(shell dpkg --compare-versions "$$(dpkg-query -W --showformat='$${Version}' libosgearth-dev)" lt 2.7 && echo 1)
 
@@ -210,6 +211,7 @@ $(2): $(1)
 		-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
 		-e "s/\{GRASS\}/$(GRASS)/g" \
 		-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
+		-e "s/\{GRASSABI\}/$(GRASSABI)/g" \
 		-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
 		$$^ >$$@
 
@@ -296,9 +298,6 @@ override_dh_auto_install:
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mime/packages
 	install -o root -g root -m 644 $(CURDIR)/debian/qgis.xml $(CURDIR)/debian/tmp/usr/share/mime/packages
 
-	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/mimelnk/application
-	install -o root -g root -m 644 $(CURDIR)/debian/mime/application/* $(CURDIR)/debian/tmp/usr/share/mimelnk/application
-
 	# qgis binaries
 	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
 	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin
diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
index 464952d..900967d 100644
--- a/python/core/qgscoordinatetransform.sip
+++ b/python/core/qgscoordinatetransform.sip
@@ -15,6 +15,9 @@
 class QgsCoordinateTransform : QObject
 {
 %TypeHeaderCode
+#if (SIP_VERSION >= 0x041300 && SIP_VERSION < 0x041303)
+extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
+#endif
 #include <qgscoordinatetransform.h>
 %End
 

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

More information about the Pkg-grass-devel mailing list