./packages/openofficeorg/3.2/unstable r1860: update get-ooo-build target
------------------------------------------------------------
revno: 1860
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2010-03-17 19:12:29 +0100
message:
update get-ooo-build target
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-03-17 16:59:18 +0000
+++ b/changelog 2010-03-17 18:12:29 +0000
@@ -19,8 +19,8 @@
"3.0 (quilt)" components. Use "normal" quilt for patching, add build-dep
- disable system-boost on lenny
- remove ant1.7 workaround, add build-conflicts against ant 1.8.0-{1,2,3}
- - update get-orig-source to create .orig-ooo-build-X.Y.z.tar.gz, too and
- remove obsolete vcsupdate target
+ - update get-ooo-build and get-orig-source tergets to create
+ .orig-ooo-build-X.Y.z.tar.gz, too and remove obsolete vcsupdate target
* debian/README.Debian-source: update for 3.2, mention new extra compnents
-- Rene Engelhard <rene@debian.org> Wed, 17 Mar 2010 17:57:47 +0100
=== modified file 'rules'
--- a/rules 2010-03-17 16:46:28 +0000
+++ b/rules 2010-03-17 18:12:29 +0000
@@ -3713,15 +3713,10 @@
# Get ooo-build
get-ooo-build:
- rm -rf ooo-build
- git clone git://anongit.freedesktop.org/git/$(OOO_BUILD_TREE)/ooo-build
-ifneq "$(OOO_BUILD_BRANCH)" ""
- cd ooo-build && \
- git checkout -b $(OOO_BUILD_BRANCH) origin/$(OOO_BUILD_BRANCH) && \
- git checkout $(OOO_BUILD_BRANCH) && \
- git branch -D master
-endif
- cd ooo-build && NOCONFIGURE=1 ./autogen.sh
+ rm -rf $(OOO_BUILD_TREE)
+ wget http://download.go-oo.org/$(MWS)/ooo-build-$(OOO_BUILD_VERSION).tar.gz && \
+ tar xfvz ooo-build-$(OOO_BUILD_VERSION).tar.gz && \
+ mv ooo-build-$(OOO_BUILD_VERSION) $(OOO_BUILD_TREE)
get-orig-source:
ifneq "$(WITH_SPLIT)" "y"
@@ -3813,9 +3808,7 @@
TMPD=`mktemp -d`; \
fi && \
cd $$TMPD && \
- wget http://download.go-oo.org/$(MWS)/ooo-build-$(OOO_BUILD_VERSION).tar.gz && \
- tar xfvz ooo-build-$(OOO_BUILD_VERSION).tar.gz && \
- mv ooo-build-$(OOO_BUILD_VERSION) $(OOO_BUILD_TREE) && \
+ $(CURDIR)/debian/rules get-ooo-build && \
tar cfvz openoffice.org_$(UPSTREAM_VERSION).orig-$(OOO_BUILD_TREE).tar.gz $(OOO_BUILD_TREE) && \
mv openoffice.org_$(UPSTREAM_VERSION).orig-$(OOO_BUILD_TREE).tar.gz $(CURDIR)/..
endif
Reply to: