[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-101-gc1ab6d0
The following commit has been merged in the debian-experimental-3.5 branch:
commit ef4f696bab75199b5362e478263b3f345b0bca30
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Nov 22 21:32:45 2011 +0100
set CURDIR before first use and use safe method to set it
diff --git a/changelog b/changelog
index 80a4024..82ad7d1 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,6 @@
libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* new upstream snapshot
* use "core" sources, no libreoffice-build anymore.
@@ -22,7 +23,10 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
- -- Rene Engelhard <rene@debian.org> Mon, 21 Nov 2011 19:03:40 +0100
+ [ Bjoern Michaelsen ]
+ * set CURDIR before first use and use safe method to set it
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 22 Nov 2011 21:40:57 +0100
libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
diff --git a/rules b/rules
index b21a242..6dcd7ef 100755
--- a/rules
+++ b/rules
@@ -17,6 +17,7 @@
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
include /usr/share/dpkg/pkg-info.mk
+CURDIR ?= $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/..)
BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
BINARY_VERSION=$(DEB_VERSION)
HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
@@ -1165,7 +1166,6 @@ ifeq "$(PARALLEL_BUILD)" "y"
endif
endif
-CURDIR ?= $(shell pwd)
ifeq ($(GCC_VERSION),)
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:$$PATH
--
LibreOffice packaging repository
Reply to: