Sebastiaan Couwenberg pushed to branch master at Debian GIS Project / merkaartor
Commits:
dec8e0a9 by Bas Couwenberg at 2018-02-06T21:24:11+01:00
Fix FTCBFS: (Closes: #889756)
Fix FTCBFS: (Closes: #889756)
+ Fix missing build dependency qt5-qmake:native for running lrelease.
+ Let dh_auto_configure pass the cross flags to qmake.
- - - - -
c60863fa by Bas Couwenberg at 2018-02-06T21:24:40+01:00
Bump Standards-Version to 4.1.3, no changes.
- - - - -
f833e6c4 by Bas Couwenberg at 2018-02-06T21:26:40+01:00
Drop obsolete dbg package.
- - - - -
88abb44f by Bas Couwenberg at 2018-02-06T21:42:01+01:00
Remove install file, only single binary package built now.
- - - - -
0cf1f224 by Bas Couwenberg at 2018-02-06T21:42:01+01:00
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/control
- − debian/merkaartor.install
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
-merkaartor (0.18.3+ds-3) UNRELEASED; urgency=medium
+merkaartor (0.18.3+ds-3) unstable; urgency=medium
+ [ Bas Couwenberg ]
* Change priority from extra to optional.
- * Bump Standards-Version to 4.1.2, changes: priority.
+ * Bump Standards-Version to 4.1.3, changes: priority.
* Strip trailing whitespace from changelog.
* Update copyright-format URL to use HTTPS.
+ * Drop obsolete dbg package.
+ * Remove install file, only single binary package built now.
- -- Bas Couwenberg <sebas...@debian.org> Sat, 23 Sep 2017 00:15:35 +0200
+ [ Helmut Grohne ]
+ * Fix FTCBFS: (Closes: #889756)
+ + Fix missing build dependency qt5-qmake:native for running lrelease.
+ + Let dh_auto_configure pass the cross flags to qmake.
+
+ -- Bas Couwenberg <sebas...@debian.org> Tue, 06 Feb 2018 21:27:16 +0100
merkaartor (0.18.3+ds-2) unstable; urgency=medium
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Bernd Zeimetz <b...@debian.org>,
Bas Couwenberg <sebas...@debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20160114),
libboost-dev,
libboost-math-dev,
libboost-serialization-dev,
@@ -20,11 +20,12 @@ Build-Depends: debhelper (>= 9),
libxml2-dev,
libxslt1-dev,
qt5-qmake,
+ qt5-qmake:native,
qtbase5-dev,
qttools5-dev-tools,
sharutils,
zlib1g-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/merkaartor.git
Vcs-Git: https://anonscm.debian.org/git/pkg-grass/merkaartor.git
Homepage: http://www.merkaartor.be/
@@ -47,14 +48,3 @@ Description: map editor for OpenStreetMap.org
* visualize some leisure/landuse areas and road types
* displaying GPS information
-Package: merkaartor-dbg
-Architecture: any
-Section: debug
-Depends: merkaartor (= ${binary:Version}),
- ${misc:Depends}
-Description: Debug symbols for merkaartor
- Merkaartor is a map editor for OpenStreetMap.org, the free editable map of the
- whole world.
- .
- This package contains debug symbols for merkaartor.
-
=====================================
debian/merkaartor.install deleted
=====================================
--- a/debian/merkaartor.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/merkaartor
-usr/share
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_clean:
override_dh_auto_configure:
cd translations && make release
- qmake Merkaartor.pro \
+ dh_auto_configure -- Merkaartor.pro \
TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \
PREFIX=/usr \
GDAL=1 \
@@ -48,5 +48,5 @@ override_dh_installman:
dh_installman debian/merkaartor.1
override_dh_strip:
- dh_strip --dbg-package=merkaartor-dbg
+ dh_strip --dbgsym-migration='merkaartor-dbg (<< 0.18.3+ds-3~)'
View it on GitLab:
https://salsa.debian.org/debian-gis-team/merkaartor/compare/d454ec3c7f30354076ac78a65f5540f84023bd75...0cf1f2242b18b41ad17eeb26473a73f6012d7659
---
View it on GitLab:
https://salsa.debian.org/debian-gis-team/merkaartor/compare/d454ec3c7f30354076ac78a65f5540f84023bd75...0cf1f2242b18b41ad17eeb26473a73f6012d7659
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
