[Git][debian-gis-team/qgis][ubuntu/trusty] 2 commits: Rebuild 2.14.22+dfsg for trusty

[Bas Couwenberg]

Bas Couwenberg pushed to branch ubuntu/trusty at Debian GIS Project / qgis


Commits:
f501d476 by Martin Landa at 2018-03-05T14:05:21+01:00
Rebuild 2.14.22+dfsg for trusty

- - - - -
803b10ad by Martin Landa at 2018-03-05T14:07:19+01:00
fix debian/gbp.conf - debian-branch

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/gbp.conf


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.22+dfsg-1~trusty2) trusty; urgency=medium
+
+   * Rebuild for trusty.
+   * Disable libqca2-plugins dependency for qgis-providers-common
+
+ -- Martin Landa <landa.martin at gmail.com>  Mon, 05 Mar 2018 13:58:15 +0100
+
 qgis (2.14.22+dfsg-1~trusty1) trusty; urgency=medium
 
   * Rebuild for trusty.


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -394,7 +394,7 @@ Architecture: any
 Pre-Depends: dpkg (>= 1.16.1),
              ${misc:Pre-Depends}
 Depends: qgis-providers-common (= ${source:Version}),
-         libqca2-plugins,
+#         libqca2-plugins,
          libqt4-sql-sqlite,
          ${shlibs:Depends},
          ${misc:Depends}


=====================================
debian/gbp.conf
=====================================
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -6,7 +6,7 @@ upstream-branch = upstream-ltr
 
 # 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/trusty
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig



View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/c54e6722ad8161dd14b7c35dd135889c44a38930...803b10ad3cbe363869700cfecfe4d1c60a73e3cf

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/qgis/compare/c54e6722ad8161dd14b7c35dd135889c44a38930...803b10ad3cbe363869700cfecfe4d1c60a73e3cf
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180305/690b09b8/attachment-0001.html>