[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.1/unstable r1600: * debian/rules, debian/control.kde.in, debian/openoffice.org-kab*:



------------------------------------------------------------
revno: 1600
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2009-07-13 15:31:21 +0200
message:
    * debian/rules, debian/control.kde.in, debian/openoffice.org-kab*:
      also add/revoke libkab1.so to fix similar bug as with -evolution in -2
added:
  openoffice.org-kab.postinst.in
  openoffice.org-kab.preinst.in
  openoffice.org-kab.prerm.in
modified:
  changelog
  control.kde.in
  rules
=== modified file 'changelog'
--- a/changelog	2009-06-30 02:23:47 +0000
+++ b/changelog	2009-07-13 13:31:21 +0000
@@ -8,8 +8,10 @@
     - stop running dh_desktop on sid, thanks lintian
   * debian/ttf-opensymbol.*.in: remove; removes fc-cache calls (see
     debian-devel)
+  * debian/rules, debian/control.kde.in, debian/openoffice.org-kab*:
+    also add/revoke libkab1.so to fix similar bug as with -evolution in -2 
 
- -- Rene Engelhard <rene@debian.org>  Tue, 30 Jun 2009 04:23:15 +0200
+ -- Rene Engelhard <rene@debian.org>  Mon, 13 Jul 2009 15:26:05 +0200
 
 openoffice.org (1:3.1.0-5) unstable; urgency=low
 

=== modified file 'control.kde.in'
--- a/control.kde.in	2009-04-17 18:24:15 +0000
+++ b/control.kde.in	2009-07-13 13:31:21 +0000
@@ -25,6 +25,7 @@
 
 Package: openoffice.orgVER-kab
 Architecture: %OOO_ARCHS%
+Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2)
 Depends: openoffice.orgVER-core (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}

=== added file 'openoffice.org-kab.postinst.in'
--- a/openoffice.org-kab.postinst.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-kab.postinst.in	2009-07-13 13:31:21 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=openoffice.org-kab
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
+	register_to_services_rdb /@OOBASISDIR@/program/libkab1.so
+fi
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-kab.preinst.in'
--- a/openoffice.org-kab.preinst.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-kab.preinst.in	2009-07-13 13:31:21 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# preinst script for openoffice.org-kab
+
+THIS_PACKAGE=openoffice.org-kab
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	upgrade)
+		revoke_from_services_rdb /@OOBASISDIR@/program/libkab1.so
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== added file 'openoffice.org-kab.prerm.in'
--- a/openoffice.org-kab.prerm.in	1970-01-01 00:00:00 +0000
+++ b/openoffice.org-kab.prerm.in	2009-07-13 13:31:21 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+# prerm script for openoffice.org-kab
+
+THIS_PACKAGE=openoffice.org-kab
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+case "$1" in
+	remove)
+		revoke_from_services_rdb /@OOBASISDIR@/program/libkab1.so
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0

=== modified file 'rules'
--- a/rules	2009-06-30 02:23:47 +0000
+++ b/rules	2009-07-13 13:31:21 +0000
@@ -1958,6 +1958,12 @@
 		-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
 
 	# move the URE to /usr/lib/ure
 	mv debian/ure/$(OOBRANDDIR)/ure debian/ure/usr/lib


Reply to: