[qgis] 01/01: Rebuild 2.14.22+dfsg for xenial

Martin Landa martinl-guest at moszumanska.debian.org
Sun Jan 28 13:37:15 UTC 2018


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

martinl-guest pushed a commit to branch ubuntu/xenial
in repository qgis.

commit b8c693c46477e77672f339b62379f1a2272dd2f9
Merge: ba94cd0 df8cd17
Author: Martin Landa <landa.martin at gmail.com>
Date:   Sun Jan 28 14:23:57 2018 +0100

    Rebuild 2.14.22+dfsg for xenial

 .travis.yml                                        |   1 +
 CMakeLists.txt                                     |   2 +-
 ChangeLog                                          |  78 +++++++
 debian/changelog                                   | 162 ++++++++++++++-
 debian/control                                     |  73 +++----
 debian/copyright                                   |   2 +-
 debian/gbp.conf                                    |   2 +-
 ....17.install => libqgis-analysis2.14.22.install} |   0
 ....17.symbols => libqgis-analysis2.14.22.symbols} |   7 +-
 ...p2.14.17.install => libqgis-app2.14.22.install} |   0
 ...p2.14.17.symbols => libqgis-app2.14.22.symbols} |  94 ++++++++-
 ...2.14.17.install => libqgis-core2.14.22.install} |   0
 ...2.14.17.symbols => libqgis-core2.14.22.symbols} |  88 +++++---
 debian/libqgis-gui2.14.17.lintian-overrides        |   3 -
 ...i2.14.17.install => libqgis-gui2.14.22.install} |   0
 ...i2.14.17.symbols => libqgis-gui2.14.22.symbols} | 224 +++++++++------------
 ...tall => libqgis-networkanalysis2.14.22.install} |   0
 ...bols => libqgis-networkanalysis2.14.22.symbols} |   2 +-
 ...14.17.install => libqgis-server2.14.22.install} |   0
 ...14.17.symbols => libqgis-server2.14.22.symbols} |   2 +-
 ...14.17.install => libqgisgrass7-2.14.22.install} |   0
 ...des => libqgisgrass7-2.14.22.lintian-overrides} |   2 +-
 ...14.17.symbols => libqgisgrass7-2.14.22.symbols} |  39 ++--
 ....14.17.install => libqgispython2.14.22.install} |   0
 ....14.17.symbols => libqgispython2.14.22.symbols} |   2 +-
 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/patches/grass72.patch                       |  15 --
 debian/patches/grass74.patch                       |  14 ++
 debian/patches/series                              |   2 +-
 debian/python-qgis.install                         |   2 +
 debian/qgis-plugin-grass-common.lintian-overrides  |   4 +
 debian/qgis.install                                |   1 -
 debian/rules                                       |  15 +-
 debian/source.lintian-overrides                    |   3 +
 python/core/__init__.py                            |   3 +-
 python/core/qgscoordinatetransform.sip             |   2 +
 python/ext-libs/owslib/fes.py                      |   5 +-
 python/plugins/MetaSearch/dialogs/maindialog.py    |   5 +-
 src/customwidgets/CMakeLists.txt                   |   1 +
 src/server/qgswmsserver.cpp                        |  98 ++++++---
 tests/src/python/test_qgsexpression.py             |  24 +++
 49 files changed, 675 insertions(+), 376 deletions(-)

diff --cc debian/changelog
index 99f00ca,06e8ac8..5db6629
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,41 -1,152 +1,197 @@@
++qgis (2.14.22+dfsg-1~xenial1) xenial; urgency=medium
++
++  * Rebuild for xenial.
++
++ -- Martin Landa <landa.martin at gmail.com>  Sat, 27 Jan 2018 18:26:45 +0100
++
+ qgis (2.14.22+dfsg-1) unstable; urgency=medium
+ 
+   * Update copyright-format URL to use HTTPS.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 23 Jan 2018 18:15:36 +0100
+ 
+ qgis (2.14.22+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.22
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Update version specific symbols.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 20 Jan 2018 09:01:38 +0100
+ 
+ qgis (2.14.21+dfsg-3) unstable; urgency=medium
+ 
+   * Replace libqca2-plugin-ossl transitional package with libqca2-plugins.
+     (closes: #886681)
+   * Update symbols for other architectures.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 09 Jan 2018 07:26:27 +0100
+ 
+ qgis (2.14.21+dfsg-2) unstable; urgency=medium
+ 
+   * Update build dependency for libqscintilla2-dev.
+     (closes: #886194)
+   * Update symbols for other architectures.
+   * Bump Standards-Version to 4.1.3, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 03 Jan 2018 08:20:24 +0100
+ 
+ qgis (2.14.21+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for amd64 & other architectures.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 10 Dec 2017 14:25:15 +0100
+ 
+ qgis (2.14.21+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.21
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Partially revert GRASS 7.4 changes to build with GRASS 7.2.
+   * Strip trailing whitespace from control file.
+   * Disable use of QtWebKit.
+     (closes: #882663)
+   * Don't install PyQt4 files, no longer built.
+   * Disable Breaks/Replaces on python-qt4,
+     python-qgis no longer includes PyQt4 files.
+   * Drop obsolete dbg package.
+   * Bump Standards-Version to 4.1.2, no changes.
+   * Add lintian override for
+     dependency-on-python-version-marked-for-end-of-life.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 08 Dec 2017 22:49:37 +0100
+ 
+ qgis (2.14.20+dfsg-2~exp2) experimental; urgency=medium
+ 
+   * Fix GRASS ABI dependency to include 'grass'.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 17 Nov 2017 18:02:31 +0100
+ 
+ qgis (2.14.20+dfsg-2~exp1) experimental; urgency=medium
+ 
+   * Override dh_gencontrol to set GRASS ABI dependency with substvars.
+   * Strip trailing whitespace from changelog.
+   * Update packing for GRASS 7.4.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 17 Nov 2017 12:35:39 +0100
+ 
+ qgis (2.14.20+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for other architectures.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 30 Oct 2017 19:25:05 +0100
+ 
+ qgis (2.14.20+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.20
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Drop unused override for python-foo-but-no-python3-foo.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Oct 2017 10:05:54 +0200
+ 
 +qgis (2.14.17+dfsg-1~xenial9) xenial; urgency=medium
 +
 +  * Rebuild for Xenial
 +
 + -- Angelos Tzotsos <gcpp.kalxas at gmail.com>  Thu, 28 Sep 2017 20:00:00 +0200
 +
 +qgis (2.14.17+dfsg-1~xenial8) UNRELEASED; urgency=medium
 +
 +  * Drop Breaks/Replaces python-qt4 from python-qgis.
 +    See: https://trac.osgeo.org/ubuntugis/ticket/81
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Wed, 27 Sep 2017 21:48:42 +0200
 +
+ qgis (2.14.19+dfsg-2) UNRELEASED; urgency=medium
+ 
+   * Add virtual GRASS ABI package to qgis-plugin-grass dependencies.
+   * Bump Standards-Version to 4.1.1, no changes.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 27 Sep 2017 19:51:54 +0200
+ 
+ qgis (2.14.19+dfsg-1) unstable; urgency=medium
+ 
+   * Update symbols for other architectures.
+   * Drop unused lintian override for spelling-error-in-binary.
+   * Add lintian override for python-foo-but-no-python3-foo.
+   * Move libqgis-server to libs section.
+   * Change priority for qgis-dbg from extra to optional.
+   * Bump Standards-Version to 4.1.0, changes: priority.
+   * Move from experimental to unstable.
+     (closes: #876320)
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Thu, 21 Sep 2017 07:55:48 +0200
+ 
 +qgis (2.14.17+dfsg-1~xenial7) xenial; urgency=medium
 +
 +  * Rebuild for xenial.
 +
 + -- Martin Landa <landa.martin at gmail.com>  Mon, 18 Sep 2017 20:28:22 +0200
 +
 +qgis (2.14.17+dfsg-1~xenial6) xenial; urgency=medium
 +
 +  * Rebuild for xenial.
 +
 + -- Martin Landa <landa.martin at gmail.com>  Mon, 18 Sep 2017 19:33:10 +0200
 +
 +qgis (2.14.17+dfsg-1~xenial5) xenial; urgency=medium
 +
 +  * Rebuild for xenial.
 +
 + -- Martin Landa <landa.martin at gmail.com>  Mon, 18 Sep 2017 18:39:18 +0200
 +
 +qgis (2.14.17+dfsg-1~xenial4) xenial; urgency=medium
 +
 +  * Rebuild for xenial.
 +  * Bump minimum GRASS version to 7.2.2.
 +
 + -- Martin Landa <landa.martin at gmail.com>  Mon, 18 Sep 2017 15:38:27 +0200
 +
+ qgis (2.14.19+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.19
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Drop remove-sip-workaround.patch, applied upstream.
+   * Remove mimelnk files for KDE3.
+     (closes: #875520)
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 15 Sep 2017 23:07:28 +0200
+ 
+ qgis (2.14.18+dfsg-1) unstable; urgency=medium
+ 
+   * Add patch by Dmitry Shachnev to fix FTBFS with SIP 4.19.3.
+     (closes: #872640)
+   * Update symbols for other architectures.
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 22 Aug 2017 18:31:18 +0200
+ 
+ qgis (2.14.18+dfsg-1~exp1) experimental; urgency=medium
+ 
+   [ Jürgen E. Fischer ]
+   * Release of 2.14.18
+ 
+   [ Bas Couwenberg ]
+   * New upstream release.
+   * Update symbols for amd64.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 18 Aug 2017 20:00:55 +0200
++>>>>>>> debian/2.14.22+dfsg-1
+ 
  qgis (2.14.17+dfsg-1) unstable; urgency=medium
  
    * Update symbols for other architectures.
diff --cc debian/control
index 3e09ba0,31aa752..5f5d92a
--- a/debian/control
+++ b/debian/control
@@@ -23,8 -23,9 +23,9 @@@ Build-Depends: bison
                 libqt4-opengl-dev,
                 libqt4-sql-sqlite,
                 libqca2-dev,
-                libqca2-plugin-ossl,
+                libqca2-plugins,
 -               libqscintilla2-qt4-dev,
 +               libqscintilla2-dev,
+ #               libqtwebkit-dev,
                 libqwt-dev,
                 libspatialite-dev,
                 libsqlite3-dev,
diff --cc debian/gbp.conf
index f94ba63,f94ba63..75da436
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -6,7 -6,7 +6,7 @@@ upstream-branch = upstream-lt
  
  # The default name for the Debian branch is "master".
  # Change it if the name is different (for instance, "debian/unstable").
--debian-branch = master
++debian-branch = ubuntu/xenial
  
  # git-import-orig uses the following names for the upstream tags.
  # Change the value if you are not using git-import-orig

-- 
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