[qgis] branch master updated (18c64cd - 432b044)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch master in repository qgis. from 18c64cd Use dh_sip helper for sip:Depends substvar. new 9f37f49 Apply fixes from Peter Green to ARM patch. new 1a8fa5b Add patch from Peter Green to fix qreal vs double issues with qmin and qmax. new 4b92f01 Don't include /usr/share/qgis/resources/srs.db in qgis-providers-common, updated in postinst by crssync. Remove srs.db in prerm. new 117e1a7 Add patch to fix mis-detection of PostGIS table types. new 6796152 Add patch to not look for topology layers without topology support. new d7c76b6 Add patch to fix postgis topology availability detection query. new 856990c Use dh --parallel instead of make flags. new 62892b5 Add patch to disable features on ARM. new b975557 Add qgis-crssync dpkg trigger to run crssync after installing the srs.db. (closes: #738273) new a3113cc Also build osgEarth globe plugin. new b19c25d Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. new fafdd23 Use dh commands instead of CMake directly. new 432b044 Set distribution to unstable. The 13 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 27 + debian/control | 23 debian/patches/disable-features-on-arm.patch | 67 ++ debian/patches/fix-qreal-vs-double.patch | 45 +++ ...y-to-detect-postgis-topology-availability.patch | 17 ++ .../mis-detection-of-PostGIS-table-type.patch | 67 ++ .../postgres-provider-topology-support.patch | 15 + debian/patches/qgis_arm.patch | 19 +++--- debian/patches/series | 5 ++ debian/qgis-providers-common.install | 2 +- debian/qgis-providers-common.postinst | 3 +- debian/qgis-providers-common.prerm | 8 +++ debian/qgis-providers.postinst | 10 debian/qgis-providers.triggers | 1 + debian/rules | 23 +++- 15 files changed, 308 insertions(+), 24 deletions(-) create mode 100644 debian/patches/disable-features-on-arm.patch create mode 100644 debian/patches/fix-qreal-vs-double.patch create mode 100644 debian/patches/fix-query-to-detect-postgis-topology-availability.patch create mode 100644 debian/patches/mis-detection-of-PostGIS-table-type.patch create mode 100644 debian/patches/postgres-provider-topology-support.patch create mode 100644 debian/qgis-providers-common.prerm create mode 100644 debian/qgis-providers.postinst create mode 100644 debian/qgis-providers.triggers -- 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
[qgis] 01/13: Apply fixes from Peter Green to ARM patch.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit 9f37f4980907b29eae23e55681c2fb93f54ece8f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 31 19:42:44 2014 +0100 Apply fixes from Peter Green to ARM patch. --- debian/changelog | 7 +++ debian/patches/qgis_arm.patch | 19 --- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7d973d..ae13310 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +qgis (2.0.1-2) UNRELEASED; urgency=low + + [ Peter Michael Green ] + * Fix broken ARM patch by Konstantinos Margaritis. + + -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 + qgis (2.0.1-1) unstable; urgency=low [ Jürgen E. Fischer ] diff --git a/debian/patches/qgis_arm.patch b/debian/patches/qgis_arm.patch index e19ed0b..1dc106d 100644 --- a/debian/patches/qgis_arm.patch +++ b/debian/patches/qgis_arm.patch @@ -1,7 +1,10 @@ Description: On armel/armhf qreal is typedef'ed to float not double. + This patch adds qreal versions of some functions on arm. It was originally + writen by Konstantinos Margaritis and later fixed by Peter Michael Green Author: Konstantinos Margaritis konstantinos.margari...@freevec.org +Author: Peter Michael Green plugw...@debian.org Bug-Debian: http://bugs.debian.org/691333 -Last-Update: 2014-01-17 +Last-Update: 2014-02-06 --- a/src/core/qgscoordinatetransform.h +++ b/src/core/qgscoordinatetransform.h @@ -154,6 +154,9 @@ class CORE_EXPORT QgsCoordinateTransform @@ -35,8 +38,8 @@ Last-Update: 2014-01-17 +#ifdef QT_ARCH_ARM +void QgsMapToPixel::transformInPlace( qreal x, qreal y ) const +{ -+ double xd = (double) x, yd = (double) y; -+ transformInPlace(xd, yd); ++ x = ( x - xMin ) / mMapUnitsPerPixel; ++ y = yMax - ( y - yMin ) / mMapUnitsPerPixel; +} +#endif + @@ -50,7 +53,7 @@ Last-Update: 2014-01-17 + --- a/src/core/qgscoordinatetransform.cpp +++ b/src/core/qgscoordinatetransform.cpp -@@ -416,6 +416,15 @@ void QgsCoordinateTransform::transformIn +@@ -388,6 +388,17 @@ void QgsCoordinateTransform::transformIn } } @@ -60,9 +63,11 @@ Last-Update: 2014-01-17 +{ + double xd = (double) x, yd = (double) y; + transformInPlace(xd, yd, z, direction); ++ x=xd; ++ y=yd; +} +#endif + - void QgsCoordinateTransform::transformInPlace( - QVectorfloat x, QVectorfloat y, QVectorfloat z, - TransformDirection direction ) const + #ifdef ANDROID + void QgsCoordinateTransform::transformInPlace( float x, float y, float z, + TransformDirection direction ) const -- 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
[qgis] 10/13: Also build osgEarth globe plugin.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit a3113ccf843b908f2e202a275d8306f3c8dc2e89 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Feb 14 03:15:45 2014 +0100 Also build osgEarth globe plugin. --- debian/changelog | 1 + debian/control | 23 +++ debian/rules | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6ee5030..9eadfcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low * Add qgis-crssync dpkg trigger to run crssync after installing the srs.db. Thanks to Andreas Beckmann for the assistance. (closes: #738273) + * Also build osgEarth globe plugin. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/control b/debian/control index 21597bb..02f2988 100644 --- a/debian/control +++ b/debian/control @@ -59,6 +59,7 @@ Depends: ${shlibs:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version}) Recommends: qgis-plugin-grass, +qgis-plugin-globe, python-qgis Suggests: gpsbabel Conflicts: uim-qt3 @@ -219,6 +220,28 @@ Description: GRASS plugin for QGIS - architecture-independent data This package contains architecture-independent supporting data files for use with the QGIS GRASS plugin. +Package: qgis-plugin-globe +Architecture: any +Depends: qgis (= ${binary:Version}), + qgis-plugin-globe-common (= ${source:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Description: OSG globe plugin for QGIS + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This plugin enables 3D viewing using OSG globe in the QGIS. + +Package: qgis-plugin-globe-common +Architecture: all +Depends: ${misc:Depends} +Description: OSG GLOBE plugin for QGIS - architecture-independent data + QGIS is a Geographic Information System (GIS) which manages, analyzes and + display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the QGIS GLOBE plugin. + Package: python-qgis Architecture: any Section: python diff --git a/debian/rules b/debian/rules index e79ed74..3d5d50f 100755 --- a/debian/rules +++ b/debian/rules @@ -43,7 +43,7 @@ CMAKE_OPTS := \ -DWITH_INTERNAL_SPATIALITE=FALSE \ -DWITH_PYSPATIALITE=FALSE \ -DWITH_QSPATIALITE=TRUE \ - -DWITH_GLOBE=FALSE \ + -DWITH_GLOBE=TRUE \ -DPYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -- 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
[qgis] 12/13: Use dh commands instead of CMake directly.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit fafdd23b79d3d79941199c426171bc5cb868f4c5 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Feb 14 03:26:12 2014 +0100 Use dh commands instead of CMake directly. --- debian/changelog | 1 + debian/rules | 8 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5f97028..65c54b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low (closes: #738273) * Also build osgEarth globe plugin. * Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. + * Use dh commands instead of CMake directly. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/rules b/debian/rules index 2555336..1f1d031 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,6 @@ GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) CMAKE_OPTS := \ -DCMAKE_VERBOSE_MAKEFILE=1 \ -DGRASS_PREFIX=/usr/lib/grass64 \ - -DCMAKE_INSTALL_PREFIX=/usr \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ -DPEDANTIC=TRUE \ -DWITH_MAPSERVER=TRUE \ @@ -89,17 +88,14 @@ override_dh_clean: -$(RM) -rf build/ override_dh_auto_configure: - mkdir -p build cd build cmake .. $(CMAKE_OPTS) - -override_dh_auto_build: - $(MAKE) -C build + dh_auto_configure -- $(CMAKE_OPTS) override_dh_auto_test: # Don't run tests, requires network #-LD_LIBRARY_PATH=$(PWD)/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C build $(DEB_TEST_TARGET) override_dh_auto_install: - $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp + dh_auto_install # remove unwanted files $(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox -- 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
[qgis] 13/13: Set distribution to unstable.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit 432b0443130126cbed660f2600345e425ee23700 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Feb 14 17:20:35 2014 +0100 Set distribution to unstable. --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65c54b8..12ee457 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qgis (2.0.1-2) UNRELEASED; urgency=low +qgis (2.0.1-2) unstable; urgency=low [ Peter Michael Green ] * Fix broken ARM patch by Konstantinos Margaritis. @@ -23,7 +23,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low * Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. * Use dh commands instead of CMake directly. - -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 + -- Bas Couwenberg sebas...@xs4all.nl Fri, 14 Feb 2014 17:20:12 +0100 qgis (2.0.1-1) unstable; urgency=low -- 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
[qgis] 09/13: Add qgis-crssync dpkg trigger to run crssync after installing the srs.db. (closes: #738273)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit b975557ad9a33861b1186344837fd23e449abe63 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sun Feb 9 16:52:25 2014 +0100 Add qgis-crssync dpkg trigger to run crssync after installing the srs.db. (closes: #738273) Thanks to Andreas Beckmann for the assistance. --- debian/changelog | 3 +++ debian/qgis-providers-common.postinst | 2 +- debian/qgis-providers.postinst| 10 ++ debian/qgis-providers.triggers| 1 + 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6ce7ad7..6ee5030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ qgis (2.0.1-2) UNRELEASED; urgency=low * Use dh --parallel instead of make flags. * Add patch to disable features on ARM. (closes: 737814) + * Add qgis-crssync dpkg trigger to run crssync after installing the srs.db. +Thanks to Andreas Beckmann for the assistance. +(closes: #738273) -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/qgis-providers-common.postinst b/debian/qgis-providers-common.postinst index e829bf1..4dbcfa6 100755 --- a/debian/qgis-providers-common.postinst +++ b/debian/qgis-providers-common.postinst @@ -3,7 +3,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 + dpkg-trigger qgis-crssync fi #DEBHELPER# diff --git a/debian/qgis-providers.postinst b/debian/qgis-providers.postinst new file mode 100644 index 000..698766a --- /dev/null +++ b/debian/qgis-providers.postinst @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +if [ $1 = triggered ] || [ $1 = configure ]; then + if [ -w /usr/share/qgis/resources/srs.db ] [ -x /usr/lib/qgis/crssync ]; then + /usr/lib/qgis/crssync + fi +fi + +#DEBHELPER# diff --git a/debian/qgis-providers.triggers b/debian/qgis-providers.triggers new file mode 100644 index 000..e9f5946 --- /dev/null +++ b/debian/qgis-providers.triggers @@ -0,0 +1 @@ +interest qgis-crssync -- 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
[qgis] 03/13: Don't include /usr/share/qgis/resources/srs.db in qgis-providers-common, updated in postinst by crssync. Remove srs.db in prerm.
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 000..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
[qgis] 07/13: Use dh --parallel instead of make flags.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit 856990c5ea6396448b685f64f29fa9e07193f06e Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 8 05:53:46 2014 +0100 Use dh --parallel instead of make flags. --- debian/changelog | 1 + debian/rules | 7 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ed18f6..424ee06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low * Add patch to fix mis-detection of PostGIS table types. * Add patch to not look for topology layers without topology support. * Add patch to fix postgis topology availability detection query. + * Use dh --parallel instead of make flags. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/rules b/debian/rules index 2303558..e79ed74 100755 --- a/debian/rules +++ b/debian/rules @@ -60,11 +60,6 @@ MAKEFLAGS += VERBOSE=YES DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - CFLAGS += $(CPPFLAGS) CXXFLAGS += $(CPPFLAGS) @@ -83,7 +78,7 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS))) endif %: - dh $@ --with python2,pkgkde_symbolshelper + dh $@ --with python2,pkgkde_symbolshelper --parallel override_dh_clean: dh_clean -- 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
[qgis] 02/13: Add patch from Peter Green to fix qreal vs double issues with qmin and qmax.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit 1a8fa5bce0d31d44e76a001f7e7a3e3a51659d16 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 8 05:33:07 2014 +0100 Add patch from Peter Green to fix qreal vs double issues with qmin and qmax. --- debian/changelog | 1 + debian/patches/fix-qreal-vs-double.patch | 45 debian/patches/series| 1 + 3 files changed, 47 insertions(+) diff --git a/debian/changelog b/debian/changelog index ae13310..29caf40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low [ Peter Michael Green ] * Fix broken ARM patch by Konstantinos Margaritis. + * Fix qreal vs double issues with qmin and qmax. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/patches/fix-qreal-vs-double.patch b/debian/patches/fix-qreal-vs-double.patch new file mode 100644 index 000..aac8c00 --- /dev/null +++ b/debian/patches/fix-qreal-vs-double.patch @@ -0,0 +1,45 @@ +Description: Fix qreal vs double. + In qt4 on arm architectures qreal is defined as float while on other + architectures it is defined as double. This can cause problems if qreal + and double are carelessly mixed. + . + In this particular case the problem is that qMin/qMax are templates defined + to take two parameters of the same type. If two different types are passed + in then C++ can't resolve what type the template parameter should be and + bails out. The fix is simple, typecast one of the parameters so they + match. + . +Author: Peter Michael Green plugw...@debian.org +Bug-Debian: http://bugs.debian.org/737814 + +--- a/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_curve.cpp +@@ -433,7 +433,7 @@ void QwtPolarCurve::drawLines( QPainter + + if ( !clipRect.isEmpty() ) + { +-double off = qCeil( qMax( 1.0, painter-pen().widthF() ) ); ++double off = qCeil( qMax((qreal)1.0,painter-pen().widthF() ) ); + clipRect = clipRect.toRect().adjusted( -off, -off, off, off ); + polyline = QwtClipper::clipPolygonF( clipRect, polyline ); + } +--- a/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp b/src/app/gps/qwtpolar-1.0/qwt_polar_layout.cpp +@@ -278,7 +278,7 @@ QRectF QwtPolarLayout::layoutLegend( Opt + // We don't allow vertical legends to take more than + // half of the available space. + +-dim = qMin( hint.width(), rect.width() * d_data-legendRatio ); ++dim = qMin( hint.width(), (qreal)(rect.width() * d_data-legendRatio) ); + + if ( !( options IgnoreScrollbars ) ) + { +@@ -293,7 +293,7 @@ QRectF QwtPolarLayout::layoutLegend( Opt + } + else + { +-dim = qMin( hint.height(), rect.height() * d_data-legendRatio ); ++dim = qMin( hint.height(), (qreal)(rect.height() * d_data-legendRatio) ); + dim = qMax( dim, d_data-layoutData.legend.hScrollBarHeight ); + } + diff --git a/debian/patches/series b/debian/patches/series index f713d5a..6cd4cf0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -26,3 +26,4 @@ remove-google-adsense.patch python-env.patch wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch use-local-icon.patch +fix-qreal-vs-double.patch -- 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
[qgis] 04/13: Add patch to fix mis-detection of PostGIS table types.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit 117e1a7ebf2acf74cf18819ba0b255ecce883dde Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 8 05:41:27 2014 +0100 Add patch to fix mis-detection of PostGIS table types. --- debian/changelog | 1 + .../mis-detection-of-PostGIS-table-type.patch | 67 ++ debian/patches/series | 1 + 3 files changed, 69 insertions(+) diff --git a/debian/changelog b/debian/changelog index 68d0a76..94be5d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low [ Bas Couwenberg ] * Additional checks in qgis-providers-common.postinst + * Add patch to fix mis-detection of PostGIS table types. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/patches/mis-detection-of-PostGIS-table-type.patch b/debian/patches/mis-detection-of-PostGIS-table-type.patch new file mode 100644 index 000..c51d13e --- /dev/null +++ b/debian/patches/mis-detection-of-PostGIS-table-type.patch @@ -0,0 +1,67 @@ +From: Sandro Santilli s...@keybit.net +Subject: Backport fix for mis-detection of PostGIS table types +Origin: https://github.com/qgis/QGIS/commit/b90fb29ed2d25b9d988044c8dbb74e3a3f212ba5 +Bug: http://hub.qgis.org/issues/9421 + +Don't try to detect geometry type or srid, if it's already known +Backport of eaf5725f569fab62a67a51c0b0bddbb6a44797a2 by Jef + +--- a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp +@@ -1118,21 +1118,41 @@ void QgsPostgresConn::retrieveLayerTypes + table += QString( WHERE %1 ).arg( layerProperty.sql ); + } + +-QString query = QString( SELECT DISTINCT +- CASE +- WHEN %1 THEN 'POINT' +- WHEN %2 THEN 'LINESTRING' +- WHEN %3 THEN 'POLYGON' +- END, +- %4(%5%6) +- FROM %7 ) +-.arg( postgisTypeFilter( layerProperty.geometryColName, QGis::WKBPoint, layerProperty.geometryColType == sctGeography ) ) +-.arg( postgisTypeFilter( layerProperty.geometryColName, QGis::WKBLineString, layerProperty.geometryColType == sctGeography ) ) +-.arg( postgisTypeFilter( layerProperty.geometryColName, QGis::WKBPolygon, layerProperty.geometryColType == sctGeography ) ) +-.arg( majorVersion() 2 ? srid : st_srid ) +-.arg( quotedIdentifier( layerProperty.geometryColName ) ) +-.arg( layerProperty.geometryColType == sctGeography ? ::geometry : ) +-.arg( table ); ++QString query = SELECT DISTINCT ; ++ ++QGis::WkbType type = layerProperty.types.value( 0, QGis::WKBUnknown ); ++if ( type == QGis::WKBUnknown ) ++{ ++ query += QString( CASE ++ WHEN %1 THEN 'POINT' ++ WHEN %2 THEN 'LINESTRING' ++ WHEN %3 THEN 'POLYGON' ++ END ) ++ .arg( postgisTypeFilter( layerProperty.geometryColName, QGis::WKBPoint, layerProperty.geometryColType == sctGeography ) ) ++ .arg( postgisTypeFilter( layerProperty.geometryColName, QGis::WKBLineString, layerProperty.geometryColType == sctGeography ) ) ++ .arg( postgisTypeFilter( layerProperty.geometryColName, QGis::WKBPolygon, layerProperty.geometryColType == sctGeography ) ); ++} ++else ++{ ++ query += quotedValue( QgsPostgresConn::postgisWkbTypeName( type ) ); ++} ++ ++query += ,; ++ ++int srid = layerProperty.srids.value( 0, INT_MIN ); ++if ( srid == INT_MIN ) ++{ ++ query += QString( %1(%2%3) ) ++ .arg( majorVersion() 2 ? srid : st_srid ) ++ .arg( quotedIdentifier( layerProperty.geometryColName ) ) ++ .arg( layerProperty.geometryColType == sctGeography ? ::geometry : ); ++} ++else ++{ ++ query += QString::number( srid ); ++} ++ ++query += FROM + table; + + QgsDebugMsg( Retrieving geometry types: + query ); + diff --git a/debian/patches/series b/debian/patches/series index 6cd4cf0..1a39578 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -27,3 +27,4 @@ python-env.patch wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch use-local-icon.patch fix-qreal-vs-double.patch +mis-detection-of-PostGIS-table-type.patch -- 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
[qgis] 05/13: Add patch to not look for topology layers without topology support.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit 67961520e930161e171025165775efd2147b6861 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 8 05:46:54 2014 +0100 Add patch to not look for topology layers without topology support. --- debian/changelog| 1 + debian/patches/postgres-provider-topology-support.patch | 15 +++ debian/patches/series | 1 + 3 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 94be5d4..f9c8abc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low [ Bas Couwenberg ] * Additional checks in qgis-providers-common.postinst * Add patch to fix mis-detection of PostGIS table types. + * Add patch to not look for topology layers without topology support. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/patches/postgres-provider-topology-support.patch b/debian/patches/postgres-provider-topology-support.patch new file mode 100644 index 000..001b6d9 --- /dev/null +++ b/debian/patches/postgres-provider-topology-support.patch @@ -0,0 +1,15 @@ +From: Juergen E. Fischer j...@norbit.de +Subject: postgres provider: don't look for topology layers without topology support +Origin: https://github.com/qgis/QGIS/commit/673406d271fbc54071c3cc8835fb1279e4ebe719 +Bug: http://hub.qgis.org/issues/9453 +--- a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp +@@ -307,7 +307,7 @@ bool QgsPostgresConn::getTableInfo( bool + + mLayersSupported.clear(); + +- for ( int i = 0; i 3; i++ ) ++ for ( int i = 0; i (hasTopology() ? 3 : 2); i++ ) + { + QString sql, tableName, schemaName, columnName, typeName, sridName, gtableName; + QgsPostgresGeometryColumnType columnType = sctGeometry; diff --git a/debian/patches/series b/debian/patches/series index 1a39578..2f6dcf2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -28,3 +28,4 @@ wms-c-don-t-crash-if-tile-matrix-set-isn-t-available.patch use-local-icon.patch fix-qreal-vs-double.patch mis-detection-of-PostGIS-table-type.patch +postgres-provider-topology-support.patch -- 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
[qgis] 11/13: Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository qgis. commit b19c25df10e960e14ea1b3b591a905c63cf558b1 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Feb 14 03:23:33 2014 +0100 Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. --- debian/changelog | 1 + debian/rules | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9eadfcd..5f97028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ qgis (2.0.1-2) UNRELEASED; urgency=low Thanks to Andreas Beckmann for the assistance. (closes: #738273) * Also build osgEarth globe plugin. + * Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. -- Bas Couwenberg sebas...@xs4all.nl Fri, 31 Jan 2014 19:42:03 +0100 diff --git a/debian/rules b/debian/rules index 3d5d50f..2555336 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,7 @@ GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e s/\.//g -e GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) CMAKE_OPTS := \ + -DCMAKE_VERBOSE_MAKEFILE=1 \ -DGRASS_PREFIX=/usr/lib/grass64 \ -DCMAKE_INSTALL_PREFIX=/usr \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ @@ -55,8 +56,6 @@ endif CMAKE_OPTS += -DENABLE_TESTS=FALSE #endif -MAKEFLAGS += VERBOSE=YES - DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH) QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins -- 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
[website] branch master updated (ad03813 - 97a4944)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to branch master in repository website. from ad03813 Don't output the XML document when validating. new 97a4944 Improve 'What is Debian GIS' section with the Introduction from the Debian GIS Policy. Use Debian GIS name consistently. The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: HEADER.html | 33 +++-- 1 file changed, 19 insertions(+), 14 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.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
[website] 01/01: Improve 'What is Debian GIS' section with the Introduction from the Debian GIS Policy. Use Debian GIS name consistently.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website. commit 97a4944551b71c5240602ec1ff958f83eb748ce2 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Feb 14 23:11:34 2014 +0100 Improve 'What is Debian GIS' section with the Introduction from the Debian GIS Policy. Use Debian GIS name consistently. --- HEADER.html | 33 +++-- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/HEADER.html b/HEADER.html index 0bc77c5..2318aeb 100644 --- a/HEADER.html +++ b/HEADER.html @@ -5,7 +5,7 @@ head meta name=generator content=HTML Tidy for Linux (vers 25 March 2009), see www.w3.org / - titleDebianGis Project | INDEX/title + titleDebian GIS Project | INDEX/title link rel=icon href=favicon.ico type=image/ico / link rel=shortcut icon href=favicon.ico type=image/ico / meta name=description content=A group inside the debian project dedicated to packaging perl modules from CPAN for debian. / @@ -15,15 +15,21 @@ body div id=wrapper -h1DebianGis Project/h1 +h1Debian GIS Project/h1 -img src=img/debiangis_mollweide.png alt=DebianGis Logo / +img src=img/debiangis_mollweide.png alt=Debian GIS Logo / -h2What is DebianGis ?/h2 +h2What is Debian GIS?/h2 -pThe goal of the strongDebianGis/strong project is about improving Debian to make it the best distribution for strongGeographical Information Systems/strong applications and users./p +pDebian GIS is a “a href=http://blends.alioth.debian.org/blends;Debian Pure Blend/a” with the aim to develop Debian into the best distribution for strongGeographical Information System/strong applications and users./p -pThe project is GIS-generic -- the pkg-grass name is a historical artifact from the birth of the project./p +pA good deal of GIS related softwares and libraries (e.g. GRASS GIS, GDAL, and PROJ.4) are already present in Debian./p + +pThanks to efforts of the Debian GIS team, we currently have many exciting GIS packages in Debian's main archives. Other programs are well along their way to being included in the archive./p + +pThe Debian source packages maintained by the Debian GIS team are also used by efforts to support current GIS software on Debian derivatives such as UbuntuGIS, which provides backports of GIS packages for Ubuntu, and OSGeo-Live for their Ubuntu based distribution./p + +pThe Debian GIS team collaboration infrastructure on Alioth originates from the initial team effort to maintain the a href=http://packages.qa.debian.org/g/grass.html;grass/a package. It has since grown to collaboratively maintain most GIS and OpenStreetMap source packages, but still uses the empkg-grass/em group name on Alioth./p h2Contact Information:/h2 @@ -60,19 +66,18 @@ h2Various useful links:/h2 dl - dda href=http://blends.debian.org/gis/tasks/index;DebianGis Tasks page/a (a href=http://blends.debian.org/gis/tasks/packagelist;long listing/a)/dd + dda href=http://blends.debian.org/gis/tasks/index;Debian GIS Blends Tasks page/a (a href=http://blends.debian.org/gis/tasks/packagelist;long listing/a)/dd - dda href=http://blends.debian.org/gis/bugs/;DebianGis Bugs page/a/dd + dda href=http://blends.debian.org/gis/bugs/;Debian GIS Blends Bugs page/a/dd - dda href=http://blends.debian.org/gis/thermometer/;DebianGis Package Thermometer/a/dd - - dda href=http://qa.debian.org/developer.php?login=pkg-grass-devel@lists.alioth.debian.org;DebianGis DDPO page/a/dd + dda href=http://blends.debian.org/gis/thermometer/;Debian GIS Blends Package Thermometer/a/dd - dda href=http://dehs.alioth.debian.org/report.php?login=pkg-grass-devel@lists.alioth.debian.org;DebianGis DEHS page/a/dd + dda href=http://qa.debian.org/developer.php?login=pkg-grass-devel@lists.alioth.debian.org;Debian GIS DDPO page/a/dd - dda href=http://udd.debian.org/dmd.cgi?email=pkg-grass-devel%40lists.alioth.debian.org;DebianGis DMD page/a/dd + dda href=http://udd.debian.org/dmd.cgi?email=pkg-grass-devel%40lists.alioth.debian.org;Debian GIS DMD page/a/dd - dda href=http://wiki.debian.org/DebianGis;DebianGis page on wiki.debian.org/a/dd + dda href=http://wiki.debian.org/DebianGis;Debian GIS page on wiki.debian.org/a/dd + dda href=http://wiki.debian.org/Teams/DebianGis;Debian GIS page on wiki.debian.org/Teams/a/dd /dl h2A note on joining:/h2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.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
[website] 04/04: Add 'Commit policy' section.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website. commit 63b210a175e293137cfcf1d25e83a249bccc Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 15 02:25:00 2014 +0100 Add 'Commit policy' section. --- policy.xml | 35 --- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/policy.xml b/policy.xml index 6448d72..d155b67 100644 --- a/policy.xml +++ b/policy.xml @@ -1097,9 +1097,38 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder /sect3 sect3 id=git-commit-policy titleCommit policy/title -para - ... -/para +sect4 + titleSingle change per commit/title + para +This is true for any VCS, but it won't hurt saying it again: +please include only one change in each commit. + /para + para +commandgit-gui/command's and +commandgit add/command option-p/option's +ability to stage single lines (or hunks) is a huge help +if you have done several unrelated changes in the sources. + /para +/sect4 +sect4 + titleChangelog maintenance/title + para +Some prefer to update filenamedebian/changelog/filename +with each commit, while others prefer to do that only at release time +by using commandgbp-dch/command. + /para + para +The current group policy states that +whenever you stop working on a package, +the changelog should be updated and pushed. + /para + para +That is, either include the changelog entry with each commit using +commanddch/command, +or finish your work by updating the changelog, e.g. using +commandgbp-dch/command. + /para +/sect4 /sect3 sect3 id=git-remove-package titleRemoving packages/title -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.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
[website] 02/04: Add PTS and manpage links in Tools section.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website. commit 62b92194c17396ac1f02f83bb87454f326b30753 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 15 02:24:15 2014 +0100 Add PTS and manpage links in Tools section. --- policy.xml | 50 -- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/policy.xml b/policy.xml index 8b42844..cf527c8 100644 --- a/policy.xml +++ b/policy.xml @@ -644,29 +644,45 @@ pkg-grass/ itemizedlist listitem para - commandbuild-essential/command depends on the essential - packages required for every kind of Debian package development. + commandbuild-essential/command + (ulink url=http://packages.qa.debian.org/b/build-essential.html;PTS/ulink) + depends on the essential packages required for every kind of + Debian package development. /para /listitem listitem para - commanddevscripts/command provides - commanddebcheckout/command, commanddebcommit/command, - commanddebuild/command, commanduscan/command, - commandlicensecheck/command, and many other commonly used - programs in the Debian source packaging workflow. + commanddevscripts/command + (ulink url=http://packages.qa.debian.org/d/devscripts.html;PTS/ulink) + provides commanddebcheckout/command + (ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=debcheckout;man/ulink), + commanddebcommit/command + (ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=debcommit;man/ulink), + commanddebuild/command + (ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=debuild;man/ulink), + commanduscan/command + (ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=uscan;man/ulink), + commandlicensecheck/command + (ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=licensecheck;man/ulink), + and many other commonly used programs in the Debian source + packaging work flow. /para /listitem listitem para - commandgit-buildpackage/command and its helper tools - are used by most source packages maintained as Git repositories - in Debian GIS. + commandgit-buildpackage/command + (ulink url=http://packages.qa.debian.org/g/git-buildpackage.html;PTS/ulink, + ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=git-buildpackage;man/ulink) + and its helper tools are used by most source packages maintained + as Git repositories in Debian GIS. /para /listitem listitem para - commandpristine-tar/command is used to allow byte-identical + commandpristine-tar/command + (ulink url=http://packages.qa.debian.org/p/pristine-tar.html;PTS/ulink, + ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=pristine-tar;man/ulink) + is used to allow byte-identical recreation of the original tarball from the literalupstream/literal branch. /para @@ -680,9 +696,15 @@ pkg-grass/ /listitem listitem para - commandpbuilder/command and commandcowbuilder/command are - used for clean builds from the source packages in distribution - specific literalchroot/literal environments. + commandpbuilder/command + (ulink url=http://packages.qa.debian.org/p/pbuilder.html;PTS/ulink, + ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=pbuilder;man/ulink) + and + commandcowbuilder/command + (ulink url=http://packages.qa.debian.org/c/cowdancer.html;PTS/ulink, + ulink url=http://manpages.debian.net/cgi-bin/man.cgi?query=cowbuilder;man/ulink) + are used for clean builds from the source packages in + distribution specific literalchroot/literal environments. /para para Use commandgit-buildpackage/command's -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.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
[website] 03/04: Expand 'Working with existing packages' section.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website. commit 418e7e61e301ebc302b9501efdf729ac9cb616d3 Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 15 02:24:37 2014 +0100 Expand 'Working with existing packages' section. --- policy.xml | 44 ++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/policy.xml b/policy.xml index cf527c8..6448d72 100644 --- a/policy.xml +++ b/policy.xml @@ -822,11 +822,51 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder When the package is already in the Debian archive, you can use the commanddebcheckout/command command with its option--git-track='*'/option option. +programlisting +commanddebcheckout/command option--git-track='*'/option replaceablelt;packagegt;/replaceable +/programlisting /para para To update the literalmaster/literal, literalupstream/literal -and literalpristine-tar/literal branches at once, use the -commandgbp-pull/command command. +and literalpristine-tar/literal branches from an existing clone +at once, use the commandgbp-pull/command command. +programlisting +commandgbp-pull/command option--prinstine-tar/option +/programlisting + /para + para +Make the changes to your package using the various +link linkend=git-toolstools/link at your disposal. + /para + para +Commit the changes in your git repository following the +link linkend=git-commit-policyCommit policy/link. + /para + para +And don't be afraid to +ulink url=http://git-scm.com/book/en/Git-Branching-Rebasing;rebase/ulink +your local branches into coherent commits before +link linkend=git-pushpushing your changes to git.debian.org/link. + /para + para +While working on your changes you like need to perform multiple +link linkend=git-build-packagerebuilds/link of the package. + /para + para +Since the overhead of setting up the build environment can be quite +extensive when many build dependencies need to be installed, +it can be tempting to build the package with plain +commanddebuild/command instead of using a clean +commandcowbuilder/command chroot. + /para + para +It is highly recommended to always build the package in a clean +chroot using +commandgit-buildpackage/command option--git-pbuilder/option. +Refer to +link linkend=git-pbuilderSetup the build environment/link +for details about creating the commandcowbuilder/command +chroots. /para para ... -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.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
[website] 01/04: Various spelling fixes.
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website. commit e99c368870653be24ec7a3bc964688cfd8f6f06b Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Feb 15 02:23:42 2014 +0100 Various spelling fixes. --- policy.xml | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/policy.xml b/policy.xml index b224b99..8b42844 100644 --- a/policy.xml +++ b/policy.xml @@ -54,7 +54,7 @@ Geographical Information System applications and users. /para para - A good deal of GIS related softwares and libraries (e.g. GRASS GIS, GDAL, + A good deal of GIS related software and libraries (e.g. GRASS GIS, GDAL, and PROJ.4) are already present in Debian. /para para @@ -102,7 +102,7 @@ section if you're interested in joining us. /para para - If you speak a language other than English, you can contribute rightaway + If you speak a language other than English, you can contribute right away with translations of package descriptions at ulink url=http://ddtp.debian.net;ddtp.debian.net/ulink. /para @@ -175,7 +175,7 @@ para The ulink url=http://pkg-grass.alioth.debian.org/policy.html;Debian GIS Policy/ulink -(this document): explains how the work is organised in our team. +(this document): explains how the work is organized in our team. /para /listitem /itemizedlist @@ -428,7 +428,7 @@ pkg-grass/ /listitem /itemizedlist para - Tags for package releases targetting derivative distributions use + Tags for package releases targeting derivative distributions use a distribution specific prefix followed by the package version separated by a literal//literal character: /para @@ -872,7 +872,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder para Use commandgit-buildpackage/command's option--git-arch=replaceablelt;architecturegt;/replaceable/option -option for building packages targetting a different architecture, +option for building packages targeting a different architecture, such as building literali386/literal packages on literalamd64/literal. /para @@ -884,7 +884,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder literalmaster/literal branch. /para para -Packages targetting link linkend=ubuntugis-ppaUbuntuGIS/link +Packages targeting link linkend=ubuntugis-ppaUbuntuGIS/link or derivatives such as ulink url=http://live.osgeo.org/;OSGeo-Live/ulink can be built from their distribution specific branches. @@ -915,7 +915,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder but the latter are reasonable when codenames are not used. /para para - If the packaging workflow benefits more from tracking + If the packaging work flow benefits more from tracking release aliases such as literalstable/literal, literaltesting/literal or literalunstable/literal this is also possible. @@ -1082,7 +1082,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder For example, when a literalpristine-tar/literal branch is available upstream and not yet tracked locally, the command commandgit checkout/command optionpristine-tar/option -will implicitely run the command +will implicitly run the command commandgit branch/command option-t pristine-tar origin/pristine-tar/option. /para /sect4 @@ -1295,7 +1295,7 @@ lintian ../build-area/*changes ulink url=http://live.osgeo.org/;OSGeo-Live/ulink) are profiting from our work inside Debian and we try to establish strong connections to these derivatives. -With UbuntuGIS the connection is as strong that a common workflow +With UbuntuGIS the connection is as strong that a common work flow was created where UbuntuGIS developers are injecting their packaging straight into the Debian GIS version control system. To make sure that there will be no conflicts with the Debian revisions @@ -1317,7 +1317,7 @@ lintian ../build-area/*changes sometimes introduces backward incompatibilities, so the current practice is to make packages depend on versions equal or higher to the one against which they were built. When using coder-base-dev/code, -this can be acheived by adding the substitution variable +this can be achieved by adding the
[qgis] tag debian/2.0.1-2 created (now 432b044)
This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a change to tag debian/2.0.1-2 in repository qgis. at 432b044 (commit) No new revisions were added by this update. -- 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
Bug#739029: RFS: qgis/2.0.1-2
Package: sponsorship-requests Severity: normal Dear mentors, I am looking for a sponsor for my package qgis Package name: qgis Version : 2.0.1-2 Upstream Author : qgis-develo...@lists.osgeo.org URL : http://qgis.org/ License : GPL-2+ Section : science It builds those binary packages: libqgis-analysis2.0.1- QGIS - shared libraries (libqgis-analysis) libqgis-core2.0.1- QGIS - shared libraries (libqgis-core) libqgis-dev - QGIS - development files libqgis-gui2.0.1 - QGIS - shared libraries (libqgis-gui) libqgis-networkanalysis2.0.1 - QGIS - shared libraries (libqgis-networkanalysis) libqgisgrass2.0.1- QGIS - shared libraries (libqgisgrass) libqgispython2.0.1 - QGIS - shared libraries (libqgispython) libqgissqlanyconnection2.0.1 - QGIS - shared libraries (libqgissqlanyconnection) python-qgis - Python bindings to QGIS python-qgis-common - Python bindings to QGIS - architecture-independent files qgis - Geographic Information System (GIS) qgis-api-doc - QGIS API documentation qgis-common - QGIS - architecture-independent data qgis-mapserver - QGIS mapserver qgis-plugin-globe- OSG globe plugin for QGIS qgis-plugin-globe-common - OSG GLOBE plugin for QGIS - architecture-independent data qgis-plugin-grass- GRASS plugin for QGIS qgis-plugin-grass-common - GRASS plugin for QGIS - architecture-independent data qgis-providers - collection of data providers to QGIS qgis-providers-common- collection of data providers to QGIS - architecture-independent files qgis-sqlanywhere - QGIS sql anywhere plugin and provider To access further information about this package, please visit the following URL: http://mentors.debian.net/package/qgis Alternatively, one can download the package with dget using this command: dget -x http://mentors.debian.net/debian/pool/main/q/qgis/qgis_2.0.1-2.dsc More information about QGIS can be obtained from http://qgis.org/. Changes since the last upload: [ Peter Michael Green ] * 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 * Add patch to fix mis-detection of PostGIS table types. * Add patch to not look for topology layers without topology support. * Add patch to fix postgis topology availability detection query. * Use dh --parallel instead of make flags. * Add patch to disable features on ARM. (closes: 737814) * Add qgis-crssync dpkg trigger to run crssync after installing the srs.db. Thanks to Andreas Beckmann for the assistance. (closes: #738273) * Also build osgEarth globe plugin. * Use cmake -DCMAKE_VERBOSE_MAKEFILE=1 instead of make flags. * Use dh commands instead of CMake directly. Regards, Sebastiaan Couwenberg ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Re: Bug#737814: qgis ftbfs on arm* qreal vs double issues
Processing control commands: tags -1 pending Bug #737814 [qgis] qgis ftbfs on arm* qreal vs double issues Added tag(s) pending. -- 737814: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737814 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#737814: qgis ftbfs on arm* qreal vs double issues
Control: tags -1 pending Hi Peter, The patch to disable the troublesome functions on ARM is fixed. QGIS now successfully builds on armhf. I've uploaded the updated qgis package to mentors, and requested sponsorship (#739029). Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Re: Bug#738117: qgis: modifies shipped files: /usr/share/qgis/resources/srs.db
Processing control commands: tags -1 pending Bug #738117 [qgis] qgis: modifies shipped files: /usr/share/qgis/resources/srs.db Added tag(s) pending. -- 738117: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738117 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#738117: qgis: modifies shipped files: /usr/share/qgis/resources/srs.db
Control: tags -1 pending Hi Andreas, The updated qgis package available on mentors and waiting for sponsorship (#739029). After I first built the updated package, I noticed that upstream had fixed this issue separately in their master branch: https://github.com/qgis/QGIS/commit/f06e72efcd2de347be6918a2ff278f17dc8a0b0c I've merged the changes from upstream in: http://anonscm.debian.org/gitweb/?p=pkg-grass/qgis.git;a=commitdiff;h=4b92f01ecd1a903112502fbc96456b90414653d0 Together with the changes for #738273 the issues relating to the srs.db are now fixed. Thanks for your assistance with these issues. Kind Regards, Bas ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: provides grass643 , however qgis-plugin-grass depends from grass642
Processing commands for cont...@bugs.debian.org: notfound 732825 grass/6.4.3-3 Bug #732825 [grass-core] provides grass643 , however qgis-plugin-grass depends from grass642 No longer marked as found in versions grass/6.4.3-3. thanks Stopping processing here. Please contact me if you need assistance. -- 732825: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732825 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#732825: marked as done (provides grass643 , however qgis-plugin-grass depends from grass642)
Your message dated Sat, 15 Feb 2014 03:58:50 +0100 with message-id 52fed7ea.7050...@xs4all.nl and subject line provides grass643 , however qgis-plugin-grass depends from grass642 has caused the Debian Bug report #732825, regarding provides grass643 , however qgis-plugin-grass depends from grass642 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 732825: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732825 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ---BeginMessage--- Package: grass-core Version: 6.4.3-3 Severity: important Tags: upstream Dear maintainer: Grass-core provides grass643 virtual package. On the other side, qgis-plugin-grass depends from grass642 witch is provided by grass-core package, in the previous version, actually in testing. Broken dependencies i suppose. other packages i found with the same grass642 dependency libgdal1-1.9.0-grass. Many thanks for your time. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 3.11-2-amd64 (SMP w/4 CPU cores) Locale: LANG=eu_ES.UTF-8, LC_CTYPE=eu_ES.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages grass-core depends on: ii libc6 2.17-97 ii libcairo2 1.12.16-2 ii libfftw3-double3 3.3.3-7 ii libfontconfig12.11.0-2 ii libfreetype6 2.5.1-2 ii libgcc1 1:4.8.2-10 ii libgdal1h 1.10.1+dfsg-2 ii libgeos-3.4.2 3.4.2-1 ii libgeos-c13.4.2-1 ii libgl1-mesa-glx [libgl1] 9.2.2-1 ii libglu1-mesa [libglu1]9.0.0-2 ii libice6 2:1.0.8-2 ii libmysqlclient18 5.5.33+dfsg-1 ii libncurses5 5.9+20130608-1 ii libodbc1 2.3.1-1 ii libpng12-01.2.49-5 ii libpq59.3.2-1 ii libproj0 4.8.0-2 ii libreadline6 6.2+dfsg-0.1 ii libsm62:1.2.1-2 ii libsqlite3-0 3.8.2-1 ii libstdc++64.8.2-10 ii libtiff5 4.0.3-6 ii libtinfo5 5.9+20130608-1 ii libx11-6 2:1.6.2-1 ii libxext6 2:1.3.2-1 ii libxrender1 1:0.9.8-1 ii python-numpy 1:1.7.1-3 pn python:anynone ii zlib1g1:1.2.8.dfsg-1 Versions of packages grass-core recommends: pn gdal-bin none pn proj-bin none Versions of packages grass-core suggests: pn avce00 none ii curl 7.34.0-1 pn e00compr none pn gnuplot none pn gpsbabel none pn gpstrans none pn grass-devnone ii grass-doc6.4.3-3 ii grass-gui6.4.3-3 pn netpbm none pn python-rpy2 none ii wget 1.14-5 pn xml2 none -- no debconf information ---End Message--- ---BeginMessage--- notfound 732825 grass/6.4.3-3 thanks Hi Joseba, In the mean time qgis-plugin-grass has been rebuild and now depends on grass, and libgdal1-1.10.1-grass now depends on grass643. Kind Regards, Bas---End Message--- ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel