The following commit has been merged in the debian-experimental-3.4.0 branch:
commit f217ce1a7ca8a311012a42e5c555b404eab33e0c
Author: Rene Engelhard <[email protected]>
Date: Tue Jun 14 01:25:53 2011 +0200
remove evoab, binfilter and kdeab deregistering into patch patching the new
packcomponents
diff --git a/changelog b/changelog
index 63011f2..8acdc85 100644
--- a/changelog
+++ b/changelog
@@ -33,12 +33,15 @@ libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
* debian/uno-libs3.symbols: update
* debian/rules, debian/*lintian-overrides:
fix/override (some) new Java related lintian warnings
+ * debian/rules, debian/patches/packcomponents-remove-split-components.diff:
+ remove evoab, binfilter and kdeab deregistering into patch patching
+ the new packcomponents
[ Björn Michaelsen ]
* debian/patches/jurt-soffice-location.diff: add the fallback
/usr/lib/libreoffice/program/soffice to jurts NativeLibraryLoader;
- -- Rene Engelhard <[email protected]> Fri, 03 Jun 2011 22:28:20 +0000
+ -- Rene Engelhard <[email protected]> Tue, 14 Jun 2011 01:24:58 +0200
libreoffice (1:3.3.2-4) unstable; urgency=low
diff --git a/patches/packcomponents-remove-split-components.diff
b/patches/packcomponents-remove-split-components.diff
new file mode 100644
index 0000000..ef418a8
--- /dev/null
+++ b/patches/packcomponents-remove-split-components.diff
@@ -0,0 +1,49 @@
+--- /dev/null 2011-06-02 16:58:12.448567841 +0200
++++
libreoffice-3.4.0/libreoffice-build/patches/dev300/packcomponents-remove-split-components.diff
2011-06-14 00:59:26.000000000 +0200
+@@ -0,0 +1,37 @@
++--- postprocess/packcomponents/makefile.mk-old 2011-06-13
23:35:26.000000000 +0000
+++++ 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
++ .END
++
++-.IF "$(WITH_BINFILTER)" != "NO"
++-my_components += \
++- bf_migratefilter \
++- bindet
++-.END
++-
++ .IF "$(WITH_LDAP)" == "YES"
++ my_components += ldapbe2
++ .END
++@@ -355,10 +345,6 @@
++ my_components += cmdmail
++ .END
++
++-.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
++-my_components += evoab
++-.END
++-
++ .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
++ my_components += avmediagstreamer
++ .END
+--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old
2011-06-14 01:21:36.000000000 +0200
++++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14
01:21:48.000000000 +0200
+@@ -1493,3 +1493,6 @@
+ [ PowerPC ]
+ no-minimaltoc.diff
+
++[ DebianBaseOnly ]
++packcomponents-remove-split-components.diff
++
diff --git a/patches/series b/patches/series
index 6815a1e..4770f3a 100644
--- a/patches/series
+++ b/patches/series
@@ -6,3 +6,4 @@ odk-jni-include.diff
disable-sdbc-postgresql.diff
disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
+packcomponents-remove-split-components.diff
diff --git a/rules b/rules
index b77439f..9f671a5 100755
--- a/rules
+++ b/rules
@@ -2111,25 +2111,6 @@ $(STAMP_DIR)/install-arch: $(STAMP_DIR)/install
$(STAMP_NATIVE_JARS)
dh_testroot
umask 022
-ifeq "$(ENABLE_EVO2)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libevoab$(LIBSUFFIX).so'
-endif
-ifeq "$(ENABLE_KDEAB)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libkab1.so'
-endif
-ifeq "$(BUILD_BINFILTERS)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c
'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libbf_migratefilter$(LIBSUFFIX).so'
-endif
-
# the regcomps above fail after done once, force install again
rm -f $(STAMP_DIR)/install
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
