[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-149-g7769f6b
The following commit has been merged in the debian-experimental-4.0 branch:
commit 97e7a2b46f6ca09c0c303827af9f01058fc96d6a
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 25 14:11:52 2012 +0100
more get-orig-source fixes from Ubuntu
diff --git a/rules b/rules
index 04e4e4e..0a1caba 100755
--- a/rules
+++ b/rules
@@ -3089,17 +3089,17 @@ $(call get_orig_tarball):
$(call pack_gittarball,core,$@,)
$(call get_orig_tarball,-helpcontent2):
- $(call pack_gittarball,help,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/helpcontent2)
+ $(call pack_gittarball,help,$@,libreoffice-$(DEB_VERSION_UPSTREAM))
$(call get_orig_tarball,-%):
- $(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
+ $(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/)
# Get upstream external sources
$(call get_orig_tarball,-src): helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
- ./autogen.sh
+ ./autogen.sh $(patsubst --with-system-%,--without-system-%,$(CONFIGURE_FLAGS)) --with-system-mysql
./download
tar cvJf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
--
LibreOffice packaging repository
Reply to: