The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit b46c0cf5f869fce84cee8b48e98e418d35f57047
Author: Bjoern Michaelsen <[email protected]>
Date: Sat Jul 14 18:52:01 2012 +0200
Revert "split build into build-{arch,indep}"
This reverts commit 78c2f91bd0ba744ddacb908457a18ca6537c8017.
Conflicts:
rules
diff --git a/changelog b/changelog
index 19a59d6..a4d9395 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,8 @@
-libreoffice (1:3.6.0~rc1-0ubuntu1~ppa1) quantal; urgency=low
+libreoffice (1:3.6.0~rc1-0ubuntu1~ppa3) quantal; urgency=low
* new upstream rc
* switch to libservlet 3.0 API (LP: #1023405)
+ * revert 78c2f91bd0ba744ddacb908457a18ca6537c8017
-- Bjoern Michaelsen <[email protected]> Thu, 12 Jul 2012
12:05:56 +0200
@@ -71,7 +72,6 @@ libreoffice (1:3.6.0~beta1-1) UNRELEASED; urgency=low
- add ENABLE_HELP conditional now that we have --without-help; also
add the new --disable-extensions and --disable-database-connectivity to
their respective places
- - split build into build-{arch,indep}
* debian/uno-libs3.symbols: update
[Björn Michaelsen]
diff --git a/control b/control
index f926087..24ff173 100644
--- a/control
+++ b/control
@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Ubuntu Core Developers <[email protected]>
XSBC-Original-Maintainer: Debian LibreOffice Maintainers
<[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips
mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc],
libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-
dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12),
gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [ia64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686
[i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>=
1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev,
libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0),
libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev (>= 0.2.1),
liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libgtk2.0-dev (>= 2.10), libgtk-3-dev (
>= 3.2~), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java
>(>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
>5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>=
>0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev
>(>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev,
>gettext, make (>= 3.81-8.2), libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>=
1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64
!kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java
(>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64
!kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64
!kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh
(>= 2.0b4), fontf
orge
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, gcc-4.4 [mips mipsel], g++-4.4 [mips
mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], doxygen, libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc],
libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils,
libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev,
libxrender-dev, libpng-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-
dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12),
gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [ia64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686
[i386 amd64], libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java,
libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64
!kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa
!kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libformula-java
(>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>=
1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa
!kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9),
libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>=
1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38),
libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev,
libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0),
libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev (>= 0.2.1),
liblcms2-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, libpq-dev (>=
9.0~), libxrandr-dev, libhsqldb-
java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1),
lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0),
libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0),
libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2), libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26)
[kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2
(= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2),
graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1)
[hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386
kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6
(= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64
!kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386
!kfreebsd-amd64], base-files (= 7.0), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
diff --git a/rules b/rules
index f5ab292..9045b23 100755
--- a/rules
+++ b/rules
@@ -863,14 +863,14 @@ export JAVA_HOME
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS),
libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS),
libcommons-lang-java$(OOO_NO_JAVA_ARCHS),
libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java,
libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
- BUILD_DEPS_INDEP += $(MEDIAWIKI_BUILD_DEPS)
+ BUILD_DEPS += $(MEDIAWIKI_BUILD_DEPS)
CONFIGURE_FLAGS +=
--with-commons-codec-jar=/usr/share/java/commons-codec.jar
--with-commons-lang-jar=/usr/share/java/commons-lang.jar
--with-commons-httpclient-jar=/usr/share/java/commons-httpclient.jar
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
CONFIGURE_FLAGS += --with-system-servlet-api
ifeq ($(FORCE_LIBSERVLET3),y)
- BUILD_DEPS_INDEP += (>= 1.1.1-9), libservlet3.0-java
+ BUILD_DEPS += (>= 1.1.1-9), libservlet3.0-java
CONFIGURE_FLAGS +=
--with-servlet-api-jar=/usr/share/java/servlet-api-3.0.jar
else
- BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }')
+ BUILD_DEPS += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java |
grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
endif
@@ -880,14 +880,14 @@ export JAVA_HOME
ifneq (,$(filter jfreereport, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += ,
libbase-java$(OOO_NO_REPORTDESIGN_ARCHS),
libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java (>=
1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java (>=
1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java (>=
0.9.4)$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java (>=
0.2.10)$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java (>=
1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java (>=
1.1.7)$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java (>=
1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libfonts-java (>=
1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libserializer-java (>=
1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS)
REPORT_BUILDER_JAR_DEPENDS := , libbase-java, libsac-java, libxml-java
(>= 1.1.6), libflute-java (>= 1.1.6), libpentaho-reporting-flow-engine-java (>=
0.9.4), liblayout-java (>= 0.2.10), libloader-java (>= 1.1.6), libformula-java
(>= 1.1.7), librepository-java (>= 1.1.6), libfonts-java (>= 1.1.6),
libserializer-java (>= 1.1.6)
- BUILD_DEPS_INDEP += $(REPORT_BUILDER_BUILD_DEPS)
+ BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar
--with-libxml-jar=/usr/share/java/libxml.jar
--with-flute-jar=/usr/share/java/flute.jar
--with-jfreereport-jar=/usr/share/java/flow-engine.jar
--with-liblayout-jar=/usr/share/java/liblayout.jar
--with-libloader-jar=/usr/share/java/libloader.jar
--with-libformula-jar=/usr/share/java/libformula.jar
--with-librepository-jar=/usr/share/java/librepository.jar
--with-libfonts-jar=/usr/share/java/libfonts.jar
--with-libserializer-jar=/usr/share/java/libserializer.jar
endif
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += ,
libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
REPORT_BUILDER_JAR_DEPENDS += , libcommons-logging-java
CONFIGURE_FLAGS +=
--with-commons-logging-jar=/usr/share/java/commons-logging.jar
- BUILD_DEPS_INDEP += (>= 1.1.1-9), $(shell dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }')
+ BUILD_DEPS += (>= 1.1.1-9), $(shell dpkg -s libcommons-logging-java |
grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk '{ print $$1 }')
CONFIGURE_FLAGS += --with-servlet-api-jar=$(shell dpkg -L `dpkg -s
libcommons-logging-java | grep Suggests | cut -d"," -f5 | sed -e s/^\ // | awk
'{ print $$1 }'` | grep servlet-api.*\.jar$ | head -n 1)
endif
else
@@ -1111,7 +1111,7 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
- BUILD_DEPS_INDEP += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
+ BUILD_DEPS += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj [$(OOO_GCJ_ARCHS)]
endif
@@ -1568,6 +1568,10 @@ endif
.DELETE_ON_ERROR: debian/control
+build: build-arch build-indep
+build-arch: $(STAMP_DIR)/build
+build-indep: $(STAMP_DIR)/build
+
# All 'important' targets have 2 lines. The one that is run by
# dpkg-buildpackage or the user, and the one that does the actual work. This
# indirection is needed so that the 'stamp' files that signify when a rule is
@@ -1578,8 +1582,7 @@ endif
# so that the target will not be run again. Removing the file will make
# make run the target over.
-prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare:
+config.status:
dh_testdir
# Make sure needed scripts are executable
@@ -1605,25 +1608,17 @@ ifneq "$(PACKAGE_UNOWINREG_DLL)" "y"
fi
endif
endif
- touch $@
-
-build:
- $(CURDIR)/debian/rules build-arch
- $(CURDIR)/debian/rules build-indep
- touch $(STAMP_DIR)/$@
-
-build-arch: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/build-arch:
-#build-arch: ENABLE_HELP = n PACKAGE_SDK_DOCS = n ENABLE_MEDIAWIKI = n
ENABLE_REPORTDESIGN = n ENABLE_SCRIPT_PROVIDER_BSH = n
ENABLE_SCRIPT_PROVIDER_JS = n
- dh_testdir
-
# FIXME: Theoretically this should call ./configure instead of
# it exists but that causes the configure flags NOT to be hnoured
# somehow...
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS) \
- --without-help --without-doxygen --disable-ext-wiki-publisher \
- --disable-ext-report-builder --disable-ext-scripting-javascript
\
- --disable-ext-scripting-beanshell
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS)
+
+ touch $@
+
+build: $(STAMP_DIR)/build
+#$(STAMP_DIR)/build: config.status | src/fetch.log
+$(STAMP_DIR)/build: config.status
+ dh_testdir
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS=
gb_Deliver_HARDLINK=T
@@ -1646,21 +1641,6 @@ endif
touch $@
-build-indep: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch
$(STAMP_DIR)/build-indep
-$(STAMP_DIR)/build-indep:
- dh_testdir
-
- $(MAKE) scripting.clean
- $(MAKE) odk.clean
- $(MAKE) scp2.clean
- rm -f config.status autogen.lastrun
-
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS)
-
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d`
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS=
gb_Deliver_HARDLINK=T
-
- touch $@
-
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@ -1923,7 +1903,7 @@ $(STAMP_DIR)/maintscripts: $(wildcard
debian/shell-lib*.sh) $(wildcard debian/*.
# Install files generated by setup into package directories
langpacks: $(STAMP_DIR)/langpacks
-$(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install
$(STAMP_DIR)/install-indep $(SOURCE_TREE)/bin/lo-xlate-lang
+$(STAMP_DIR)/langpacks: $(STAMP_DIR)/install $(STAMP_DIR)/install-indep
$(SOURCE_TREE)/bin/lo-xlate-lang
# remove empty uno_packages dirs somehow in the langpacks(?)
for iso in `echo $(LANGPACKISOS) | tr A-Z a-z`; do \
@@ -2429,7 +2409,7 @@ install-indep: $(STAMP_DIR)/install-indep
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).install
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER)-mimelnk.install
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).dirs
-$(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install
+$(STAMP_DIR)/install-indep: $(STAMP_DIR)/install
dh_testdir
dh_testroot
@@ -2787,7 +2767,7 @@ endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/build-arch $(STAMP_DIR)/install-arch
debian/control $(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control
$(STAMP_DIR)/maintscripts
dh_testdir
dh_testroot
@@ -3185,8 +3165,8 @@ endif
.PHONY: control
-.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default
-.PHONY: prepare build build-indep build-arch install-arch install-indep
+.PHONY: clean-debdir clean-instsetoo clean-objectdirs clean default configure
+.PHONY: build build-indep build-arch install-arch install-indep
.PHONY: get-orig-source unpack patched
.PHONY: $(stampdir_targets)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
