[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.2_rc1-1-50-gaa4aa40
The following commit has been merged in the debian-experimental-4.1 branch:
commit aa4aa40fcca264e050c3bebda00992a5e66d6d42
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 18 18:39:03 2013 +0100
remove stuff upstream...
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 772eb9b..7a4077a 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -165,47 +165,3 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
-From b0213e0bb4d4d81078e43dbabdefb6618a0cd8fd Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Mon, 18 Mar 2013 17:14:08 +0000
-Subject: readd packinfo_office.txt stuff for Pdfimport
-
-... as otherwise it ends up in gid_Module_Root_Brand, NOT
-in it's own module (which is intended)
-
-Change-Id: Ic3951ccd7471793419b04f4f2fcfe90060c6d71f
----
---- a/scp2/source/ooo/module_pdfimport.scp-old 2013-03-18 18:34:36.121925117 +0100
-+++ b/scp2/source/ooo/module_pdfimport.scp 2013-03-18 18:34:54.785924562 +0100
-@@ -26,6 +26,7 @@
- #include "macros.inc"
-
- Module gid_Module_Pdfimport
-+ PackageInfo = "packinfo_office.txt";
- ParentID = gid_Module_Root_Brand;
- Styles = (HIDDEN_ROOT);
- Dirs = (gid_Dir_Share_Xpdfimport);
-diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
-index 4a8a773..0f3bda1 100644
---- a/setup_native/source/packinfo/packinfo_office.txt
-+++ b/setup_native/source/packinfo/packinfo_office.txt
-@@ -1183,3 +1183,17 @@ description = "PostgreSQL Connector driver for %PRODUCTNAME %PRODUCTVERSION"
- destpath = "/opt"
- packageversion = "%PACKAGEVERSION"
- End
-+
-+Start
-+module = "gid_Module_Pdfimport"
-+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-extension-pdf-import"
-+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07 (Name="Core module for %PRODUCTNAME %PRODUCTVERSION")"
-+packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-pdf-import"
-+requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07"
-+linuxpatchrequires = ""
-+copyright = "2012 The Document Foundation"
-+solariscopyright = "solariscopyrightfile"
-+vendor = "The Document Foundation"
-+description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt"
-+packageversion = "%PACKAGEVERSION"
-+End
-+
diff --git a/patches/series b/patches/series
index 1bd8afa..9222698 100644
--- a/patches/series
+++ b/patches/series
@@ -24,5 +24,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
-system-psql-no-krb5-gssapi-check.diff
wheezy-backports-python.diff
diff --git a/patches/system-psql-no-krb5-gssapi-check.diff b/patches/system-psql-no-krb5-gssapi-check.diff
deleted file mode 100644
index 910aaf3..0000000
--- a/patches/system-psql-no-krb5-gssapi-check.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 18490cf..0474d67 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7662,75 +7670,6 @@ dnl ===================================================================
- if test "x$enable_postgresql_sdbc" != "xno"; then
- SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
-
-- # if/when anything else than PostgreSQL uses Kerberos,
-- # move this out of `test "x$enable_postgresql_sdbc" != "xno"'
-- WITH_KRB5=NO
-- WITH_GSSAPI=no
-- case "$_os" in
-- Darwin)
-- # MacOS X has system MIT Kerberos 5 since 10.4
-- if test "$with_krb5" != "no"; then
-- WITH_KRB5=YES
-- save_LIBS=$LIBS
-- AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5, try installing libcom_err devel package])])
-- LIBS=$save_LIBS
-- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5, try installing krb5 devel package])])
-- LIBS=$save_LIBS
-- fi
-- if test "$with_gssapi" != "no"; then
-- WITH_GSSAPI=YES
-- save_LIBS=$LIBS
-- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
-- LIBS=$save_LIBS
-- fi
-- ;;
-- WINNT)
-- if test "$with_krb5" = "yes" -o "$with_gssapi" = "yes"; then
-- AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.])
-- fi
-- ;;
-- Linux|GNU|*BSD|DragonFly)
-- if test "$with_krb5" != "no"; then
-- WITH_KRB5=YES
-- save_LIBS=$LIBS
-- AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
-- LIBS=$save_LIBS
-- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
-- LIBS=$save_LIBS
-- fi
-- if test "$with_gssapi" != "no"; then
-- WITH_GSSAPI=YES
-- save_LIBS=$LIBS
-- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
-- LIBS=$save_LIBS
-- fi
-- ;;
-- *)
-- if test "$with_krb5" = "yes"; then
-- WITH_KRB5=YES
-- save_LIBS=$LIBS
-- AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-- [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
-- LIBS=$save_LIBS
-- AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-- [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
-- LIBS=$save_LIBS
-- fi
-- if test "$with_gssapi" = "yes"; then
-- WITH_GSSAPI=YES
-- save_LIBS=$LIBS
-- AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-- [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
-- LIBS=$save_LIBS
-- fi
-- esac
--
- AC_MSG_CHECKING([PostgreSQL C interface])
- if test "$with_system_postgresql" = "yes"; then
- AC_MSG_RESULT([external PostgreSQL])
-@@ -7748,6 +7687,75 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
- POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
- POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
- else
-+ # if/when anything else than PostgreSQL uses Kerberos,
-+ # move this out of `test "x$enable_postgresql_sdbc" != "xno"'
-+ WITH_KRB5=NO
-+ WITH_GSSAPI=no
-+ case "$_os" in
-+ Darwin)
-+ # MacOS X has system MIT Kerberos 5 since 10.4
-+ if test "$with_krb5" != "no"; then
-+ WITH_KRB5=YES
-+ save_LIBS=$LIBS
-+ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-+ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5, try installing libcom_err devel package])])
-+ LIBS=$save_LIBS
-+ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-+ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5, try installing krb5 devel package])])
-+ LIBS=$save_LIBS
-+ fi
-+ if test "$with_gssapi" != "no"; then
-+ WITH_GSSAPI=YES
-+ save_LIBS=$LIBS
-+ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-+ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
-+ LIBS=$save_LIBS
-+ fi
-+ ;;
-+ WINNT)
-+ if test "$with_krb5" = "yes" -o "$with_gssapi" = "yes"; then
-+ AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Windows.])
-+ fi
-+ ;;
-+ Linux|GNU|*BSD|DragonFly)
-+ if test "$with_krb5" != "no"; then
-+ WITH_KRB5=YES
-+ save_LIBS=$LIBS
-+ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-+ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
-+ LIBS=$save_LIBS
-+ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-+ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
-+ LIBS=$save_LIBS
-+ fi
-+ if test "$with_gssapi" != "no"; then
-+ WITH_GSSAPI=YES
-+ save_LIBS=$LIBS
-+ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-+ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
-+ LIBS=$save_LIBS
-+ fi
-+ ;;
-+ *)
-+ if test "$with_krb5" = "yes"; then
-+ WITH_KRB5=YES
-+ save_LIBS=$LIBS
-+ AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-+ [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])])
-+ LIBS=$save_LIBS
-+ AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
-+ [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])])
-+ LIBS=$save_LIBS
-+ fi
-+ if test "$with_gssapi" = "yes"; then
-+ WITH_GSSAPI=YES
-+ save_LIBS=$LIBS
-+ AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 -lcrypto'], [],
-+ [AC_MSG_ERROR([could not find function 'gss_init_sec_context' required for GSSAPI])])
-+ LIBS=$save_LIBS
-+ fi
-+ esac
-+
- if test -n "$with_libpq_path"; then
- SYSTEM_POSTGRESQL=YES
- AC_MSG_RESULT([external libpq])
--
LibreOffice packaging repository
Reply to: