Your message dated Sun, 15 May 2016 13:34:50 +0000
with message-id <e1b1wc2-000712...@franck.debian.org>
and subject line Bug#822569: fixed in webcit 902-dfsg-1
has caused the Debian Bug report #822569,
regarding webcit: FTBFS with 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.)
--
822569: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822569
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: webcit
Version: 9.01-dfsg-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 webcit
git packaging repo. (Please replace the bug report number in the
first commit message with whatever number this bug report gets
and replace the forth/last patch with a fresh "gbp dch --auto"
run.)
(See also #797074 if you're interested in current transition planning.)
Regards,
Andreas Henriksson
>From f6c395f53a8760823a8665f53fcb09948b1882e3 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:09:26 +0200
Subject: [PATCH 1/4] Add debian/patches/icalerror_errors_are_fatal.patch
- fixes building against libical 2.0.0
Git-Dch: Full
Closes: #-1
---
debian/patches/icalerror_errors_are_fatal.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 23 insertions(+)
create mode 100644 debian/patches/icalerror_errors_are_fatal.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/icalerror_errors_are_fatal.patch b/debian/patches/icalerror_errors_are_fatal.patch
new file mode 100644
index 0000000..c0b2163
--- /dev/null
+++ b/debian/patches/icalerror_errors_are_fatal.patch
@@ -0,0 +1,22 @@
+From: Andreas Henriksson <andr...@fatal.se>
+Subject: Fix building against libical 2.0.0
+
+Use new helper function since the global variable was removed.
+
+See https://github.com/libical/libical/commit/6e5534a979b3ab4d28e5a32f5
+
+Note that this unconditionally uses the new function as the macro
+ICAL_CHECK_VERSION was not added in 2.0.0 yet. Maybe it can be
+utilized in the future....
+
+--- a/webserver.c
++++ b/webserver.c
+@@ -274,7 +274,7 @@
+ }
+
+ /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
+- icalerror_errors_are_fatal = 0;
++ icalerror_set_errors_are_fatal(0);
+
+ /* Use our own prefix on tzid's generated from system tzdata */
+ icaltimezone_set_tzid_prefix("/citadel.org/");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..baceaf6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+icalerror_errors_are_fatal.patch
--
2.8.0.rc3
>From 8527cade9a93771fdef3b8b9ca109088ece0b377 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:10:16 +0200
Subject: [PATCH 2/4] Bump libical-dev build-dependency to >= 2.0.0
- see previously added patch header
Git-Dch: Full
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 9f0b9f7..e5985e3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Debian Citadel Team <pkg-citadel-de...@lists.alioth.debian.org>
Uploaders: Wilfried Goesgens <w.goesg...@outgesourced.org>, Michael Meskes <mes...@debian.org>, Alexander Wirt <formo...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf, libical-dev (>=0.43), gettext, locales,
+Build-Depends: debhelper (>= 7.0.50~), po-debconf, libical-dev (>= 2.0.0), gettext, locales,
libcitadel-dev (>= 9.01), autotools-dev, libssl-dev, libexpat1-dev, libmarkdown2-dev
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-citadel/webcit.git
--
2.8.0.rc3
>From 1c41c0ee57a0e6489a32bd2c62ae785d8fd68141 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:20:20 +0200
Subject: [PATCH 3/4] Build-depend on and use quilt sequencer to apply
debian/patches
---
debian/control | 2 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index e5985e3..1f1fa69 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Debian Citadel Team <pkg-citadel-de...@lists.alioth.debian.org>
Uploaders: Wilfried Goesgens <w.goesg...@outgesourced.org>, Michael Meskes <mes...@debian.org>, Alexander Wirt <formo...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf, libical-dev (>= 2.0.0), gettext, locales,
+Build-Depends: debhelper (>= 7.0.50~), po-debconf, quilt, libical-dev (>= 2.0.0), gettext, locales,
libcitadel-dev (>= 9.01), autotools-dev, libssl-dev, libexpat1-dev, libmarkdown2-dev
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-citadel/webcit.git
diff --git a/debian/rules b/debian/rules
index fe18965..998a28e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ ifneq (,$(findstring urldebug,$(DEB_BUILD_OPTIONS)))
endif
%:
- dh ${@} --with autotools-dev
+ dh ${@} --with autotools-dev,quilt
override_dh_auto_configure:
dh_testdir
--
2.8.0.rc3
>From 4ba2213d0a67c4bba4f32efe491c192399384a9a Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:15:43 +0200
Subject: [PATCH 4/4] Update debian/changelog
---
debian/changelog | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 430ca11..820c4f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+webcit (9.01-dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add debian/patches/icalerror_errors_are_fatal.patch
+ - fixes building against libical 2.0.0
+ Closes: #-1
+ * Bump libical-dev build-dependency to >= 2.0.0
+ - see previously added patch header
+ * Build-depend on and use quilt sequencer to apply debian/patches
+
+ -- Andreas Henriksson <andr...@fatal.se> Mon, 25 Apr 2016 15:15:22 +0200
+
webcit (9.01-dfsg-1) unstable; urgency=medium
* Update config.sub/guess during build.
--
2.8.0.rc3
--- End Message ---
--- Begin Message ---
Source: webcit
Source-Version: 902-dfsg-1
We believe that the bug you reported is fixed in the latest version of
webcit, 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.
Michael Meskes <mes...@debian.org> (supplier of updated webcit 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: Fri, 13 May 2016 10:47:10 +0200
Source: webcit
Binary: citadel-webcit webcit-dbg citadel-suite
Architecture: source all amd64
Version: 902-dfsg-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Citadel Team <pkg-citadel-de...@lists.alioth.debian.org>
Changed-By: Michael Meskes <mes...@debian.org>
Description:
citadel-suite - complete and feature-rich groupware server; metapackage for
full
citadel-webcit - web-based frontend to Citadel groupware server
webcit-dbg - web-based frontend to Citadel - debugging symbols
Closes: 806121 822569 824289
Changes:
webcit (902-dfsg-1) unstable; urgency=medium
.
* Imported Upstream version 902-dfsg
* Update package to use libical2.
Thanks to Andreas Henriksson <andr...@fatal.se> (Closes: #822569)
* Added Brazilian Portuguese Translation. (Closes: #824289)
* Bumped debhelper and standards version, no changes needed.
* Do not move files into non-existant directories. (Closes: #806121)
Checksums-Sha1:
bc040a9ef51422ae840bc56593dd39fed95d2716 2213 webcit_902-dfsg-1.dsc
95ba7bba8788d9494b80407bc1f4de8f6ebd413d 1660739 webcit_902-dfsg.orig.tar.gz
4bdd53878b8276455015b8b567acff492973d2d6 25492 webcit_902-dfsg-1.diff.gz
d660026bf9e25672275b435feacbfc9975b65b11 8044 citadel-suite_902-dfsg-1_all.deb
20cf0718afd942c7772f2ffa73c67588c8001445 744146
citadel-webcit_902-dfsg-1_amd64.deb
2f7b1e4bcdec1295a403aefc863a413141a9695e 641218 webcit-dbg_902-dfsg-1_amd64.deb
Checksums-Sha256:
ea2d8dfb433ebc2e93cf982d880f2fd9d2e55733ec94accaa83d22467bdca79a 2213
webcit_902-dfsg-1.dsc
f203c23e6bc1cac003e8d4aebf34897227f46d29931753591148f605852d7cd5 1660739
webcit_902-dfsg.orig.tar.gz
bcb21c1d3939db8f5960e4c713a61126605f910cc4ed6e6d713bee7e16e2b9af 25492
webcit_902-dfsg-1.diff.gz
e2ae5506a96e8eee748ef22f5a6aab8c3e77d2f17c8568171358733706fa7421 8044
citadel-suite_902-dfsg-1_all.deb
9d23c2baf9608b682f26137004e089190189fe43d0d9b3c57381e13bc532fb89 744146
citadel-webcit_902-dfsg-1_amd64.deb
ef1ae8f0588e55c19b3eac9ff9c21796c6d14233184ba2dd14964d46abe86f09 641218
webcit-dbg_902-dfsg-1_amd64.deb
Files:
3047feb0e6a81e52244f3fe3e8352703 2213 web extra webcit_902-dfsg-1.dsc
82842ee15d92f2a9ce43411698eb84f6 1660739 web extra webcit_902-dfsg.orig.tar.gz
4eb5711491248845956808a048316711 25492 web extra webcit_902-dfsg-1.diff.gz
de86770d711f2dbd7cc3286fa51e4698 8044 mail extra
citadel-suite_902-dfsg-1_all.deb
72e07318bce90526f4c814bb7612c053 744146 web extra
citadel-webcit_902-dfsg-1_amd64.deb
2150b04c65ff614efb2f3457c81224fc 641218 debug extra
webcit-dbg_902-dfsg-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIVAwUBVzh2czXYV8C7yzslAQh4PRAAvyx+h/y7pfuAeSHCdpjcb3jyjtc3QBF7
V4heSItxLr6lHon1/TfxbEkJ9rvJug4fP/5oO9rwo+kOzKKxT8lqkZ3W4kuSqFQP
AFDgyYE8v7XhTLAojA2O1y3QW0V6V+ZNzRVSyxwbaOO+U+qtg3Bw5MOdOdIZlFcf
L2fxSkzs5fcujDL49B2byS7CsigzzULMKZQ6yBQj7Ks/dpIfzff8hzsQtLqxcSwu
VKPcxjtUXptcBN2TG8V8ASqsaiFtSHondvchU6s2RcdlsLaVNGvU1jQ3VqJYw8S4
uCVBhRhs0arL2mliuSMpWXN++oynJA6sti2e3zw9+99w73zzwjXsI7OVtX1wD21G
t7Z4wGbz7zLSaKD1tE0KHQayv9vCyDyXMC37ewVeAORAFwjVIfbPCX7Yj6xrYd6K
KETtc/S4Tn7r8z1FdNTsywSnLJU8TxG80ObMeoxJ2UunvWGi5RsjtX+977gyflPH
8CCVEHYMHyJ+ciVKk0aza5WLzsR9ttzVTX225TkCUgSEO0ZUUzO5A5n7A9+oKG3A
AaH1HncnyfhBTn6ZzLY0mHurhc/NeXMffriI/33NRN187KMKLF0jaWLhojJceS4k
HZSny2HmANw9vAgc8B4C1dc+ALL5EtNwBVAhhoUr71QXyzLoq0wOd4McIo+dxaW5
SxJkcbv5nmg=
=1EJt
-----END PGP SIGNATURE-----
--- End Message ---
