Commit 5a19a95d authored by Matthias Klose's avatar Matthias Klose Committed by Simon Quigley

Import 3.0.2-5.

parent 5df0958c
abiword (3.0.2-5) unstable; urgency=medium
* QA upload.
* Fix build with libical3. Closes: #883924.
* Add explicit build dependency on libical-dev (>= 3.0).
* Bump standards version.
-- Matthias Klose <doko@debian.org> Sun, 10 Dec 2017 09:37:43 +0100
abiword (3.0.2-4) unstable; urgency=high
[ Simon Quigley ]
......
......@@ -12,6 +12,7 @@ Build-Depends: bison,
libboost-dev,
libchamplain-gtk-0.12-dev,
libebook1.2-dev (>= 3.8.5),
libical-dev (>= 3.0),
libecal1.2-dev (>= 3.8.5),
libenchant-dev,
libfribidi-dev,
......@@ -40,7 +41,7 @@ Build-Depends: bison,
libwv-dev,
libxslt-dev | libxslt1-dev,
valgrind [amd64 arm64 armhf i386 mips mips64el powerpc ppc64el s390x] <!nocheck>
Standards-Version: 4.1.1
Standards-Version: 4.1.2
Homepage: http://www.abisource.com/
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/abiword.git
Vcs-Git: https://anonscm.debian.org/git/collab-maint/abiword.git
......@@ -123,7 +124,7 @@ Depends: gir1.2-abi-3.0 (= ${binary:Version}),
libgoffice-0.10-dev,
libgsf-1-dev,
libgtk-3-dev,
libical-dev (>= 0.46),
libical-dev (>= 3.0),
libpango1.0-dev,
librasqal3-dev,
librdf0-dev,
......
Index: src/text/ptbl/xp/pd_DocumentRDF.cpp
===================================================================
--- a/src/text/ptbl/xp/pd_DocumentRDF.cpp (revision 35456)
+++ b/src/text/ptbl/xp/pd_DocumentRDF.cpp (revision 35457)
@@ -2266,8 +2266,8 @@
icalcomponent_set_uid( c, m_uid.c_str() );
icalcomponent_set_location( c, m_location.c_str() );
icalcomponent_set_description( c, m_desc.c_str() );
- icalcomponent_set_dtstart( c, icaltime_from_timet( m_dtstart, 0 ) );
- icalcomponent_set_dtend( c, icaltime_from_timet( m_dtend, 0 ) );
+ icalcomponent_set_dtstart( c, icaltime_from_timet_with_zone( m_dtstart, 0, NULL ) );
+ icalcomponent_set_dtend( c, icaltime_from_timet_with_zone( m_dtend, 0, NULL ) );
char* data = icalcomponent_as_ical_string( c );
std::ofstream oss( filename.c_str() );
......@@ -9,3 +9,4 @@ mime-types.diff -p1
build-with-aiksaurus-1-2.patch
gtk322.patch
fix-flickering.patch
libical3.diff
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment