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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc3-1-159-g35707e2



The following commit has been merged in the debian-experimental-4.0 branch:
commit 35707e20291f1ae8fb98e214baee313be3d5697a
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Dec 4 19:16:04 2012 +0100

    libreoffice-4-0 branch, close #595708

diff --git a/changelog b/changelog
index 458f34f..b56b304 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
-libreoffice (1:4.0.0~alpha1+git20121130-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~beta1~git20121204-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
     - contains new driver for mozab (mork). Automatically enabled thus
       this closes: #321099
+    - now has a basic(!) gnumeric import in experimental mode
+      (closes: #595708)
 
   * debian/control.in:
     - make -impress suggest bluez (for impress remote control)
@@ -25,7 +27,7 @@ libreoffice (1:4.0.0~alpha1+git20121130-1) UNRELEASED; urgency=low
   * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
     is gone. yay.
 
- -- Rene Engelhard <rene@debian.org>  Tue, 20 Nov 2012 14:16:33 +0100
+ -- Rene Engelhard <rene@debian.org>  Tue, 04 Dec 2012 18:59:38 +0100
 
 libreoffice (1:3.6.4~rc3-1) experimental; urgency=low
 
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index 2eaf66f..2c890fb 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -37,9 +37,9 @@ diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
 index 74d0f32..daa4ae0 100755
 --- a/solenv/bin/build.pl
 +++ b/solenv/bin/build.pl
-@@ -1902,7 +1902,7 @@ sub run_job {
+@@ -1895,7 +1895,7 @@ sub run_job {
+         {
              return 1 if (! $path =~ /prj$/ );
-             mkpath("$workdir/Logs");
              my $gbuild_flags = '-j' . $ENV{PARALLELISM};
 -            my $gbuild_target = 'all slowcheck';
 +            my $gbuild_target = 'all';
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index f8be3d4..27e67fe 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -48,16 +48,16 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
 index e85ed83..1665642 100644
 --- a/solenv/gbuild/gbuild.mk
 +++ b/solenv/gbuild/gbuild.mk
-@@ -163,6 +163,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
+@@ -159,6 +159,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
  gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
  endif
  
 +gb__ENV_CXXFLAGS += $(HARDEN_CXXFLAGS)
 +gb__ENV_CFLAGS += $(HARDEN_CFLAGS)
 +
+ include $(GBUILDDIR)/ExternalExecutable.mk
  include $(GBUILDDIR)/Helper.mk
  include $(GBUILDDIR)/TargetLocations.mk
- include $(GBUILDDIR)/Tempfile.mk
 @@ -300,6 +303,8 @@ gb_GLOBALDEFS += \
  		HAVE_THREADSAFE_STATICS \
  	)
diff --git a/patches/disable-flaky-unoapi-tests.diff b/patches/disable-flaky-unoapi-tests.diff
index c1f7bc6..4fea62e 100644
--- a/patches/disable-flaky-unoapi-tests.diff
+++ b/patches/disable-flaky-unoapi-tests.diff
@@ -18,10 +18,13 @@
  # vim: set noet sw=4 ts=4:
 --- a/sc/qa/unoapi/sc.sce-old	2012-09-06 10:38:29.160466870 +0200
 +++ b/sc/qa/unoapi/sc.sce	2012-09-06 10:39:13.684687646 +0200
-@@ -19,18 +19,6 @@
- # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
- # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
- -o sc.AccessibleEditableTextPara_PreviewCell
+@@ -16,21 +16,6 @@
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+ # i84653 -o sc.ScPageObj
+-# i84554 -o sc.AccessibleEditableTextPara_PreviewNote
+-# i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
+--o sc.AccessibleEditableTextPara_PreviewCell
 --o sc.ScAccessibleCell
 -# i91044 -o sc.ScAccessibleCsvCell
 -# i91044 -o sc.ScAccessibleCsvGrid
@@ -34,6 +37,6 @@
 --o sc.ScAccessiblePreviewHeaderCell
 --o sc.ScAccessiblePreviewTable
 -# fdo#45337 -o sc.ScAccessibleSpreadsheet
- -o sc.ScAnnotationObj
- -o sc.ScAnnotationShapeObj
- -o sc.ScAnnotationsObj
+ # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
+ # -o sc.ScAnnotationObj
+ # -o sc.ScAnnotationShapeObj
diff --git a/rules b/rules
index 0377a7a..deabd66 100755
--- a/rules
+++ b/rules
@@ -74,7 +74,7 @@ lo_sources_ver=4.0.0.0.alpha1
 # NOT in proper libreoffice-3-6 branch
 # 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-2
+GIT_BRANCH=libreoffice-4-0
 endif
 ifeq "$(USE_SOURCE_TARBALLS)" "y"
 lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
diff --git a/uno-libs3.symbols b/uno-libs3.symbols
index 737004d..1b06fda 100644
--- a/uno-libs3.symbols
+++ b/uno-libs3.symbols
@@ -32,7 +32,7 @@ libuno_sal.so.3 uno-libs3 #MINVER#, ure
  *@UDK_3.11 1.8.0
  *@LIBO_UDK_3.5 3.5.0~beta
  *@LIBO_UDK_3.6 4.0.0~alpha
- *@LIBO_UDK_3.7 4.0.0~alpha
+ *@LIBO_UDK_4.0 4.0.0~alpha
 libuno_salhelpergcc3.so.3 uno-libs3 #MINVER#, ure
  *@UDK_3_0_0 1.4.0
  *@UDK_3.1 1.4.0

-- 
LibreOffice packaging repository


Reply to: