[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-40-g7bac23c
The following commit has been merged in the debian-experimental-3.5 branch:
commit 7bac23c70a30982839427b14597930e401759532
Author: Rene Engelhard <rene@debian.org>
Date: Thu Oct 20 21:56:05 2011 +0000
unfuzzy packcomponents-remove-split-components.diff
diff --git a/patches/packcomponents-remove-split-components.diff b/patches/packcomponents-remove-split-components.diff
index c5a7ea3..03f2bc8 100644
--- a/patches/packcomponents-remove-split-components.diff
+++ b/patches/packcomponents-remove-split-components.diff
@@ -1,18 +1,7 @@
--- libreoffice-3.5.0/postprocess/packcomponents/makefile.mk-old 2011-06-13 23:35:26.000000000 +0000
+++ libreoffice-3.5.0/postprocess/packcomponents/makefile.mk 2011-06-13 23:35:58.000000000 +0000
-@@ -229,10 +229,6 @@
- my_components += ucpgvfs
- .END
-
--.IF "$(ENABLE_KAB)" != ""
--my_components += kab1
--.END
--
- .IF "$(ENABLE_KDE)" != ""
- my_components += kdebe1
- .END
@@ -269,12 +265,6 @@
- web
+ component/wizards/com/sun/star/wizards/web/web
.END
-.IF "$(WITH_BINFILTER)" != "NO"
@@ -33,5 +22,5 @@
-.END
-
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
- my_components += avmediagstreamer
+ my_components += component/avmedia/source/gstreamer/avmediagstreamer
.END
--
LibreOffice packaging repository
Reply to: