./packages/openofficeorg/3.3.0/experimental r2057: more config cleanups
------------------------------------------------------------
revno: 2057
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-07-07 10:24:07 +0200
message:
more config cleanups
modified:
rules
=== modified file 'rules'
--- a/rules 2010-07-06 21:45:32 +0000
+++ b/rules 2010-07-07 08:24:07 +0000
@@ -2300,6 +2300,10 @@
mkdir -p -m755 $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
mv $(PKGDIR)-common/$(OOBRANDDIR)/share/xdg/qstart.desktop \
$(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
+ # gnome config stuff, should land in gnome upstream even but...
+ mkdir -p $(PKGDIR)-gnome/$(OODIR)/share/registry
+ mv $(PKGDIR)-common/$(OODIR)/share/registry/gnome.xcd \
+ $(PKGDIR)-gnome/$(OODIR)/share/registry
endif
ifeq "$(PACKAGE_SDK)" "y"
@@ -2337,13 +2341,6 @@
cd $(PKGDIR)-common/$(OOBASISDIR) && \
rm ure-link && ln -sf /$(OOUREDIR) ure-link
-ifeq "$(ENABLE_GIO)" "y"
- # the config for gio should be there where gio itself is, shouldn't it?
- mkdir -p $(PKGDIR)-gnome/$(OOBASISDIR)/share/registry/modules/org/openoffice/ucb/Configuration
- mv $(PKGDIR)-common/$(OOBASISDIR)/share/registry/modules/org/openoffice/ucb/Configuration/Configuration-gio.xcu \
- $(PKGDIR)-gnome/$(OOBASISDIR)/share/registry/modules/org/openoffice/ucb/Configuration
-endif
-
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@ -3224,6 +3221,10 @@
ln -s /usr/share/java/$(OODIRNAME)/$$i.jar \
$(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes; \
done
+ for i in pocketexcel palm pocketword; do \
+ mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry && \
+ mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
+ $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry
endif
# fix permissions
Reply to: