Your message dated Wed, 18 May 2016 19:20:12 +0000
with message-id <e1b370u-0001vw...@franck.debian.org>
and subject line Bug#822565: fixed in ical2html 2.1-2
has caused the Debian Bug report #822565,
regarding ical2html: FTBFS against new libical 2.0.0
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.)
--
822565: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822565
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: ical2html
Version: 2.1-1
Severity: normal
Tags: patch
Dear Maintainer,
Initial plans has been started for transitioning to libical 2.0.0
(currently stuck in NEW).
Your package fails to build from source with the new version.
Please see attached patches which are on top of the ical2html
git packaging repo. (Please replace the bug report number in the
first commit message with whatever number this bug report gets
and replace the third/last patch with a fresh "gbp dch --auto"
run.)
(See also #797074 if you're interested in current transition planning.)
Regards,
Andreas Henriksson
>From 2589e7ef569e5511a2df08b2ffaf681e7abd0c94 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 14:54:49 +0200
Subject: [PATCH 1/3] Add debian/patches/icalerror_errors_are_fatal.patch
- fixes build against libical >= 2.0.0
Git-Dch: Full
Closes: #-1
---
debian/patches/icalerror_errors_are_fatal.patch | 48 +++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 49 insertions(+)
create mode 100644 debian/patches/icalerror_errors_are_fatal.patch
diff --git a/debian/patches/icalerror_errors_are_fatal.patch b/debian/patches/icalerror_errors_are_fatal.patch
new file mode 100644
index 0000000..60dc962
--- /dev/null
+++ b/debian/patches/icalerror_errors_are_fatal.patch
@@ -0,0 +1,48 @@
+Fix build against libical 2.0.0
+
+Global variable was changed to a setter/getter function, also use
+helper to clear errno everywhere.
+
+See https://github.com/libical/libical/commit/6e5534a979b3ab4d28e5a3
+
+This breaks building on libical < 2.0.0 as the ICAL_CHECK_VERSION
+was not included in the 2.0.0 release. Maybe it can be used in
+the future.
+
+--- a/ical2html.c
++++ b/ical2html.c
+@@ -474,7 +474,7 @@
+ int starts_on_monday = 0;
+
+ /* We handle errors ourselves */
+- icalerror_errors_are_fatal = 0;
++ icalerror_set_errors_are_fatal(0);
+ icalerror_clear_errno();
+
+ /* icaltimezone_set_tzid_prefix("/kde.org/Olson_20080523_1/"); */
+--- a/icalfilter.c
++++ b/icalfilter.c
+@@ -97,8 +97,8 @@
+ icalproperty *p;
+
+ /* We handle errors ourselves */
+- icalerror_errors_are_fatal = 0;
+- icalerrno = 0;
++ icalerror_set_errors_are_fatal(0);
++ icalerror_clear_errno();
+
+ /* Read commandline */
+ while ((c = getopt_long(argc, argv, OPTIONS, options, NULL)) != -1) {
+--- a/icalmerge.c
++++ b/icalmerge.c
+@@ -258,8 +258,8 @@
+ icalcomponent *newset;
+
+ /* We handle errors ourselves */
+- icalerror_errors_are_fatal = 0;
+- icalerrno = 0;
++ icalerror_set_errors_are_fatal(0);
++ icalerror_clear_errno();
+
+ /* Read commandline */
+ while ((c = getopt_long(argc, argv, OPTIONS, options, NULL)) != -1) {
diff --git a/debian/patches/series b/debian/patches/series
index 5519355..894d2d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
1001_week_starts_monday.patch
+icalerror_errors_are_fatal.patch
--
2.8.0.rc3
>From ff6fbf71c1976b1b9be5d31bdcc64406aa03c116 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 14:55:31 +0200
Subject: [PATCH 2/3] debian/rules: bump libical-dev build-dependency to >=
2.0.0
- see previously added patch header.
Git-Dch: Full
---
debian/control | 2 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index bb02a15..3e1e6bf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cdbs (>= 0.4.123~),
autoconf,
debhelper,
dh-buildinfo,
- libical-dev,
+ libical-dev (>= 2.0.0),
help2man
Vcs-Git: git://git.debian.org/git/collab-maint/ical2html.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/ical2html.git
diff --git a/debian/rules b/debian/rules
index c5abf4f..737e32a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ DEB_UPSTREAM_TARBALL_MD5 = bf0bb0e590aef266694b66a741d86191
CDBS_BUILD_DEPENDS_rules_debhelper_v9 = debhelper
# Needed by upstream build process
-CDBS_BUILD_DEPENDS += , libical-dev
+CDBS_BUILD_DEPENDS += , libical-dev (>= 2.0.0)
DEB_UPSTREAM_CRUFT_MOVE = Makefile.in aclocal.m4 missing depcomp install-sh configure config.h.in
--
2.8.0.rc3
>From 5f918eea2a1befc5cc1a77302436fe8c299902c6 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 14:57:07 +0200
Subject: [PATCH 3/3] Update debian/changelog
---
debian/changelog | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 779fb1a..9c77356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ical2html (2.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add debian/patches/icalerror_errors_are_fatal.patch
+ - fixes build against libical >= 2.0.0
+ Closes: #-1
+ * debian/rules: bump libical-dev build-dependency to >= 2.0.0
+ - see previously added patch header.
+
+ -- Andreas Henriksson <andr...@fatal.se> Mon, 25 Apr 2016 14:56:07 +0200
+
ical2html (2.1-1) unstable; urgency=medium
[ upstream ]
--
2.8.0.rc3
--- End Message ---
--- Begin Message ---
Source: ical2html
Source-Version: 2.1-2
We believe that the bug you reported is fixed in the latest version of
ical2html, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 822...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jonas Smedegaard <d...@jones.dk> (supplier of updated ical2html package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Wed, 18 May 2016 20:41:42 +0200
Source: ical2html
Binary: ical2html
Architecture: source amd64
Version: 2.1-2
Distribution: unstable
Urgency: medium
Maintainer: Jonas Smedegaard <d...@jones.dk>
Changed-By: Jonas Smedegaard <d...@jones.dk>
Description:
ical2html - create an HTML table from icalendar data
Closes: 822565
Changes:
ical2html (2.1-2) unstable; urgency=medium
.
* Simplify manpage build rules.
* Stop avoid copyright-checking autotools files.
* Update copyright info:
+ Extend copyright of packaging to cover current year.
+ Cover autotools files.
* Update Vcs-* URLs:
+ Use https protocol.
+ Use cgit browser.
+ Fix path.
* Declare compliance with Debian Policy 3.9.8.
* Add patch 1002 to fix build against libical2.
Tighten build-dependendency on libical-dev.
Closes: Bug#822565. Thanks to Andreas Henriksson.
Checksums-Sha1:
7e7b3f7ca6bc21e108a2be7c8ba4dc2ed27e2aea 1906 ical2html_2.1-2.dsc
0e4eeb06dba2050fbc97c40462d1540cd8daa7b2 7324 ical2html_2.1-2.debian.tar.xz
677a80d1611c514badac014782f3e6b8aa17db32 32202 ical2html-dbgsym_2.1-2_amd64.deb
19280b22f166227da94421788185c4937789e821 22858 ical2html_2.1-2_amd64.deb
Checksums-Sha256:
92159e2a357216d769db895eb5dc03282f33a0f3d23194eaf794e7a0ae3c93f7 1906
ical2html_2.1-2.dsc
f396d4de8d495297747742fa68ecd3d2603c382fe92a5fe8c22e06358688e07f 7324
ical2html_2.1-2.debian.tar.xz
ea4146449ae6c696970169cc782c619b17798b7d59994ce10e80804be0631693 32202
ical2html-dbgsym_2.1-2_amd64.deb
50fa4a86cca10184ba0426a1da93a00f5954fbeeb5a0e89cbbd65c8e70201c3a 22858
ical2html_2.1-2_amd64.deb
Files:
9a249514cb5a8f15205aab913eeb4838 1906 utils optional ical2html_2.1-2.dsc
6121d5655df7807e3407e3d2aa2838bb 7324 utils optional
ical2html_2.1-2.debian.tar.xz
41239c34765b8149e6dd24d59513902d 32202 debug extra
ical2html-dbgsym_2.1-2_amd64.deb
9cef3e5e668af3b62327f3890ed154c2 22858 utils optional ical2html_2.1-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJXPLp8AAoJECx8MUbBoAEhABgP/3KnOKl58o7P7K1bmI2NabZP
KTF5mUlbj1U4UZ8YGwAWRdowXalSDgO3TcwJxa+8k0RJr8hsDaw6sKFS9+d6Mrjo
E24Npmv7zKie3Uf2KH466W5bKsGGpiu1ZSjlMNmgVyzdR0786bBDEq5Jtdjevcmh
cunHC3YRYFVHGHOuMoc+uWHbsh+dWrzxUC8cdvUPdKF/ahl+573BwFpwPAPnbC/g
TL01FdbQssPHwQHMzbCvaD0lKZfaSKr+PxybblbALc8w14jN3+EQsM8U85kQSSgi
noAZaXqGuSj240cTSYhv8m4aG8DWrI7Yyjys+bRdlzLk9JM5kOjMBHLmR1t8Frkb
LQJIFNajbxu7dBwjMit/x79AfD6sjkqFofyOobNC3O834THP//C/TJqQFhKx7PZj
16KlqgEWHqiNug1mT/fkt7xxnDuLfNJBi+CXy3xAATGeKBslG1Mvx1+TYQ4+6/hP
zN1dQWvIUbcKXXaimf2lg8anCYRIkTc4s4hgZUKFM50qlBtdMD/Cb0NeWE4TuWaq
z/l3ahIKiTCZgAF/F5thAvCWG8LlJRWN3jxHanL10IEL0Td6zBK/XaUe8sg3MUMp
uFkGZQGU/o22rpkcru/dN5tuCIi/BxYWLR38b0not9Gt/ZRZveelBQp1H1UwFz/z
Zjv7w709ZQa2lXbx0hTW
=XeEU
-----END PGP SIGNATURE-----
--- End Message ---
