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

r775 ./packages/openofficeorg/2.2.1/unstable: remove FontOOo from script.xlb, update ooo-build



------------------------------------------------------------
revno: 775
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-07-03 16:13:13 +0200
message:
  remove FontOOo from script.xlb, update ooo-build
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2007-07-02 14:27:21 +0000
+++ b/changelog	2007-07-03 14:13:13 +0000
@@ -1,11 +1,14 @@
 openoffice.org (2.2.1-4.5pre) unstable; urgency=low
 
   * ooo-build:
-    - update (r9679)
+    - update (r9693)
   * debian/control.mozilla.in:
     - stop recommending mozilla-browser (closes: #431269)
+  * debian/rules:
+    - remove FontOOo from /usr/lib/openoffice/share/basic/launcher/script.xlb,
+      see issue 79153
 
- -- Rene Engelhard <rene@debian.org>  Mon,  2 Jul 2007 16:25:40 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue,  3 Jul 2007 15:44:46 +0200
 
 openoffice.org (2.2.1-4) unstable; urgency=low
 

=== modified file 'rules'
--- a/rules	2007-07-01 20:11:21 +0000
+++ b/rules	2007-07-03 14:13:13 +0000
@@ -2108,14 +2108,15 @@
 	      's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/openoffice$(VER)/uno_packages/cache,g' \
 		$(PKGDIR)-common/$(OODIR)/program/unorc
 
-	# install DicOOo and FontOOo; we need to do this manually; the
+	# install DicOOo; we need to do this manually; the
 	# dictionaries/ module isn't built with --without-myspell-dicts
 	# and those two somehow (why?) are in there...
 	mkdir -p $(PKGDIR)-common/usr/share/myspell/dicts
 	install -m644 $(SOURCE_TREE)/dictionaries/diclst/DicOOo.sxw \
 		$(PKGDIR)-common/usr/share/myspell/dicts
-	#install -m644 $(SOURCE_TREE)/dictionaries/diclst/FontOOo.sxw \
-	#	$(PKGDIR)-common/usr/share/myspell/dicts
+	# issue 79153
+	perl -p -e 's,\s<library:element library:name="FontOOo"/>\n,,' \
+		$(PKGDIR)-common/$(OODIR)/share/basic/launcher/script.xlb
 
 ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	mkdir -p debian/ttf-opensymbol/usr/share/fonts/truetype/openoffice


Reply to: