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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-25-g61fb3ac

The following commit has been merged in the debian-experimental-4.1 branch:
commit 2c1c836b0722b5aad0cabf2a860afcf96b53f7df
Merge: 3232f332f77e89a7cafdf46c2a50545a952b36ac 724dbe2b6131a174056a0da51863a535efb9322f
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Mar 6 02:27:41 2013 +0100

    Merge remote-tracking branch 'origin/debian-experimental-4.0' into debian-experimental-4.1

diff --combined rules
index 2ec98d4,d1656a6..84fb215
--- a/rules
+++ b/rules
@@@ -21,9 -21,9 +21,9 @@@ CURDIR ?= $(realpath $(dir $(firstword 
  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 [~] [\\-])
 -HELP_L10N_VIRTUAL_VERSION:=4.0
 +HELP_L10N_VIRTUAL_VERSION:=4.1
  #VER:=4
 -OOVER:=4.0
 +OOVER:=4.1
  NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
  
  ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -118,7 -118,7 +118,7 @@@ ifeq "$(ENABLE_PYTHON2)" "y
    endif
  endif
  PACKAGE_TTF_OPENSYMBOL=y
 -BUILD_ONLY_EN_US=n
 +BUILD_ONLY_EN_US=y
  ENABLE_JAVA=y
  ifeq "$(ENABLE_JAVA)" "y"
    JDK=default
@@@ -229,6 -229,7 +229,6 @@@ ifeq "$(ENABLE_JUNIT4)" "y
  endif
  USE_LIBCURL4=y
  CURL_SECTYPE=gnutls
 -USE_SYSTEM_DMAKE=y
  USE_LIBSUITESPARSE=y
  SUITESPARSE_MIN_VERSION= (>= 1:3.4.0)
  PARALLEL_BUILD=y
@@@ -316,7 -317,7 +316,7 @@@ PACKAGE_UNOWINREG_DLL=
  ifeq "$(DEB_VENDOR)" "Debian"
  BUILD_UNOWINREG_DLL=y
  endif
- FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+ FAKEROOT_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot
  # upstream says: "it's 'highly experimental'", I wouldn't enable it for
  # distros"
  ENABLE_TELEPATHY=n
@@@ -592,7 -593,7 +592,7 @@@ endi
  
  ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
  	BUILD_DEPS += , libssl-dev
- 	DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libssl.so | cut -d"." -f3,4,5)-dbg
+ 	DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
  endif
  
  ifeq "$(BUILD_DBG_PACKAGE)" "y"
@@@ -785,7 -786,7 +785,7 @@@ ifeq "$(ENABLE_JAVA)" "y
  	BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
    endif
  	GCJ_VERSION = $(shell basename `readlink $(JAVA_HOME)/bin/gcj` | sed -e s/gcj-//)
- 	GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
+ 	GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
  	DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
  	JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
  #  ifneq (,$(GCJ_JAWT_DEPENDS))
@@@ -852,7 -853,7 +852,7 @@@ export JAVA_HOM
  	BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
  else
  	CONFIGURE_FLAGS += --without-java
 -	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean -Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev -Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh -Nlibreoffice$(VER)-script-provider-js
 +	DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean -Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh -Nlibreoffice$(VER)-script-provider-js
  endif
  
  ifneq (,$(filter nss, $(SYSTEM_STUFF)))
@@@ -867,6 -868,9 +867,6 @@@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(
  	CONFIGURE_FLAGS += --disable-nsplugin
  endif
  
 -ifeq "$(USE_SYSTEM_DMAKE)" "y"
 -	BUILD_DEPS += , dmake (>= 1:4.11)
 -endif
  ifeq "$(USE_UCPP)" "y"
    ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
  	IDLC_CPP_DEPENDS := ucpp
@@@ -1619,11 -1623,11 +1619,11 @@@ $(STAMP_DIR)/build-arch
  	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
  	PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
  	./autogen.sh $(CONFIGURE_FLAGS) \
 -		--without-help --without-doxygen --disable-ext-wiki-publisher \
 +		--without-doxygen --disable-ext-wiki-publisher \
  		--disable-ext-report-builder --disable-scripting-javascript \
  		--disable-scripting-beanshell
  
 -	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
 +	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
  
  ifneq "$(WHEEZY_BACKPORT)" "y"
    ifeq "$(ENABLE_PYTHON)" "y"
@@@ -1644,7 -1648,7 +1644,7 @@@ ifneq "$(BUILD_ISOS)" "en-US
  	$(MAKE) sdext.clean
  	$(MAKE) mysqlc.clean
  	make cmd cmd="cd sdext; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
 -	make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; ../solenv/bin/build.pl && ../solenv/bin/deliver.pl"
 +	make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
  endif
  
  	touch $@
@@@ -1662,9 -1666,9 +1662,9 @@@ $(STAMP_DIR)/build-indep
  	$(MAKE) reportbuilder.clean
  	rm -f config.status autogen.lastrun
  
 -	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
 +	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
  
 -	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
 +	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
  
  	touch $@
  
@@@ -1729,7 -1733,9 +1729,7 @@@ ifeq "$(BUILD_DBG_PACKAGE)" "y
  endif
  
  	# FIXME
 -	if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \
 -		cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \
 -	fi
 +	cd $(CURDIR)/debian/tmp/pkg && rm -rf \*
  	
  	# prepare install/dir files for dh
  	for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -2363,6 -2369,18 +2363,6 @@@ ifeq "$(ENABLE_JAVA)" "y
    endif
  endif
  
 -ifeq "$(PACKAGE_SDK)" "y"
 -  ifeq "$(ENABLE_JAVA)" "y"
 -	# install the UNO Java sources for e.g. eclipse
 -	mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
 -	cd $(SOURCE_TREE)/solver/$(shell .  $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/pck && \
 -		for i in juh jurt jut ridl unoloader; do \
 -			cp $${i}_src.zip \
 -			  $(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
 -		done
 -  endif
 -endif
 -
  ifeq "$(ENABLE_JAVA)" "y"
  	# hrmpf, again something like that, we really need to find the root cause for that
  	ln -s libjava_uno.so \
@@@ -2515,6 -2533,22 +2515,6 @@@ ifeq "$(ENABLE_JAVA)" "y
  			case "`basename $$i`" in aportisdoc.jar|pexcel.jar|pocketword.jar) continue ;; \
  			*) ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-java-common,,'` `basename $$i` ;; esac; \
  	done
 -
 -	# move into extra package
 -	rm -rf $(PKGDIR)-filter-mobiledev
 -	mkdir -p $(PKGDIR)-filter-mobiledev/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes
 -	mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes
 -	for i in aportisdoc pexcel pocketword; do \
 -	  mv $(PKGDIR)-java-common/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes/$$i.jar \
 -		$(PKGDIR)-filter-mobiledev/$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes; \
 -	  ln -s /$(shell echo $(OODIR) | sed -e s/lib/share/)/program/classes/$$i.jar \
 -		$(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes; \
 -	done
 -	for i in pocketexcel palm pocketword; do \
 -	  mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry && \
 -	  mv $(PKGDIR)-common/$(OODIR)/share/registry/$$i.xcd \
 -		$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry; \
 -	done
  endif
  
  	# fix permissions
@@@ -2972,7 -3006,7 +2972,7 @@@ endi
  ifeq "$(PACKAGE_BASE)" "y"
    ifeq "$(ENABLE_MYSQLNATIVE)" "y"
  	dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
 -		-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .  $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
 +		-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/source/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
    endif
  endif
  endif

-- 
LibreOffice packaging repository
Reply to: