The following commit has been merged in the debian-experimental-3.5 branch:
commit 7de7613df2d5969959f163fd50ed222bf88f50c8
Author: Rene Engelhard <[email protected]>
Date: Thu Oct 20 22:50:18 2011 +0200
adapt for brand/basis split undo for presets and program/resource
diff --git a/changelog b/changelog
index 18c58ad..5bcb5a8 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~git20111004-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~git20111019-1) UNRELEASED; urgency=low
* new upstream snapshot
@@ -20,7 +20,7 @@ libreoffice (1:3.5.0~git20111004-1) UNRELEASED; urgency=low
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
- -- Rene Engelhard <[email protected]> Tue, 04 Oct 2011 15:46:23 +0200
+ -- Rene Engelhard <[email protected]> Thu, 20 Oct 2011 22:49:15 +0200
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/rules b/rules
index 31bc390..dab2f03 100755
--- a/rules
+++ b/rules
@@ -1950,9 +1950,9 @@ endif
rm ure-link && ln -sf /$(OOUREDIR) ure-link
ifeq "$(ENABLE_EVO2)" "y"
- mkdir -p $(PKGDIR)-evolution/$(OODIR)/presets/database
- mv $(PKGDIR)-common/$(OODIR)/presets/database/evolocal.odb \
- $(PKGDIR)-evolution/$(OODIR)/presets/database
+ mkdir -p $(PKGDIR)-evolution/$(OOBRANDDIR)/presets/database
+ mv $(PKGDIR)-common/$(OOBRANDDIR)/presets/database/evolocal.odb \
+ $(PKGDIR)-evolution/$(OOBRANDDIR)/presets/database
endif
find debian/tmp ! -perm -200 | xargs -r chmod u+w
@@ -2588,7 +2588,7 @@ endif
# remove empty resource directories
for i in draw base writer impress calc math; do \
- rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
+ rm -rf $(PKGDIR)-$$i/$(OOBRANDDIR)/program/resource; \
done
ifneq "$(ENABLE_REPORTDESIGN)" "y"
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
