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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-174-g744ea92



The following commit has been merged in the debian-experimental-3.5 branch:
commit 744ea9275e112d7f3004d39c7a5e7b7fb330e560
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Dec 21 22:52:39 2011 +0000

    fix evoab.xcd install after split-binfilters-and-evo.diff fix

diff --git a/rules b/rules
index f3a9c22..57a44a9 100755
--- a/rules
+++ b/rules
@@ -1795,8 +1795,6 @@ ifeq "$(ENABLE_EVO2)" "y"
 	mkdir -p $(PKGDIR)-evolution/$(OODIR)/share/registry
 	mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \
 		$(PKGDIR)-evolution/$(OODIR)/presets/database
-	mv $(PKGDIR)-common/$(OODIR)/share/registry/evoab.xcd \
-		$(PKGDIR)-evolution/$(OODIR)/share/registry
 endif
 
 	find debian/tmp ! -perm -200 | xargs -r chmod u+w
@@ -2058,6 +2056,8 @@ endif
 ifeq "$(ENABLE_EVO2)" "y"
 	mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
 	mv $(PKGDIR)-gtk/$(OODIR)/program/libevoab*.so $(PKGDIR)-evolution/$(OODIR)/program
+	mv $(PKGDIR)-gnome/$(OODIR)/share/registry/evoab.xcd \
+		$(PKGDIR)-evolution/$(OODIR)/share/registry
 	# FIXME: When the rdb is correctly generated, move here, too.
 endif
 

-- 
LibreOffice packaging repository


Reply to: