[SCM] LibreOffice packaging repository branch, master, updated. 950311bcfae87b64ed7bbff147c3ac7b64f15aa6

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit 04970ae1d4fda5dc061642cff67ff4cbcad0f202
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jun 13 23:07:41 2011 +0000

    oops, we forgot to do (de-)registering for libbindet*.so

diff --git a/changelog b/changelog
index 4e70718..8792cf0 100644
--- a/changelog
+++ b/changelog
@@ -15,13 +15,15 @@ libreoffice (1:3.3.3~rc1-1) UNRELEASED; urgency=low
     - build-conflict against libmdds-dev (>= 0.4.0)
   * debian/rules, debian/*lintian-overrides:
     fix/override (some) new Java related lintian warnings
+  * debian/rules, debian/libreoffice-filter-binfilter*.in:
+    oops, we forgot to do (de-)registering for libbindet*.so
 
   [ Björn Michaelsen ]
   * debian/patches/jurt-soffice-location.diff: add the fallback
     /usr/lib/libreoffice/program/soffice to jurts NativeLibraryLoader;
     we know where it is
 
- -- Rene Engelhard <rene@debian.org>  Mon, 06 Jun 2011 23:19:01 +0000
+ -- Rene Engelhard <rene@debian.org>  Mon, 13 Jun 2011 23:05:10 +0000
 
 libreoffice (1:3.3.2-4) unstable; urgency=low
 
diff --git a/libreoffice-filter-binfilter.postinst.in b/libreoffice-filter-binfilter.postinst.in
index 322ea52..a875f14 100755
--- a/libreoffice-filter-binfilter.postinst.in
+++ b/libreoffice-filter-binfilter.postinst.in
@@ -6,6 +6,7 @@ set -e
 
 if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
 	register_to_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
+	register_to_services_rdb /@OOBASISDIR@/program/libbindet$LIBSUFFIX.so
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-filter-binfilter.preinst.in b/libreoffice-filter-binfilter.preinst.in
index 05a81fc..23f99a9 100755
--- a/libreoffice-filter-binfilter.preinst.in
+++ b/libreoffice-filter-binfilter.preinst.in
@@ -7,6 +7,7 @@ set -e
 case "$1" in
 	upgrade)
 		revoke_from_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
+		revoke_from_services_rdb /@OOBASISDIR@/program/libbindet$LIBSUFFIX.so
 	;;
 esac
 
diff --git a/libreoffice-filter-binfilter.prerm.in b/libreoffice-filter-binfilter.prerm.in
index cf51ed5..f110877 100755
--- a/libreoffice-filter-binfilter.prerm.in
+++ b/libreoffice-filter-binfilter.prerm.in
@@ -7,6 +7,7 @@ set -e
 case "$1" in
 	remove)
 		revoke_from_services_rdb /@OOBASISDIR@/program/libbf_migratefilter$LIBSUFFIX.so
+		revoke_from_services_rdb /@OOBASISDIR@/program/libbindet$LIBSUFFIX.so
 	;;
 esac
 
diff --git a/rules b/rules
index 5e1dd57..0400eea 100755
--- a/rules
+++ b/rules
@@ -2160,6 +2160,10 @@ ifeq "$(BUILD_BINFILTERS)" "y"
 		-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'
+	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/libbindet$(LIBSUFFIX).so'
 endif
 
 	# the regcomps above fail after done once, force install again

-- 
LibreOffice packaging repository