[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/01: two more s/src/tarballs/ I forgot



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 380ffe6fa5d80f47a250de972ef2dab46c3db022
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Aug 24 18:30:00 2015 +0200

    two more s/src/tarballs/ I forgot
---
 changelog | 7 +++++++
 rules     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 8f7d48d..c3427f3 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.1~rc2-2) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - two more s/src/tarballs/ I forgot
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 24 Aug 2015 18:29:14 +0200
+
 libreoffice (1:5.0.1~rc2-1) unstable; urgency=medium
 
   * New upstream release candidate
diff --git a/rules b/rules
index 09aeff7..04f1d06 100755
--- a/rules
+++ b/rules
@@ -3482,7 +3482,7 @@ $(call get_orig_tarball,-tarballs): helpcontent2/makefile.pmk translations/makef
 	mkdir -p tarballs
 	./autogen.sh $(filter-out --disable-fetch-external,$(CONFIGURE_FLAGS)) --with-all-tarballs
 	$(MAKE) download gb_LO_VER=$(DEB_VERSION_UPSTREAM)
-	tar cvJf $@ -C src --transform 's,./,,' .
+	tar cvJf $@ -C tarballs --transform 's,./,,' .
 
 # using flag files for unpacking
 .gitignore: $(call get_orig_tarball)
@@ -3495,7 +3495,7 @@ helpcontent2/makefile.pmk:  $(call get_orig_tarball,-helpcontent2)
 	$(call unpack_gittarball,helpcontent2,$<,)
 
 tarballs/fetch.log: $(call get_orig_tarball,-tarballs) patched
-	$(call unpack_gittarball,src,$<,)
+	$(call unpack_gittarball,tarballs,$<,)
 
 get-orig-source: $(call get_orig_tarball,-tarballs) tarballs/fetch.log
 	dh_testdir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: