[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-2-13-g3d5abd5
The following commit has been merged in the debian-experimental-4.2 branch:
commit 3d5abd561b0b9ece1337ebdf79200821d076691c
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jul 16 23:07:07 2013 +0200
git update; add conditionals for firebird
diff --git a/changelog b/changelog
index 7895b22..db33c98 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.2.0~alpha0~git20130708-1) UNRELEASED; urgency=low
+libreoffice (1:4.2.0~alpha0~git20130716-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/control b/control
index 2545817..d615ef7 100644
--- a/control
+++ b/control
@@ -15,6 +15,7 @@ Build-Depends: ant (>= 1.7.0),
debhelper (>= 7.2.3~),
dpkg-dev (>= 1.16.1),
fastjar,
+ firebird-dev,
flex | flex-old,
fonts-liberation,
g++-mingw-w64-i686 [i386 amd64],
@@ -168,11 +169,11 @@ Build-Conflicts: amd-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
XS-Python-Version: current
-XS-Python3-Version: 3.2
+XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4446,6 +4447,7 @@ Depends: ant (>= 1.7.0),
doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
+ firebird-dev,
flex | flex-old,
fontforge,
fonts-liberation,
diff --git a/patches/firebird-manual-variables.diff b/patches/firebird-manual-variables.diff
new file mode 100644
index 0000000..ca257e1
--- /dev/null
+++ b/patches/firebird-manual-variables.diff
@@ -0,0 +1,29 @@
+diff --git a/configure.ac b/configure.ac
+index 4ee8955..7ce4b94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8096,20 +8126,10 @@ if test "x$enable_firebird_sdbc" = "xyes"; then
+ if test "$with_system_firebird" = "yes"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_FIREBIRD=YES
+- AC_PATH_PROG(FIREBIRDCONFIG, [fb_config])
+- if test -z "$FIREBIRDCONFIG"; then
+- AC_MSG_NOTICE([No fb_config -- using pkg-config])
+- FIREBIRD_VERSION=`pkg-config --modversion fbembed`
+- AC_MSG_CHECKING([for Firebird Client library])
+- FIREBIRD_CFLAGS=`pkg-config --cflags fbembed`
+- FIREBIRD_LIBS=`pkg-config --libs fbembed`
+- else
+- AC_MSG_NOTICE([fb_config found])
+- FIREBIRD_VERSION=`$FIREBIRDCONFIG --version`
+- AC_MSG_CHECKING([for Firebird Client library])
+- FIREBIRD_CFLAGS=`$FIREBIRDCONFIG --cflags`
+- FIREBIRD_LIBS=`$FIREBIRDCONFIG --embedlibs`
+- fi
++ AC_MSG_CHECKING([for Firebird Client library])
++ FIREBIRD_CFLAGS=
++ FIREBIRD_LIBS="-L/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` -lfbembed"
++ FIREBIRD_VERSION=`dpkg -l firebird-dev | grep ^ii | awk '{ print $3 }' | cut -d. -f1,2,3`
+ AC_MSG_CHECKING([Firebird version])
+ FIREBIRD_MAJOR=`echo $FIREBIRD_VERSION | cut -d"." -f1`
+ FIREBIRD_MINOR=`echo $FIREBIRD_VERSION | cut -d"." -f2`
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 306f148..167dbbe 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -126,7 +126,7 @@ index 51089bb..3cffd92 100644
- flat \
file \
filterconfig \
- fpicker \
+ $(if $(filter $(ENABLE_FIREBIRD_SDBC),TRUE),firebird_sdbc) \
@@ -281,7 +299,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ira \
itg \
diff --git a/patches/series b/patches/series
index 0532a05..cc31a14 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ javadoc-optional.diff
show-the-startcenter.diff
hack-interlck_sparc.diff
opencl-multiarch.diff
+firebird-manual-variables.diff
diff --git a/rules b/rules
index 114c2cb..98ef714 100755
--- a/rules
+++ b/rules
@@ -375,6 +375,10 @@ endif
ENABLE_MERGELIBS=n
PACKAGE_LIBLIBREOFFICE=n
USE_OPENCL=y
+SYSTEM_STUFF += firebird
+ifeq (,$(filter firebird, $(SYSTEM_STUFF)))
+SYSTEM_STUFF += libatomic-ops
+endif
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@ -1112,6 +1116,13 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
endif
endif
+ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libatomic-ops-dev
+endif
+ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , firebird-dev
+endif
+
ifeq "$(BUILD_GTK)" "n"
CONFIGURE_FLAGS+= --disable-gtk
DEBHELPER_OPTIONS+= -Nlibreoffice-gtk -Nlibreoffice-gnome
--
LibreOffice packaging repository
Reply to: