The following commit has been merged in the debian-experimental-3.7 branch:
commit faab62e0d5da9e6f47c1d03c3fd2c49d2e338f38
Author: Rene Engelhard <rene@debian.org>
Date: Sun Oct 21 22:34:00 2012 +0200
git update; update for configure.in -> configure.ac...
diff --git a/changelog b/changelog
index 9f9d8d3..e3c9624 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121015-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121021-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -13,7 +13,7 @@ libreoffice (1:3.7.0~alpha0~git20121015-1) UNRELEASED; urgency=low
- use gstreamer1.0
* debian/uno-libs3.symbols: update
- -- Rene Engelhard <rene@debian.org> Mon, 15 Oct 2012 14:43:23 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 21 Oct 2012 22:33:32 +0200
libreoffice (1:3.6.3~rc1-2) UNRELEASED; urgency=low
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 6484ce8..031498a 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,7 +1,7 @@
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.in
index 3257668..afd36de 100755
---- libreoffice-3.5.0/configure.in
-+++ libreoffice-3.5.0/configure.in
+--- libreoffice-3.5.0/configure.ac
++++ libreoffice-3.5.0/configure.ac
@@ -4078,8 +4078,13 @@ dnl whether to include debgugging information into final build.
dnl ===================================================================
AC_MSG_CHECKING([whether to include debugging information])
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index 5f1cc3a..7d8065f 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -1,5 +1,5 @@
---- a/configure.in-old 2012-03-02 21:48:47.000000000 +0000
-+++ b/configure.in 2012-03-02 21:51:29.000000000 +0000
+--- a/configure.ac-old 2012-03-02 21:48:47.000000000 +0000
++++ b/configure.ac 2012-03-02 21:51:29.000000000 +0000
@@ -9671,6 +9671,17 @@
fi
AC_SUBST(CDEFAULTOPT)
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index f8ed12e..5036d95 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -1,7 +1,7 @@
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.in
index c0b76f8..d10222f 100644
---- libreoffice-3.5.0/configure.in
-+++ libreoffice-3.5.0/configure.in
+--- libreoffice-3.5.0/configure.ac
++++ libreoffice-3.5.0/configure.ac
@@ -12203,6 +12217,13 @@ fi
AC_MSG_RESULT([$CHECK_PARALLELISM])
AC_SUBST(CHECK_PARALLELISM)
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index b4f295f..99d4efb 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -1,7 +1,7 @@
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.in
index d9d28ff..4fcbe7c 100644
---- libreoffice-3.5.0/configure.in
-+++ libreoffice-3.5.0/configure.in
+--- libreoffice-3.5.0/configure.ac
++++ libreoffice-3.5.0/configure.ac
@@ -7982,8 +7982,9 @@
# some systems need this. Like Ubuntu....
AC_CHECK_LIB(m, floor)
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index 9aa81ea..8d8a952 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -1,5 +1,5 @@
---- a/configure.in-old 2012-04-07 00:05:49.607740045 +0200
-+++ b/configure.in 2012-04-07 00:06:53.899999955 +0200
+--- a/configure.ac-old 2012-04-07 00:05:49.607740045 +0200
++++ b/configure.ac 2012-04-07 00:06:53.899999955 +0200
@@ -5135,7 +5135,8 @@
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
diff --git a/patches/gtk3-hack-explicit-gmodule.diff b/patches/gtk3-hack-explicit-gmodule.diff
index 8890a9d..599cf9d 100644
--- a/patches/gtk3-hack-explicit-gmodule.diff
+++ b/patches/gtk3-hack-explicit-gmodule.diff
@@ -10,8 +10,8 @@ For whatever reason we get undefined referenced to g_module_*.
-lX11 \
-lXext \
-lSM \
---- a/configure.in-old 2012-04-01 23:57:57.091193585 +0200
-+++ a/configure.in 2012-04-01 23:58:51.926693332 +0200
+--- a/configure.ac-old 2012-04-01 23:57:57.091193585 +0200
++++ a/configure.ac 2012-04-01 23:58:51.926693332 +0200
@@ -6996,10 +6996,13 @@
else
AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index 878a293..aa65752 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -1,7 +1,7 @@
--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -121,6 +121,7 @@ packimages\
- padmin\
+@@ -125,6 +125,7 @@ padmin\
+ postgresql\
psprint_config\
pyuno\
+py3uno\
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 4f88b04..72a7608 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -1,7 +1,7 @@
-diff --git a/configure.in b/configure.in
+diff --git a/configure.ac b/configure.in
index 6037452..2251d85 100644
---- libreoffice-3.5.0/configure.in
-+++ libreoffice-3.5.0/configure.in
+--- libreoffice-3.5.0/configure.ac
++++ libreoffice-3.5.0/configure.ac
@@ -7507,6 +7508,7 @@ AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript
if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
--
LibreOffice packaging repository