From 457f78dd7c940f3cf341fe6f6f12e1b881a13068 Mon Sep 17 00:00:00 2001
From: Iain Lane <laney@debian.org>
Date: Thu, 25 Jul 2019 22:19:11 +0100
Subject: [PATCH] Rebase patches

---
 debian/patches/02_nss_paths.patch                |  2 +-
 .../10_revert_libevolution_avoid-version.patch   | 16 ++++++++--------
 debian/patches/ubuntu_gettext_domain.patch       |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/debian/patches/02_nss_paths.patch b/debian/patches/02_nss_paths.patch
index 7e61c38212..88060016ae 100644
--- a/debian/patches/02_nss_paths.patch
+++ b/debian/patches/02_nss_paths.patch
@@ -10,7 +10,7 @@ rather than directly under libdir.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/modules/FindSMIME.cmake b/cmake/modules/FindSMIME.cmake
-index 8ee4a17..7b87f4b 100644
+index 2537119..ea5be51 100644
 --- a/cmake/modules/FindSMIME.cmake
 +++ b/cmake/modules/FindSMIME.cmake
 @@ -55,7 +55,7 @@ if((WITH_NSPR_INCLUDES STREQUAL "") AND (WITH_NSPR_LIBS STREQUAL "") AND (WITH_N
diff --git a/debian/patches/10_revert_libevolution_avoid-version.patch b/debian/patches/10_revert_libevolution_avoid-version.patch
index ae8c0db6c8..ff33bbc4e9 100644
--- a/debian/patches/10_revert_libevolution_avoid-version.patch
+++ b/debian/patches/10_revert_libevolution_avoid-version.patch
@@ -130,7 +130,7 @@ index 2753f15..4e76f67 100644
  	-DG_LOG_DOMAIN=\"eabutil\"
  )
 diff --git a/src/calendar/gui/CMakeLists.txt b/src/calendar/gui/CMakeLists.txt
-index 09cf401..fde64f8 100644
+index dcf5fe1..744f61e 100644
 --- a/src/calendar/gui/CMakeLists.txt
 +++ b/src/calendar/gui/CMakeLists.txt
 @@ -182,6 +182,11 @@ add_dependencies(evolution-calendar
@@ -162,7 +162,7 @@ index d0bc817..6cb94ea 100644
  	-DG_LOG_DOMAIN=\"evolution-calendar-importers\"
  	-DEVOLUTION_SOUNDDIR=\"${soundsdir}\"
 diff --git a/src/composer/CMakeLists.txt b/src/composer/CMakeLists.txt
-index b609d8d..6476737 100644
+index 4335920..34334fb 100644
 --- a/src/composer/CMakeLists.txt
 +++ b/src/composer/CMakeLists.txt
 @@ -49,6 +49,11 @@ add_dependencies(evolution-mail-composer
@@ -178,7 +178,7 @@ index b609d8d..6476737 100644
  	-DG_LOG_DOMAIN=\"evolution-mail-composer\"
  	-DEVOLUTION_UIDIR=\"${uidir}\"
 diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
-index d58ee56..102d2ac 100644
+index ceed0a4..19603df 100644
 --- a/src/e-util/CMakeLists.txt
 +++ b/src/e-util/CMakeLists.txt
 @@ -588,6 +588,11 @@ add_dependencies(evolution-util
@@ -239,10 +239,10 @@ index 6b4f3bf..9364739 100644
  )
  
 diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt
-index 279099f..3142fc8 100644
+index a51c1ed..31c1c5e 100644
 --- a/src/mail/CMakeLists.txt
 +++ b/src/mail/CMakeLists.txt
-@@ -211,6 +211,11 @@ add_dependencies(evolution-mail
+@@ -219,6 +219,11 @@ add_dependencies(evolution-mail
  	${DEPENDENCIES}
  )
  
@@ -271,7 +271,7 @@ index a91d154..ba27911 100644
  	-DG_LOG_DOMAIN=\"evolution-mail-importers\"
  	-DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
 diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
-index 1eb839d..0ca9817 100644
+index 86d4437..c2afd0e 100644
 --- a/src/shell/CMakeLists.txt
 +++ b/src/shell/CMakeLists.txt
 @@ -60,6 +60,11 @@ add_dependencies(evolution-shell
@@ -287,7 +287,7 @@ index 1eb839d..0ca9817 100644
  	-DG_LOG_DOMAIN=\"evolution-shell\"
  	-DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
 diff --git a/src/smime/gui/CMakeLists.txt b/src/smime/gui/CMakeLists.txt
-index 89ed22f..7b7b73a 100644
+index 5efcb42..667b4b4 100644
 --- a/src/smime/gui/CMakeLists.txt
 +++ b/src/smime/gui/CMakeLists.txt
 @@ -25,6 +25,11 @@ add_dependencies(evolution-smime
@@ -303,7 +303,7 @@ index 89ed22f..7b7b73a 100644
  	-DG_LOG_DOMAIN=\"evolution-smime\"
  )
 diff --git a/src/smime/lib/CMakeLists.txt b/src/smime/lib/CMakeLists.txt
-index 7f15427..5f0a480 100644
+index 0826c41..a3c2b61 100644
 --- a/src/smime/lib/CMakeLists.txt
 +++ b/src/smime/lib/CMakeLists.txt
 @@ -21,6 +21,11 @@ add_dependencies(essmime
diff --git a/debian/patches/ubuntu_gettext_domain.patch b/debian/patches/ubuntu_gettext_domain.patch
index 81baa81f52..82daa21792 100644
--- a/debian/patches/ubuntu_gettext_domain.patch
+++ b/debian/patches/ubuntu_gettext_domain.patch
@@ -10,10 +10,10 @@ Bug: https://bugzilla.gnome.org/784877
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a47d34..ad5bd23 100644
+index 2339e4f..2a1ba7f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -33,7 +33,7 @@ else(_is_devel_version EQUAL 1)
+@@ -35,7 +35,7 @@ else(_is_devel_version EQUAL 1)
  endif(_is_devel_version EQUAL 1)
  
  # Required for FindIntltool module
@@ -21,4 +21,4 @@ index 8a47d34..ad5bd23 100644
 +set(GETTEXT_PACKAGE "evolution")
  set(GETTEXT_PO_DIR ${CMAKE_SOURCE_DIR}/po)
  
- # Required for 'disttest' and 'ditcheck' of DistTarget module
+ # Required for 'disttest' and 'distcheck' of DistTarget module