[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1-1-15-g0ccb92b
The following commit has been merged in the debian-experimental-3.6 branch:
commit dc7619b4cf2d3752023297d9e911928a36e33bd7
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 10 18:41:19 2012 +0200
update to 3.6.2 rc1
diff --git a/changelog b/changelog
index c9fbeb1..bdddcd7 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:3.6.1-2) UNRELEASED; urgency=low
+libreoffice (1:3.6.2~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/patches/disable-flaky-unoapi-tests.diff: disable flaky
toolkit and sc.ScAccessible* unoapi tests
diff --git a/patches/kfreebsd-add-missing-P_SEP.diff b/patches/kfreebsd-add-missing-P_SEP.diff
deleted file mode 100644
index f89dcb7..0000000
--- a/patches/kfreebsd-add-missing-P_SEP.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in-old 2012-08-23 22:22:17.023096695 +0200
-+++ b/configure.in 2012-08-23 22:22:48.827254399 +0200
-@@ -3126,6 +3126,8 @@
- GUIBASE=unx
- OS=LINUX
- RTL_OS=kFreeBSD
-+ P_SEP=:
-+
- case "$host_cpu" in
-
- i*86)
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index f94c379..3be434c 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -52,19 +52,6 @@ index b5bec12..920fc4e 100644
gid_File_Share_Registry_Draw_Xcd,
gid_File_Tmp_Userinstall_Draw_Inf);
End
-diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
-index 88a2926..beaaf0ab 100644
---- a/scp2/source/gnome/module_gnome.scp
-+++ b/scp2/source/gnome/module_gnome.scp
-@@ -62,7 +62,7 @@ Module gid_Module_Optional_Gnome
- gid_File_Lib_Gconfbe
- #endif
- #if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
-- gid_File_Share_Registry_Gnome_Xcd
-+ ,gid_File_Share_Registry_Gnome_Xcd
- #endif
- );
- End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index e3313c8..3f5e257 100644
--- a/scp2/source/impress/module_impress.scp
diff --git a/patches/series b/patches/series
index 0a54884..a62ebc9 100644
--- a/patches/series
+++ b/patches/series
@@ -26,5 +26,4 @@ pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
-kfreebsd-add-missing-P_SEP.diff
disable-flaky-unoapi-tests.diff
diff --git a/patches/split-binfilters-and-evo.diff b/patches/split-binfilters-and-evo.diff
index 6a6098b..9074287 100644
--- a/patches/split-binfilters-and-evo.diff
+++ b/patches/split-binfilters-and-evo.diff
@@ -124,14 +124,14 @@
#endif // #ifdef UNX
--- libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp-old 2011-12-20 05:15:16.000000000 +0100
+++ libreoffice-3.5.0/scp2/source/gnome/module_gnome.scp 2011-12-20 05:15:30.000000000 +0100
-@@ -42,6 +42,7 @@
- #endif
+@@ -43,6 +43,7 @@ Module gid_Module_Optional_Gnome
Files = (
+ #ifdef ENABLE_EVOAB2
gid_File_Lib_Evoab,
+ gid_File_Share_Registry_Evoab_Xcd,
+ #endif
+ #ifdef ENABLE_GTK
gid_File_Lib_Fps_Gnome,
- gid_File_Lib_Vclplug_Gtk,
- #ifdef ENABLE_GTK3
diff -u binfilter-old/file_binfilter.scp binfilter/file_binfilter.scp
--- libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-06 14:02:07.000000000 +0000
+++ libreoffice-3.5.0/scp2/source/binfilter/file_binfilter.scp 2011-12-20 10:16:46.000000000 +0000
diff --git a/rules b/rules
index 5e1f1ee..83ec514 100755
--- a/rules
+++ b/rules
@@ -69,11 +69,11 @@ 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.2
+lo_sources_ver=3.6.2.1
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.1.2 libreoffice-3.6.1.2
+# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-1
+GIT_BRANCH=libreoffice-3-6-2
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
LibreOffice packaging repository
Reply to: