[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-26-gd990712
The following commit has been merged in the debian-experimental-3.5 branch:
commit dba0d056f3f94b55751aebec0b98f917df006de5
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 17 00:30:00 2012 +0000
ext-sources -> src
diff --git a/changelog b/changelog
index 7da20c3..15f453a 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
* debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
(+ testcase) from master
+ * debian/rules, debian/components: rename ext-sources to src, as done
+ upstream
* debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
lintian
* debian/rules:
diff --git a/rules b/rules
index bab5845..c81c2a4 100755
--- a/rules
+++ b/rules
@@ -68,7 +68,7 @@ GIT_TAG=libreoffice-3.5.1.1
GIT_BRANCH=tag-libreoffice-3.5.1.1
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
-TARFILE_LOCATION=$(CURDIR)/ext-sources
+TARFILE_LOCATION=$(CURDIR)/src
export TARFILE_LOCATION
USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
@@ -1571,7 +1571,7 @@ endif
touch $@
build: $(STAMP_DIR)/build
-#$(STAMP_DIR)/build: config.status | ext-sources/fetch.log
+#$(STAMP_DIR)/build: config.status | src/fetch.log
$(STAMP_DIR)/build: config.status
dh_testdir
@@ -3026,7 +3026,7 @@ ifeq "$(USE_GIT_TARBALLS)" "y"
# from build and download the source, configure, build, pack in on piece. As
# get-orig-source is an optional target anyway, we stick to support only this
# case and not random dirs. see also: debian bug 494141
-# also, we need to run configure to create the ext-sources tarball anyway
+# also, we need to run configure to create the src tarball anyway
GIT_INSTALLED:=$(shell which git >/dev/null 2>/dev/null && echo "y")
@@ -3060,7 +3060,7 @@ $(call get_orig_tarball,-%):
$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
# Get upstream external sources
-$(call get_orig_tarball,-ext-sources): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-sr): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
@@ -3084,13 +3084,13 @@ translations/makefile.mk: $(call get_orig_tarball,-translations)
helpcontent2/makefile.pmk: $(call get_orig_tarball,-helpcontent2)
$(call unpack_gittarball,helpcontent2,$<,)
-ext-sources/fetch.log: $(call get_orig_tarball,-ext-sources) patched
- $(call unpack_gittarball,ext-sources,$<,)
+src/fetch.log: $(call get_orig_tarball,-src) patched
+ $(call unpack_gittarball,src,$<,)
-get-orig-source: $(call get_orig_tarball,-ext-sources) ext-sources/fetch.log
+get-orig-source: $(call get_orig_tarball,-src) src/fetch.log
dh_testdir
-unpack: ext-sources/fetch.log
+unpack: src/fetch.log
dh_testdir
endif
endif
--
LibreOffice packaging repository
Reply to: