[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta3-1-10-g73eb3a0
The following commit has been merged in the debian-experimental-3.5 branch:
commit 73eb3a02c07d1115222190bf51a60dc29bab16aa
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jan 20 10:37:52 2012 +0000
switch to .xz tarballs, upstream will only provide those...
diff --git a/changelog b/changelog
index 44ca63f..cb784c1 100644
--- a/changelog
+++ b/changelog
@@ -7,13 +7,14 @@ libreoffice (1:3.5.0~rc1-1) UNRELEASED; urgency=low
* debian/rules:
- fix Java stuff in SDK install (don't remove /usr/share/libreoffice/sdk)
- - work around smoketest failure; disable base for powerpc(spe)/ppc64 as
- for armel
+ - work around smoketest failure; disable base for powerpc(spe)/ppc64 as
+ for armel
+ - switch to .xz tarballs, upstream will only provide those...
* merge from ubuntu-precise-3.5:
- reenable junit tests
- -- Rene Engelhard <rene@debian.org> Thu, 19 Jan 2012 12:32:17 +0000
+ -- Rene Engelhard <rene@debian.org> Fri, 20 Jan 2012 10:19:36 +0000
libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
diff --git a/rules b/rules
index cd8d4ad..528d78e 100755
--- a/rules
+++ b/rules
@@ -3000,14 +3000,14 @@ TMPD=`mktemp -d $(if $(TMP),-p $(TMP))` && \
mkdir $${TMPD}/archive && \
git clone --bare $(GIT_BASEURL)/$(1) $${TMPD}/repo -b $(GIT_BRANCH) && \
git archive --remote $${TMPD}/repo --format=tar --prefix libreoffice-$(DEB_VERSION_UPSTREAM)/ $(GIT_TAG) |tar x -C $${TMPD}/archive && \
-tar cvjf $(2) -C $${TMPD}/archive/$(3) --transform 's,./,,' . && \
+tar cvJf $(2) -C $${TMPD}/archive/$(3) --transform 's,./,,' . && \
rm -rf $${TMPD}
endef
define unpack_gittarball
dh_testdir
mkdir -p $(CURDIR)/$(1)
-test -f $(CURDIR)/$(1)/.gitignore || tar xvjf $(2) -C $(CURDIR)/$(1) $(3)
+test -f $(CURDIR)/$(1)/.gitignore || tar xvJf $(2) -C $(CURDIR)/$(1) $(3)
endef
ifneq ($(filter get-orig-source unpack,$(MAKECMDGOALS)),)
@@ -3027,7 +3027,7 @@ $(call get_orig_tarball,-ext-sources): binfilter/no_localization dictionaries/en
mkdir -p $(TARFILE_LOCATION)
./autogen.sh
./download
- tar cvjf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
+ tar cvJf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
# using flag files for unpacking
.gitignore: $(call get_orig_tarball)
diff --git a/watch b/watch
index 75bbee2..6fe643c 100644
--- a/watch
+++ b/watch
@@ -1,3 +1,3 @@
version=3
-#opts=dversionmangle=s/\.dfsg\.\d+$// http://download.documentfoundation.org/libreoffice/src/(\d.\d.\d)/libreoffice-core-(\d.\d.\d).\d.tar.bz2
-opts=dversionmangle=s/\.dfsg\.\d+$// http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-(\d.\d.\d).\d.tar.bz2
+#opts=dversionmangle=s/\.dfsg\.\d+$// http://download.documentfoundation.org/libreoffice/src/(\d.\d.\d)/libreoffice-core-(\d.\d.\d).\d.tar.xz
+opts=dversionmangle=s/\.dfsg\.\d+$// http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-(\d.\d.\d).\d.tar.xz
--
LibreOffice packaging repository
Reply to: