[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.2_rc2-2-80-g3ad363a
The following commit has been merged in the debian-experimental-4.1 branch:
commit 9e5629088f239be2071fb464aea37cf78af42da7
Author: Rene Engelhard <rene@debian.org>
Date: Mon Apr 15 17:58:33 2013 +0200
Revert "revert 636da2b1e55c098b9c650f31c217c8f220abbebc to make ure gid complete again..."
This reverts commit 7487fca868f9c47cda04b59edc9d5296418b0a06.
Conflicts:
changelog
diff --git a/patches/revert-636da2b1e55c098b9c650f31c217c8f220abbebc.diff b/patches/revert-636da2b1e55c098b9c650f31c217c8f220abbebc.diff
deleted file mode 100644
index 5742dec..0000000
--- a/patches/revert-636da2b1e55c098b9c650f31c217c8f220abbebc.diff
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/scp2/AutoInstallLibs_ooo.mk b/scp2/AutoInstallLibs_ooo.mk
-index dd628d5..46ae5a5 100644
---- a/scp2/AutoInstallLibs_ooo.mk
-+++ b/scp2/AutoInstallLibs_ooo.mk
-@@ -7,6 +7,6 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- #
-
--$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE,auto_File_Lib))
-+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ooo,OOO,LIBO_LIB_FILE(auto_File_Lib_$$(1),$$(call gb_Library_get_runtime_filename,$$(1)))))
-
- # vim: set noet sw=4 ts=4:
-diff --git a/scp2/AutoInstallLibs_ure.mk b/scp2/AutoInstallLibs_ure.mk
-index 9c280bc..567db0e 100644
---- a/scp2/AutoInstallLibs_ure.mk
-+++ b/scp2/AutoInstallLibs_ure.mk
-@@ -7,6 +7,6 @@
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- #
-
--$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB,auto_Ure_Private_Lib))
-+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB(auto_Ure_Private_Lib_$$(1),$$(call gb_Library_get_runtime_filename,$$(1)))))
-
- # vim: set noet sw=4 ts=4:
-diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
-index bb80839..948c626 100755
---- a/scp2/source/ooo/ure.scp
-+++ b/scp2/source/ooo/ure.scp
-@@ -832,7 +832,24 @@ Module gid_Module_Root_Ure_Hidden
- gid_Unixlink_File_Dl_Store,
- gid_Unixlink_File_Dl_Jvmaccess,
- gid_Unixlink_File_Dl_Jvmfwk,
-- auto_Ure_Private_Lib_ALL,
-+ auto_Ure_Private_Lib_affine_uno,
-+ auto_Ure_Private_Lib_gcc3_uno,
-+ auto_Ure_Private_Lib_java_uno,
-+ auto_Ure_Private_Lib_juh,
-+ auto_Ure_Private_Lib_juhx,
-+ auto_Ure_Private_Lib_jvmaccess,
-+ auto_Ure_Private_Lib_jvmfwk,
-+ auto_Ure_Private_Lib_log_uno,
-+ auto_Ure_Private_Lib_msci_uno,
-+ auto_Ure_Private_Lib_mscx_uno,
-+ auto_Ure_Private_Lib_reg,
-+ auto_Ure_Private_Lib_sal_textenc,
-+ auto_Ure_Private_Lib_store,
-+ auto_Ure_Private_Lib_sunjavaplugin,
-+ auto_Ure_Private_Lib_unoidl,
-+ auto_Ure_Private_Lib_unsafe_uno,
-+ auto_Ure_Private_Lib_urelibs,
-+ auto_Ure_Private_Lib_xmlreader,
- gid_File_Dl_JrepropertiesClass,
- gid_File_Dl_Profile_Jvmfwk3rc,
- gid_File_Dl_Jpipe,
-diff --git a/solenv/gbuild/AutoInstallLibs.mk b/solenv/gbuild/AutoInstallLibs.mk
-index c26e708..f7fa75c 100644
---- a/solenv/gbuild/AutoInstallLibs.mk
-+++ b/solenv/gbuild/AutoInstallLibs.mk
-@@ -17,12 +17,8 @@ $(call gb_AutoInstallLibs_get_target,%) :
- $(call gb_Output_announce,$*,$(true),AIL,3)
- echo "/* autogenerated library installs for group $(INSTALLMODULE) */" > $@
- $(call gb_Output_info,install module: $(INSTALLMODULE) contents: $(gb_Library_MODULE_$(INSTALLMODULE)))
-- echo "#define $(SCP2ID)_ALL \ " >> $@
- $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-- echo " $(SCP2ID)_$(lib) \ " >> $@;)
-- echo "" >> $@
-- $(foreach lib,$(gb_Library_MODULE_$(INSTALLMODULE)),\
-- echo "$(SCP2TEMPLATE)($(SCP2ID)_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;)
-+ echo "$(call SCP2TEMPLATE,$(lib))" >> $@;)
-
-
- $(call gb_AutoInstallLibs_get_clean_target,%) :
-@@ -33,7 +29,6 @@ define gb_AutoInstallLibs_AutoInstallLibs
- $(call gb_AutoInstallLibs_get_target,$(1)) : $(gb_Helper_PHONY) | $(dir $(call gb_AutoInstallLibs_get_target,$(1))).dir
- $(call gb_AutoInstallLibs_get_target,$(1)) : INSTALLMODULE = $(2)
- $(call gb_AutoInstallLibs_get_target,$(1)) : SCP2TEMPLATE = $(3)
--$(call gb_AutoInstallLibs_get_target,$(1)) : SCP2ID = $(4)
-
- $$(eval $$(call gb_Module_register_target,$(call gb_AutoInstallLibs_get_target,$(1)),$(call gb_AutoInstallLibs_get_clean_target,$(1))))
- $(call gb_Helper_make_userfriendly_targets,$(1),AutoInstallLibs)
diff --git a/patches/series b/patches/series
index 1bfdbc4..7cf13cd 100644
--- a/patches/series
+++ b/patches/series
@@ -26,4 +26,3 @@ disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
-revert-636da2b1e55c098b9c650f31c217c8f220abbebc.diff
--
LibreOffice packaging repository
Reply to: