Bug#933668: Doesn't build against libecal-2.0

2019-08-12 Thread Angel Abad
Hi, thanks a lot for the patch, Im on holidays, so I will try to take a
look next week.

Cheers,

El jue., 1 ago. 2019 a las 18:30, Iain Lane ()
escribió:

> Package: src:almanah
> Version: 0.11.1-2
> Severity: wishlist
> Tags: patch upstream
>
> Control: block 933577 by -1
>
> Hi,
>
> This is in experimental-NEW at the minute, but you can grab the packages
> out of evolution-data-server Vcs-Git to test this. tl;dr is that ecal
> broke API with this release. There are patches upstream which I grabbed
> and applied to the Debian package (untested though). Diff attached for
> you to review. If you wanted to upload to experimental now that would be
> OK, or you can wait until we're ready to go to unstable - at which point
> I'll raise the severity of this bug.
>
> Cheers,
>
> --
> Iain Lane  [ i...@orangesquash.org.uk ]
> Debian Developer   [ la...@debian.org ]
> Ubuntu Developer   [ la...@ubuntu.com ]
>


-- 
Angel Abad
an...@debian.org | angela...@ubuntu.com | angela...@gmail.com
https://angelabad.me
FPR: 4A08 9719 1621 CCF7 FBEE  F752 A6D5 8816 010A 1096


Bug#933668: Doesn't build against libecal-2.0

2019-08-01 Thread Iain Lane
Package: src:almanah
Version: 0.11.1-2
Severity: wishlist
Tags: patch upstream

Control: block 933577 by -1

Hi,

This is in experimental-NEW at the minute, but you can grab the packages
out of evolution-data-server Vcs-Git to test this. tl;dr is that ecal
broke API with this release. There are patches upstream which I grabbed
and applied to the Debian package (untested though). Diff attached for
you to review. If you wanted to upload to experimental now that would be
OK, or you can wait until we're ready to go to unstable - at which point
I'll raise the severity of this bug.

Cheers,

-- 
Iain Lane  [ i...@orangesquash.org.uk ]
Debian Developer   [ la...@debian.org ]
Ubuntu Developer   [ la...@ubuntu.com ]
diff -Nru almanah-0.11.1/debian/changelog almanah-0.11.1/debian/changelog
--- almanah-0.11.1/debian/changelog 2018-03-26 17:21:29.0 +0100
+++ almanah-0.11.1/debian/changelog 2019-08-01 17:21:20.0 +0100
@@ -1,3 +1,18 @@
+almanah (0.11.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * events-Removed-Evolution-runtime-dependency.patch,
+trivial-Fixed-indentation.patch,
+event-factories-Port-to-libecal-2.0.patch,
+data-Updated-the-AppData-format.patch,
+Update-the-AppData-file-to-version-0.7.patch,
+Add-a-missing-tag-to-the-AppData-file.patch,
+libecal-2.0:
+Backport a load of patches from upstream to enable building against
+libecal-2.0.
+
+ -- Iain Lane   Thu, 01 Aug 2019 17:21:20 +0100
+
 almanah (0.11.1-2) unstable; urgency=medium
 
   * Increase Priority to optional. Priority: extra is deprecated
diff -Nru almanah-0.11.1/debian/control almanah-0.11.1/debian/control
--- almanah-0.11.1/debian/control   2018-01-05 08:46:04.0 +
+++ almanah-0.11.1/debian/control   2019-08-01 16:56:47.0 +0100
@@ -2,15 +2,17 @@
 Section: gnome
 Priority: optional
 Maintainer: Angel Abad 
-Build-Depends: debhelper (>= 9),
- autotools-dev,
+Build-Depends: appstream-util,
+ debhelper (>= 9),
+ dh-autoreconf,
+ gnome-common,
  intltool (>= 0.35.0),
  libglib2.0-dev,
  libgtk-3-dev (>= 3.5.6),
  libsqlite3-dev,
  libcryptui-dev (>= 3.0.0),
  libgpgme11-dev,
- libecal1.2-dev (>= 3.6.0),
+ libecal2.0-dev,
  libedataserver1.2-dev (>= 3.6.0),
  libgtkspell3-3-dev
 Standards-Version: 3.9.6
diff -Nru 
almanah-0.11.1/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch 
almanah-0.11.1/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch
--- almanah-0.11.1/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch   
1970-01-01 01:00:00.0 +0100
+++ almanah-0.11.1/debian/patches/Add-a-missing-tag-to-the-AppData-file.patch   
2019-08-01 17:11:39.0 +0100
@@ -0,0 +1,22 @@
+From 9c94abafe29415dbac1b6460af17c5af254e5859 Mon Sep 17 00:00:00 2001
+From: Richard Hughes 
+Date: Mon, 25 Jan 2016 15:12:21 +
+Subject: [PATCH] Add a missing tag to the AppData file
+
+---
+ data/almanah.appdata.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in
+index df93a75..d50f20c 100644
+--- a/data/almanah.appdata.xml.in
 b/data/almanah.appdata.xml.in
+@@ -31,4 +31,5 @@
+ AppMenu
+ ModernToolkit
+   
++  almanah
+ 
+-- 
+2.20.1
+
diff -Nru almanah-0.11.1/debian/patches/data-Updated-the-AppData-format.patch 
almanah-0.11.1/debian/patches/data-Updated-the-AppData-format.patch
--- almanah-0.11.1/debian/patches/data-Updated-the-AppData-format.patch 
1970-01-01 01:00:00.0 +0100
+++ almanah-0.11.1/debian/patches/data-Updated-the-AppData-format.patch 
2019-08-01 17:13:02.0 +0100
@@ -0,0 +1,26 @@
+From 45971f9b492b366989ae0afd89243218be9b5fb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Pe=C3=B1a?= 
+Date: Sat, 7 Mar 2015 20:54:43 +0100
+Subject: [PATCH] data: Updated the AppData format
+
+Included the fields "name" and "summary".
+---
+ data/almanah.appdata.xml.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in
+index 17a0a7d..31db07d 100644
+--- a/data/almanah.appdata.xml.in
 b/data/almanah.appdata.xml.in
+@@ -4,6 +4,8 @@
+   almanah.desktop
+   CC0-1.0
+   GPL-3.0+
++  Almanah Diary
++  <_summary>Keep a diary of your life
+   
+ <_p>
+   Almanah Diary is an application to allow you to keep a diary of your 
life.
+-- 
+2.20.1
+
diff -Nru 
almanah-0.11.1/debian/patches/event-factories-Port-to-libecal-2.0.patch 
almanah-0.11.1/debian/patches/event-factories-Port-to-libecal-2.0.patch
--- almanah-0.11.1/debian/patches/event-factories-Port-to-libecal-2.0.patch 
1970-01-01 01:00:00.0 +0100
+++ almanah-0.11.1/debian/patches/event-factories-Port-to-libecal-2.0.patch 
2019-08-01 16:52:27.0 +0100
@@ -0,0 +1,821 @@
+From cb11d217448161562ae6eb4b94d01186e89b275f Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Fri, 17 May 2019 12:22:09 +0200
+Subj