------------------------------------------------------------
revno: 1440
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-03-23 16:04:57 +0100
message:
ooo-build-3-0-1 also should be only done in git...
modified:
changelog
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-03-22 23:10:37 +0000
+++ b/changelog 2009-03-23 15:04:57 +0000
@@ -2,7 +2,7 @@
[ Rene Engelhard ]
* ooo-build:
- - update (r15594)
+ - update, now in git *without* ChangeLog...
* debian/rules:
- fix saxon conditional. use internal saxon because system-saxon
breaks various filters....
=== modified file 'control.in'
--- a/control.in 2009-03-21 20:22:27 +0000
+++ b/control.in 2009-03-23 15:04:57 +0000
@@ -53,7 +53,7 @@
Standards-Version: 3.8.0
XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0.1/unstable
-Vcs-Svn: %OOO_BUILD_SVN%
+Vcs-Git: git://anongit.freedesktop.org/git/ooo-build/ooo-build
Homepage: http://www.go-oo.org
Package: openoffice.orgVER
=== modified file 'rules'
--- a/rules 2009-03-22 23:10:37 +0000
+++ b/rules 2009-03-23 15:04:57 +0000
@@ -55,7 +55,7 @@
# debhelper
export DH_OPTIONS
-export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr
+export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr:.git
#export DH_VERBOSE=1
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
@@ -67,11 +67,6 @@
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-0-1
-ifeq "" "$(OOO_BUILD_BRANCH)"
- OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/trunk
-else
-
OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/branches/$(OOO_BUILD_BRANCH)
-endif
SOURCE_TREE=ooo-build/build/$(TAG)
STAMP_DIR=debian/stampdir
@@ -2966,7 +2961,7 @@
fi; \
done; \
done
- dh_installchangelogs -s -Nlibmythes-dev ooo-build/ChangeLog
+ dh_installchangelogs -s -Nlibmythes-dev
ifeq "$(USE_SCSOLVER)" "y"
install -m644 $(SOURCE_TREE)/scsolver/ChangeLog \
$(PKGDIR)-calc/usr/share/doc/openoffice.org-calc/ChangeLog.scsolver
@@ -3192,7 +3187,7 @@
ln -sf openoffice.1.gz $$i.gz; \
fi; \
done
- dh_installchangelogs -i ooo-build/ChangeLog
+ dh_installchangelogs -i
dh_installmime -i
dh_lintian -i
dh_link -i
@@ -3267,7 +3262,13 @@
# Get ooo-build
get-ooo-build:
- svn co $(OOO_BUILD_SVN) ooo-build
+ git clone git://anongit.freedesktop.org/git/ooo-build/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
# FIXME: works for milestones *AND* for a --with-split build only...
@@ -3325,7 +3326,7 @@
# Update debian and ooo-build directories from version control
vcsupdate:
cd debian && bzr update
- cd ooo-build && svn up
+ cd ooo-build && git pull -r
.PHONY: control
.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
