Bug#926918: unblock: xastir/2.1.0-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package xastir. The new version fixes a FTBFS against
imagemagick, and cleans debian/ properly so building twice doesn't
leave crap around that kills the next build (see the -4 build logs).
Thanks.
Christoph
No differences were encountered between the control files
diff -Nru xastir-2.1.0/debian/changelog xastir-2.1.0/debian/changelog
--- xastir-2.1.0/debian/changelog 2019-01-15 00:41:09.000000000 +0100
+++ xastir-2.1.0/debian/changelog 2019-04-11 15:48:39.000000000 +0200
@@ -1,3 +1,20 @@
+xastir (2.1.0-5) unstable; urgency=medium
+
+ * Team upload.
+ * Remove bogus "clean" target that leaves cruft in debian/ behind,
+ preventing building twice, and even caused FTBFS for the last upload.
+ (Closes: #926848)
+
+ -- Christoph Berg <myon@debian.org> Thu, 11 Apr 2019 15:48:39 +0200
+
+xastir (2.1.0-4) unstable; urgency=medium
+
+ * Team upload.
+ * Fix FTBFS with recent imagemagick. (Closes: #924329)
+ * Add debian/gitlab-ci.yml.
+
+ -- Christoph Berg <myon@debian.org> Thu, 11 Apr 2019 11:39:42 +0200
+
xastir (2.1.0-3) unstable; urgency=medium
* Added Breaks & Replaces to control file (Closes: #919066)
diff -Nru xastir-2.1.0/debian/gitlab-ci.yml xastir-2.1.0/debian/gitlab-ci.yml
--- xastir-2.1.0/debian/gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100
+++ xastir-2.1.0/debian/gitlab-ci.yml 2019-04-11 11:39:25.000000000 +0200
@@ -0,0 +1,6 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ RELEASE: 'unstable'
diff -Nru xastir-2.1.0/debian/patches/no-magick-implementation xastir-2.1.0/debian/patches/no-magick-implementation
--- xastir-2.1.0/debian/patches/no-magick-implementation 1970-01-01 01:00:00.000000000 +0100
+++ xastir-2.1.0/debian/patches/no-magick-implementation 2019-04-11 11:34:35.000000000 +0200
@@ -0,0 +1,11 @@
+--- a/src/map_geo.c
++++ b/src/map_geo.c
+@@ -133,7 +133,7 @@
+ * now (9/28/2010) being seen on some distros (Ubuntu 10.04 and
+ * OpenSuSE-11.3)
+ */
+-#define MAGICK_IMPLEMENTATION
++//#define MAGICK_IMPLEMENTATION
+ #include <magick/api.h>
+ #else // HAVE_GRAPHICSMAGICK
+ #include <magick/api.h>
diff -Nru xastir-2.1.0/debian/patches/series xastir-2.1.0/debian/patches/series
--- xastir-2.1.0/debian/patches/series 2019-01-15 00:04:28.000000000 +0100
+++ xastir-2.1.0/debian/patches/series 2019-04-11 11:34:10.000000000 +0200
@@ -4,3 +4,4 @@
OSM_config.patch
simple_db.patch
reproducible_build.patch
+no-magick-implementation
diff -Nru xastir-2.1.0/debian/rules xastir-2.1.0/debian/rules
--- xastir-2.1.0/debian/rules 2019-01-09 22:48:26.000000000 +0100
+++ xastir-2.1.0/debian/rules 2019-04-11 15:46:04.000000000 +0200
@@ -7,8 +7,3 @@
override_dh_auto_installchangelogs:
dh_installchangelogs ChangeLog
-
-clean:
- -rm -f src/callpass/Makefile
- -rm -f config.log config.cache summary.log
- dh_auto_clean
Reply to: