The following commit has been merged in the debian-experimental-4.0 branch:
commit b7fbbe5d6d27028ae2bff99e09dafe8260826dce
Author: Rene Engelhard <r...@debian.org>
Date: Sat Feb 16 18:34:26 2013 +0100
4.0.1 rc1
diff --git a/changelog b/changelog
index 9e6dfe2..af75de1 100644
--- a/changelog
+++ b/changelog
@@ -1,20 +1,19 @@
-libreoffice (1:4.0.0-2) UNRELEASED; urgency=low
+libreoffice (1:4.0.1~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+ - removes "Impress Remote" menu option unless in experimental mode.
+ (closes: #700728)
- * debian/patches/gendocu-no-notimestamp-with-gjdoc.diff: don't run
- with -notimestamp for javadoc if we use gjdoc (-> kfreebsd-*)
- * debian/patches/odk-link-to-jdk-1.5-docs.diff: link to
- http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
- doesn't exist anymore
* debian/patches/debian-hardened-buildflags.diff: only set CPPFLAGS here now
* debian/rules:
- use /usr/share/dpkg/buildflags.mk for C(XX)FLAGS, LDFLAGS now that LO
honours those from the env in configure. Remove manual passing to make.
- - conditionalize pyuno build/install more so that we can build only
python-uno
- on wheezy-backports. Bit obscure, but...
+ - conditionalize pyuno build/install more so that we can build only
+ python-uno on wheezy-backports. Bit obscure, but...
- explicitly use cpp-4.7 as cpp 4.8 would fail
- -- Rene Engelhard <r...@debian.org> Thu, 14 Feb 2013 22:07:36 +0100
+ -- Rene Engelhard <r...@debian.org> Tue, 19 Feb 2013 18:46:05 +0100
libreoffice (1:4.0.0-1) experimental; urgency=low
diff --git a/patches/gendocu-no-notimestamp-with-gjdoc.diff
b/patches/gendocu-no-notimestamp-with-gjdoc.diff
deleted file mode 100644
index 3e923e4..0000000
--- a/patches/gendocu-no-notimestamp-with-gjdoc.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/config_host.mk.in b/config_host.mk.in
-index d7ede5a..8a8f425 100644
---- a/config_host.mk.in
-+++ b/config_host.mk.in
-@@ -263,6 +263,7 @@ export JAVACISGCJ=@JAVACISGCJ@
- export JAVACISKAFFE=@JAVACISKAFFE@
- export JAVACOMPILER=@JAVACOMPILER@
- export JAVADOC=@JAVADOC@
-+export JAVADOCISGJDOC=@JAVADOCISGJDOC@
- @x_JAVALIB@ export JAVALIB=@JAVALIB@
- export JAVA_HOME=@JAVA_HOME@
- export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
-diff --git a/configure.ac b/configure.ac
-index 0cbc7e8..7930ad8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -5987,7 +5987,12 @@ if test "$SOLAR_JAVA" != ""; then
- JAVADOC=`cygpath -d "$JAVADOC"`
- JAVADOC=`cygpath -u "$JAVADOC"`
- fi
-+
-+ if test `$JAVADOC --version 2>&1 | $GREP -c "gjdoc"` -gt 0; then
-+ JAVADOCISGJDOC="yes"
-+ fi
- fi
-+AC_SUBST(JAVADOCISGJDOC)
-
- if test "$SOLAR_JAVA" != ""; then
- # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
-diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
-index 7345e72..6d3cc03 100644
---- a/odk/pack/gendocu/makefile.mk
-+++ b/odk/pack/gendocu/makefile.mk
-@@ -59,7 +59,10 @@ JAVA_BEAN_SRC_FILES=\
- $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
- $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
-
--JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime
Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath
$(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline
../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api
./java $(JAVA_PACKAGES)
-+JAVADOCPARAMS= -use -splitindex -windowtitle "Java UNO Runtime Reference"
-header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath $(JAVA_SRC_DIR)
-classpath $(SOLARBINDIR)$/ridl.jar -linkoffline ../../common/ref ./uno
-linkoffline http://java.sun.com/j2se/1.5/docs/api ./java $(JAVA_PACKAGES)
-+.IF "$(JAVADOCISGJDOC)" != "yes"
-+JAVADOCPARAMS+= -notimestamp
-+.ENDIF
-
- JAVADOCLOG = $(MISC)$/javadoc_log.txt
-
diff --git a/patches/odk-link-to-jdk-1.5-docs.diff
b/patches/odk-link-to-jdk-1.5-docs.diff
deleted file mode 100644
index c6e878b..0000000
--- a/patches/odk-link-to-jdk-1.5-docs.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/odk/pack/gendocu/makefile.mk-old 2013-02-13 18:40:38.002002626 +0100
-+++ b/odk/pack/gendocu/makefile.mk 2013-02-13 18:40:47.166002356 +0100
-@@ -59,7 +59,7 @@
- $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeConnection.java \
- $(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/OfficeWindow.java
-
--JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime
Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath
$(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline
../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.4.1/docs/api
./java $(JAVA_PACKAGES)
-+JAVADOCPARAMS= -notimestamp -use -splitindex -windowtitle "Java UNO Runtime
Reference" -header $(JAVADOCREFNAME) -d $(DESTDIRGENJAVAREF) -sourcepath
$(JAVA_SRC_DIR) -classpath $(SOLARBINDIR)$/ridl.jar -linkoffline
../../common/ref ./uno -linkoffline http://java.sun.com/j2se/1.5/docs/api
./java $(JAVA_PACKAGES)
-
- JAVADOCLOG = $(MISC)$/javadoc_log.txt
-
diff --git a/patches/sdremote-close-on-non-bluetooth.diff
b/patches/sdremote-close-on-non-bluetooth.diff
deleted file mode 100644
index e1e3fff..0000000
--- a/patches/sdremote-close-on-non-bluetooth.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -u b/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
---- b/sd/source/ui/dlg/RemoteDialog.cxx
-+++ b/sd/source/ui/dlg/RemoteDialog.cxx
-@@ -25,9 +25,12 @@
- mClientBox( this, NULL, SdResId( LB_SERVERS ) ),
- mPreviouslyDiscoverable()
- {
--#ifdef ENABLE_SDREMOTE
-+ (void) mPreviouslyDiscoverable; // avoid warnings about unused member
-+
- FreeResource();
-
-+#ifdef ENABLE_SDREMOTE
-+
- #ifdef ENABLE_SDREMOTE_BLUETOOTH
- mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable();
- if ( !mPreviouslyDiscoverable )
-@@ -43,13 +46,11 @@
- {
- mClientBox.addEntry( *aIt );
- }
-+#endif
-
- mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton
) );
- SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) );
- mButtonCancel.SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) );
--#else
-- (void) mPreviouslyDiscoverable; // avoid warnings about unused member
--#endif
- }
-
- RemoteDialog::~RemoteDialog()
-@@ -84,8 +85,8 @@
- {
- RemoteServer::setBluetoothDiscoverable( false );
- }
-- Close();
- #endif
-+ Close();
- return 0;
- }
-
diff --git a/patches/series b/patches/series
index 16a5e4a..ebe4ebf 100644
--- a/patches/series
+++ b/patches/series
@@ -26,7 +26,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
-sdremote-close-on-non-bluetooth.diff
-odk-link-to-jdk-1.5-docs.diff
-gendocu-no-notimestamp-with-gjdoc.diff
wheezy-backports-python.diff
diff --git a/rules b/rules
index fa82f5b..7a90750 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=4.0.0.3
+lo_sources_ver=4.0.1.1
# 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)-hotfixes1
-GIT_BRANCH=libreoffice-4-0-0
+GIT_BRANCH=libreoffice-4-0-1
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -279,7 +279,6 @@ SYSTEM_LIBRSVG=y
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with libreoffice2), we need to set this. Don't
touch
# otherwise
-SYSTEM_STUFF += stdlibs
DEFAULT_IMAGE=galaxy
IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
@@ -377,12 +376,6 @@ ifeq "$(ENABLE_OPENGL)" "y"
$(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
endif
-ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
- ifneq (stdlibs,$(findstring stdlibs,$(SYSTEM_STUFF)))
- $(error sal does not build on arm with internal stdlibs!)
- endif
-endif
-
OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
# Java...
@@ -1277,7 +1270,6 @@ clean-debdir:
find debian -name "*.links" -exec rm {} \;
if [ -d "$(STAMP_DIR)" ]; then rm -rf "$(STAMP_DIR)"; fi
- rm -f debian/shlibs.override.stdlibs
rm -f debian/*.bug-script
rm -f debian/scripts/aotcompile.py*
@@ -2926,9 +2918,6 @@ endif
ifeq (,$(filter icu, $(SYSTEM_STUFF)))
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
-ifeq (,$(filter stdlibs, $(SYSTEM_STUFF)))
- cat debian/shlibs.override.stdlibs >> debian/shlibs.local
-endif
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u7rox-000534...@vasks.debian.org
