[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-1-4-g3d21b46
The following commit has been merged in the debian-experimental-4.1 branch:
commit 3d21b46d127c7c93096e6e7a839363385153df06
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 27 21:31:07 2013 +0200
javadoc-optional.diff: fix make install
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index f2dd810..3c4cdef 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -111,3 +111,21 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
if test "$SOLAR_JAVA" != ""; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
+--- a/scp2/source/sdkoo/sdkoo.scp-old 2013-05-27 21:26:53.967031270 +0200
++++ b/scp2/source/sdkoo/sdkoo.scp 2013-05-27 21:27:01.895031062 +0200
+@@ -177,6 +177,7 @@
+ End
+
+ #if defined(SOLAR_JAVA)
++#if defined(JAVADOC)
+ File gid_File_Package_odk_javadoc
+ TXT_FILE_BODY;
+ Dir = FILELIST_SDK_DIR;
+@@ -184,6 +185,7 @@
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+ End
+ #endif
++#endif
+
+ File gid_File_Package_odk_lib
+ TXT_FILE_BODY;
diff --git a/rules b/rules
index b1399eb..f8f312c 100755
--- a/rules
+++ b/rules
@@ -820,6 +820,8 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "gcj-jdk"
JAVA_HOME=/usr/lib/jvm/java-gcj
BUILD_DEPS += , gcj-jdk$(OOO_NO_JAVA_ARCHS)
+ DEBHELPER_OPTIONS += -Nlibreoffice-dev-doc
+ PACKAGE_SDK_DOCS = n
endif
ifeq "$(JDK)" "openjdk"
ifeq "$(JAVA_MAINVER)" "6"
@@ -3102,6 +3104,12 @@ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
dh_testdir
+ifneq ($(PACKAGE_SDK_DOCS),y)
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ echo "For uploads with binary-all packages, please use arches where the SDK docs are enabled!!!!"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+endif
+ dh_testdir
dh_testroot
for pkg in $(ARCH_INDEP_PACKAGES) ; do \
--
LibreOffice packaging repository
Reply to: