The following commit has been merged in the debian-experimental-3.5 branch:
commit b0f73f10b82b51a56b4c630f32217b62ddb6da07
Author: Rene Engelhard <[email protected]>
Date: Mon Oct 24 18:50:02 2011 +0000
use make distro-pack-install
diff --git a/changelog b/changelog
index 49ec1d7..5702a25 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~alpha0~git20111021-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~alpha0~git20111024-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/rules b/rules
index 9e9c108..8711431 100755
--- a/rules
+++ b/rules
@@ -1698,12 +1698,7 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell
update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
DESTDIR=$(CURDIR)/debian/tmp \
- $(MAKE) install
- # FIXME: Move here so that we don't rely on libreoffice-build here.
- # Would also obsolete disable-ooinstall-in-package-ooo.diff
- cd $(OOO_BUILD_TREE)/bin; \
- export OODESTDIR=$(CURDIR)/debian/tmp; \
- ./package-ooo
+ $(MAKE) distro-pack-install
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
--
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]
