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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-50-gd4fe274

The following commit has been merged in the debian-experimental-3.5 branch:
commit cb7fd52863c830b42e0cafdcaf3b3cb8dd9d66a0
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Mar 3 21:11:12 2012 +0000

    update nsplugin conditional to actually disable build-dep/use --disable-nsplugin

diff --git a/changelog b/changelog
index f20f954..017f837 100644
--- a/changelog
+++ b/changelog
@@ -34,8 +34,11 @@ libreoffice (1:3.5.1~rc1-1) UNRELEASED; urgency=low
     libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
   * debian/control.mozilla.in: stricten dependencies to 3.5, thanks
     Mario Holbe for the observation 
+  * debian/rules, debian/control.mozilla.in: update nsplugin conditional
+    to actually disable nsplugin build (and get rid of xulrunner-dev build-dep)
+    if disabled 
 
- -- Rene Engelhard <rene@debian.org>  Fri, 02 Mar 2012 20:46:23 +0100
+ -- Rene Engelhard <rene@debian.org>  Sat, 03 Mar 2012 21:08:09 +0000
 
 libreoffice (1:3.5.0-2) experimental; urgency=low
 
diff --git a/control b/control
index bd31ad9..030ddb0 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
 Priority: optional
 Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>
-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, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], 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, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-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), junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [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), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-jav
 a (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, 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), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), 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, libldap2-dev
+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, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], 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, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-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), junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [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), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-jav
 a (>= 0.9.4) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !armhf !hppa !powerpc !powerpcspe !ppc64 !s390x !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev [!s390x], 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), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], libpq-dev (>= 9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), 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, 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), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
 Standards-Version: 3.9.1
diff --git a/control.mozilla.in b/control.mozilla.in
index 02f3e8d..45a5375 100644
--- a/control.mozilla.in
+++ b/control.mozilla.in
@@ -1,6 +1,6 @@
 Package: mozilla-libreofficeVER
 Section: net
-Architecture: %OOO_NPSOPLUGIN_ARCHS%
+Architecture: %OOO_NSPLUGIN_ARCHS%
 Enhances: iceape-browser,
  iceweasel,
  mozilla-browser,
diff --git a/rules b/rules
index 977fef4..6c0ad78 100755
--- a/rules
+++ b/rules
@@ -247,7 +247,7 @@ ENABLE_GCONF=y
 ENABLE_GIO=y
 ENABLE_RANDR=y
 ifeq "$(BUILD_GTK)" "y"
-  PACKAGE_NPSOPLUGIN=y
+  PACKAGE_NSPLUGIN=y
 endif
 PACKAGE_BASE=y
 ENABLE_GRAPHITE=y
@@ -427,11 +427,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
 	BUILD_JARS_NATIVE=y
 endif
 
-ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
-OOO_NPSOPLUGIN_ARCHS = $(filter-out s390x,$(OOO_ARCHS))
+ifeq "$(PACKAGE_NSPLUGIN)" "y"
+OOO_NSPLUGIN_ARCHS = $(filter-out s390x,$(OOO_ARCHS))
 else
-OOO_NPSOPLUGIN_ARCHS=
+OOO_NSPLUGIN_ARCHS=
 endif
+$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
 
 # builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
 ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
@@ -855,11 +856,12 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
 	DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
 endif
 ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
-	BUILD_DEPS+= , xulrunner-dev
+	BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
 endif
 	CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
-ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NPSOPLUGIN_ARCHS)))
-	PACKAGE_NPSOPLUGIN=n
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NSPLUGIN_ARCHS)))
+	PACKAGE_NSPLUGIN=n
+	CONFIGURE_FLAGS += --disable-nsplugin
 endif
 
 ifeq "$(USE_SYSTEM_DMAKE)" "y"
@@ -1369,7 +1371,7 @@ ifeq "$(ENABLE_JAVA)" "y"
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.gcj.in
 endif
-ifneq "$(OOO_NPSOPLUGIN_ARCHS)" ""
+ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.mozilla.in
 endif
@@ -1442,7 +1444,7 @@ endif
 	perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control
 	perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
+	perl -pi -e "s,%OOO_NSPLUGIN_ARCHS%,$(OOO_NSPLUGIN_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_STLPORT_ARCHS%,$(OOO_STLPORT_ARCHS),g" debian/control
@@ -2064,7 +2066,7 @@ ifeq "$(ENABLE_EVO2)" "y"
 	# FIXME: When the rdb is correctly generated, move here, too.
 endif
 
-ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
+ifeq "$(PACKAGE_NSPLUGIN)" "y"
 	mkdir -p -m755 debian/mozilla-libreoffice$(VER)/$(OODIR)/program
 	for f in libnpsoplugin.so nsplugin; do \
 		mv $(PKGDIR)-core/$(OODIR)/program/$$f debian/mozilla-libreoffice$(VER)/$(OODIR)/program; \

-- 
LibreOffice packaging repository
Reply to: