debian/patches/20_xulrunner.patch: Fixed upstream

git-svn-id: file:///svn/pkg-evolution/experimental/evolution@432 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2006-05-28 14:27:32 +00:00
parent 80df5aede1
commit c759b1f493
2 changed files with 2 additions and 23 deletions

3
debian/changelog vendored
View File

@ -9,8 +9,9 @@ evolution (2.7.2-1) UNRELEASED; urgency=low
upstream upstream
* debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply * debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply
cleanly cleanly
* debian/patches/20_xulrunner.patch: Fixed upstream
-- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 16:24:50 +0200 -- Oystein Gisnas <oystein@gisnas.net> Sun, 28 May 2006 16:27:24 +0200
evolution (2.6.1-4) UNRELEASED; urgency=low evolution (2.6.1-4) UNRELEASED; urgency=low

View File

@ -1,22 +0,0 @@
diff -ru evolution-2.6.0.orig/configure.in evolution-2.6.0/configure.in
--- evolution-2.6.0.orig/configure.in 2006-03-30 17:55:16.000000000 +0000
+++ evolution-2.6.0/configure.in 2006-03-30 17:55:37.000000000 +0000
@@ -748,15 +748,15 @@
fi
if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then
- PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes")
+ PKG_CHECK_MODULES(NSS, xulrunner-nss, have_nss="yes")
if test "x${have_nss}" = "xyes"; then
msg_ssl="yes (Mozilla NSS)"
if test "x$enable_smime" = "xyes"; then
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
msg_smime="yes (Mozilla NSS)"
fi
- mozilla_nspr="mozilla-nspr"
- mozilla_nss="mozilla-nss"
+ mozilla_nspr="xulrunner-nspr"
+ mozilla_nss="xulrunner-nss"
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])