[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1_rc1-2-8-ga67975b
The following commit has been merged in the debian-experimental-3.6 branch:
commit 02119379bfcb9f6cf10d0eb0cab15c40fd7d04d8
Author: Rene Engelhard <rene@debian.org>
Date: Tue Aug 21 15:54:00 2012 +0200
update to rc2
diff --git a/changelog b/changelog
index 50ece9e..828449b 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,7 @@
-libreoffice (1:3.6.1~rc1-3) UNRELEASED; urgency=low
+libreoffice (1:3.6.1~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
- * debian/patches/fix-S390X-CPUNAME.diff: add, as name says
- * debian/patches/concat-deps-FreeBSD_kernel.diff: fix concat-deps.c for
- kFreeBSD...
* debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
make ENABLE_SYMBOLS=SMALL (-g1) working again..
diff --git a/patches/concat-deps-FreeBSD-kernel.diff b/patches/concat-deps-FreeBSD-kernel.diff
deleted file mode 100644
index bb0680b..0000000
--- a/patches/concat-deps-FreeBSD-kernel.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-From 410b6f01f07f8f1a84f2118c71735cdbb5331d5f Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@debian.org>
-Date: Mon, 20 Aug 2012 08:01:47 +0000
-Subject: concat-deps.c: add || defined (__FreeBSD_kernel__) for arch-specifics
-
-Change-Id: Ie321ada6d2c078881fdedc61d72c94034297fea3
----
-diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
-index 3770755..65fda1d 100644
---- a/solenv/bin/concat-deps.c
-+++ b/solenv/bin/concat-deps.c
-@@ -39,7 +39,7 @@
-
- #if defined(__linux) || defined(__OpenBSD__) || \
- defined(__FreeBSD__) || defined(__NetBSD__) || \
-- defined(__DragonFly__)
-+ defined(__DragonFly__) || defined(__FreeBSD_kernel__)
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- #define CORE_BIG_ENDIAN 0
- #define CORE_LITTLE_ENDIAN 1
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/fix-S390X-CPUNAME.diff b/patches/fix-S390X-CPUNAME.diff
deleted file mode 100644
index aba1521..0000000
--- a/patches/fix-S390X-CPUNAME.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8c482683edf6aee17d4718150158293461b88b3b Mon Sep 17 00:00:00 2001
-From: Michael Stahl <mstahl@redhat.com>
-Date: Mon, 20 Aug 2012 10:41:08 +0000
-Subject: configure: fix S390X CPUNAME:
-
-The value was changed to S390x, presumably by accident, breaking the
-build (regression from 480b32d3809830002ecc28508d40af3ecd4ad272).
-
-Change-Id: Icca90818c6363855437a273714a8317becdfd0e5
----
-diff --git a/configure.in b/configure.in
-index c47a5fe..6f8d115 100644
---- a/configure.in
-+++ b/configure.in
-@@ -3459,7 +3459,7 @@ linux-gnu*)
- ;;
- s390x)
- CPU=3
-- CPUNAME=S390x
-+ CPUNAME=S390X
- RTL_ARCH=S390x
- LIB64="lib64"
- OUTPATH=unxlngs390x
---
-cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 9031ca3..9c8d497 100644
--- a/patches/series
+++ b/patches/series
@@ -26,5 +26,3 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
-fix-S390X-CPUNAME.diff
-concat-deps-FreeBSD-kernel.diff
diff --git a/rules b/rules
index 5e57a1d..ac0f3be 100755
--- a/rules
+++ b/rules
@@ -69,9 +69,9 @@ USE_SOURCE_TARBALLS=y
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.6.1.1
+lo_sources_ver=3.6.1.2
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.1.1 libreoffice-3.6.1.1
+# use ./g checkout -b tag-libreoffice-3.6.1.2 libreoffice-3.6.1.2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=libreoffice-3-6-1
endif
--
LibreOffice packaging repository
Reply to: