[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-2-20-g6f5756e
The following commit has been merged in the debian-experimental-3.5 branch:
commit 6f5756e70a137764b7354a7c6e27342b0b92691c
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 1 21:58:37 2012 +0100
update to rc3
diff --git a/changelog b/changelog
index 47e765b..d58656a 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~rc3-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/patches/SwTblBoxFormula-destructor.diff: work around link error
on armel by specifying explicit SwTblBoxFormula destructor, thanks
@@ -11,7 +13,7 @@ libreoffice (1:3.5.0~rc2-3) UNRELEASED; urgency=low
check
- simplify -dbg/--enable-symbols conditionals
- -- Rene Engelhard <rene@debian.org> Tue, 31 Jan 2012 19:13:53 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 01 Feb 2012 19:17:30 +0000
libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
diff --git a/patches/fix-nsplugin-build-and-install.diff b/patches/fix-nsplugin-build-and-install.diff
deleted file mode 100644
index 737b8d5..0000000
--- a/patches/fix-nsplugin-build-and-install.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/extensions/source/nsplugin/source/makefile.mk-old 2012-01-25 09:00:55.000000000 +0000
-+++ b/extensions/source/nsplugin/source/makefile.mk 2012-01-25 09:01:04.000000000 +0000
-@@ -36,8 +36,6 @@
-
- .INCLUDE : settings.mk
-
--.IF "$(WITH_MOZILLA)" != "NO"
--
- .IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
- INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
- .ELSE
-@@ -160,8 +158,6 @@
- DEF2EXPORTFILE=exports_wnt.dxp
- .ENDIF
-
--.ENDIF # $(WITH_MOZILLA) != "NO"
--
- # --- Targets ----------------------------------
-
- .INCLUDE : target.mk
---- a/scp2/source/ooo/common_brand.scp-old 2012-01-25 09:14:08.000000000 +0000
-+++ b/scp2/source/ooo/common_brand.scp 2012-01-25 09:14:19.000000000 +0000
-@@ -642,7 +642,7 @@
- End
- #endif
-
--#if !defined WITHOUT_MOZILLA && defined ENABLE_NSPLUGIN
-+#if defined ENABLE_NSPLUGIN
- File gid_Brand_File_Lib_Npsoplugin
- BIN_FILE_BODY;
- Name = SPECIAL_NAME(npsoplugin);
---- a/scp2/source/ooo/file_ooo.scp-old 2012-01-25 09:12:06.000000000 +0000
-+++ b/scp2/source/ooo/file_ooo.scp 2012-01-25 09:12:58.000000000 +0000
-@@ -108,8 +108,6 @@
- Name = "basicsrvtutorials.zip";
- End
-
--#ifndef WITHOUT_MOZILLA
--
- #ifdef ENABLE_NSPLUGIN
- File gid_File_Exe_Nsplugin
- BIN_FILE_BODY;
-@@ -122,7 +120,6 @@
- #endif
- End
- #endif
--#endif
-
- File gid_File_Bin_Gengal
- BIN_FILE_BODY;
diff --git a/patches/make-gengal-work-again.diff b/patches/make-gengal-work-again.diff
index 3361f84..0437963 100644
--- a/patches/make-gengal-work-again.diff
+++ b/patches/make-gengal-work-again.diff
@@ -3,7 +3,7 @@ index 34ed8a9..c872244 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -124,6 +124,35 @@ End
- #endif
+ End
#endif
+File gid_File_Bin_Gengal
diff --git a/patches/series b/patches/series
index d15208d..e4ca8c9 100644
--- a/patches/series
+++ b/patches/series
@@ -26,6 +26,5 @@ add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
disable-sc-unoapi-subsequentcheck-for-now.diff
-fix-nsplugin-build-and-install.diff
SwTblBoxFormula-destructor.diff
ia64-oox-size.diff
diff --git a/rules b/rules
index 7592f7f..91cc31a 100755
--- a/rules
+++ b/rules
@@ -63,9 +63,9 @@ export QUILT_OPTIONS="-p1 -F0"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.0.2 libreoffice-3.5.0.2
-GIT_TAG=libreoffice-3.5.0.2
-GIT_BRANCH=tag-libreoffice-3.5.0.2
+# use ./g checkout -b tag-libreoffice-3.5.0.3 libreoffice-3.5.0.3
+GIT_TAG=libreoffice-3.5.0.3
+GIT_BRANCH=tag-libreoffice-3.5.0.3
SOURCE_TREE=.
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
--
LibreOffice packaging repository
Reply to: