r3160 - in /experimental/evolution/debian: changelog patches/02_nss_paths.patch patches/series

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Tue Jun 13 19:58:27 2017
New Revision: 3160

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=3160
Log:
Update 02-nss_paths.patch

Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/patches/02_nss_paths.patch
    experimental/evolution/debian/patches/series

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=3160&op=diff
==============================================================================
--- experimental/evolution/debian/changelog	(original)
+++ experimental/evolution/debian/changelog	Tue Jun 13 19:58:27 2017
@@ -1,5 +1,8 @@
 evolution (3.24.1-1) UNRELEASED; urgency=medium
 
+  * Team upload.
+
+  [ Jeremy Bicha ]
   * New upstream release (LP: #1685683)
     - Switch from autotools to cmake
   * Bump e-d-s dependencies and build-dependencies to 3.24.1
@@ -8,11 +11,12 @@
   * Split bogofilter, pstimport, and spamassassin support into separate
     packages so that they can be individually installed or uninstalled by
     appstream clients
-  * Update 10_revert_libevolution_avoid-version.patch:
-  * Disable 02_nss_paths.patch since it's not clear whether this
-    is still needed
-
- -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 02 May 2017 22:17:49 -0400
+  * Update 10_revert_libevolution_avoid-version.patch
+
+  [ Mathieu Trudel-Lapierre ]
+  * Update 02_nss_paths.patch
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 13 Jun 2017 15:17:49 -0400
 
 evolution (3.22.6-1) unstable; urgency=medium
 

Modified: experimental/evolution/debian/patches/02_nss_paths.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/02_nss_paths.patch?rev=3160&op=diff
==============================================================================
--- experimental/evolution/debian/patches/02_nss_paths.patch	(original)
+++ experimental/evolution/debian/patches/02_nss_paths.patch	Tue Jun 13 19:58:27 2017
@@ -4,16 +4,20 @@
  built-in certificate store of NSS) lives, and it's actually under libdir/nss
  rather than directly under libdir.
 
-Index: b/configure.ac
+---
+ cmake/modules/FindSMIME.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: b/cmake/modules/FindSMIME.cmake
 ===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -751,7 +751,7 @@
- 			fi
- 			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
- 			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
--			AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`",[Define to the full path of mozilla nss library])
-+			AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`/nss",[Define to the full path of mozilla nss library])
- 			MANUAL_NSPR_CFLAGS=""
- 			MANUAL_NSPR_LIBS=""
- 			MANUAL_NSS_CFLAGS=""
+--- a/cmake/modules/FindSMIME.cmake
++++ b/cmake/modules/FindSMIME.cmake
+@@ -55,7 +55,7 @@ if((WITH_NSPR_INCLUDES STREQUAL "") AND
+ 		set(MANUAL_NSPR_LIBS "")
+ 		set(MANUAL_NSS_INCLUDES "")
+ 		set(MANUAL_NSS_LIBS "")
+-		set(MOZILLA_NSS_LIB_DIR "${_nss_libdir}")
++		set(MOZILLA_NSS_LIB_DIR "${_nss_libdir}/nss")
+ 		return()
+ 	endif((NOT (mozilla_nspr STREQUAL "")) AND (NOT (mozilla_nss STREQUAL "")))
+ endif()

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=3160&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series	(original)
+++ experimental/evolution/debian/patches/series	Tue Jun 13 19:58:27 2017
@@ -1,2 +1,2 @@
-#02_nss_paths.patch
+02_nss_paths.patch
 10_revert_libevolution_avoid-version.patch