------------------------------------------------------------
revno: 1858
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2010-03-17 17:46:28 +0100
message:
update get-orig-source to create .orig-ooo-build-X.Y.z.tar.gz, too and remove
obsolete vcsupdate target:q
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-03-16 23:20:04 +0000
+++ b/changelog 2010-03-17 16:46:28 +0000
@@ -19,8 +19,10 @@
"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
- -- Rene Engelhard <r...@debian.org> Wed, 17 Mar 2010 00:19:45 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 17 Mar 2010 17:43:38 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-03-16 00:05:57 +0000
+++ b/rules 2010-03-17 16:46:28 +0000
@@ -3805,17 +3805,26 @@
mv openoffice.org_$(UPSTREAM_VERSION).orig.tar.gz $(CURDIR)/..
&& \
rmdir $$TMPD
endif
+ifeq "$(DEBSRC_VERSION)" "3.0"
+ # get ooo-build
+ if test -n "$$TMP"; then \
+ TMPD=`mktemp -d -p $$TMP`; \
+ else \
+ 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) && \
+ 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
# Download the latest sources needed for ooo-build. Note that is
# might download more than actually needed here....
download: $(OOO_BUILD_TREE)/config.status
$(OOO_BUILD_TREE)/download
-# Update debian and ooo-build directories from version control
-vcsupdate:
- cd debian && bzr update
- cd ooo-build && git pull -r
-
.PHONY: control
.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
.PHONY: build build-indep build-arch install-arch install-indep
