[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta2-1-3-gdd1d8b3
The following commit has been merged in the debian-experimental-4.1 branch:
commit 62df3a654153d77f733d016c660acd5225be6e27
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jun 10 15:28:49 2013 +0200
revert back to using gcj on kfreebsd-*
diff --git a/changelog b/changelog
index 3e3257e..e1e0212 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.1.0~beta2-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - revert back to using gcj on kfreebsd-*, OpenJDK7 doesn't work (hangs) or
+ still isn't available... (kfreebsd-i386)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 10 Jun 2013 08:47:47 +0200
+
libreoffice (1:4.1.0~beta2-1) experimental; urgency=low
* debian/patches/show-the-startcenter.diff: as name says, remove
diff --git a/control b/control
index d4ea27a..3bb6c7c 100644
--- a/control
+++ b/control
@@ -17,8 +17,8 @@ Build-Depends: ant (>= 1.7.0),
fastjar,
flex | flex-old,
g++-mingw-w64-i686 [i386 amd64],
- gcj-jdk [hppa],
- gcj-native-helper [hppa],
+ gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
+ gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
gettext,
gperf,
@@ -42,7 +42,7 @@ Build-Depends: ant (>= 1.7.0),
libexttextcat-dev (>= 3.1.1),
libfontconfig1-dev,
libfreetype6-dev,
- libgcj-common (>= 1:4.4.1) [hppa],
+ libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386],
libgconf2-dev,
libgl1-mesa-dev [!armel !mips !mipsel],
libglib2.0-dev (>= 2.15.0),
@@ -106,7 +106,7 @@ Build-Depends: ant (>= 1.7.0),
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
- openjdk-7-jdk [amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc powerpcspe ppc64 s390 s390x sparc],
+ openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc],
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
@@ -124,26 +124,26 @@ Build-Depends-Indep: bsh (>= 2.0b4),
fdupes,
fontforge,
imagemagick,
- libbase-java [!hppa],
+ libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
libcommons-logging-java (>= 1.1.1-9),
- libflute-java (>= 1.1.6) [!hppa],
- libfonts-java (>= 1.1.6) [!hppa],
- libformula-java (>= 1.1.7) [!hppa],
- liblayout-java (>= 0.2.10) [!hppa],
- libloader-java (>= 1.1.6) [!hppa],
- libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa],
- librepository-java (>= 1.1.6) [!hppa],
- libsac-java [!hppa],
- libserializer-java (>= 1.1.6) [!hppa],
+ libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386],
+ libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libservlet3.0-java,
- libxml-java (>= 1.1.6) [!hppa],
+ libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa],
- ant (= 1.8.0-2) [hppa],
- ant (= 1.8.0-3) [hppa],
+Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+ ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64],
+ ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64],
flex (= 2.5.34-1) [amd64],
g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-4.6 (= 4.6.1-10),
@@ -169,7 +169,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -182,7 +182,7 @@ Depends: fonts-sil-gentium-basic,
libreoffice-draw,
libreoffice-impress,
libreoffice-math,
- libreoffice-report-builder-bin [!hppa],
+ libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386],
libreoffice-writer,
${dejavu-depends},
${java-common-depends},
@@ -4186,7 +4186,7 @@ Description: LibreOffice component for building database reports
Package: libreoffice-report-builder-bin
Section: misc
-Architecture: amd64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Architecture: amd64 armel armhf i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Depends: libreoffice-base, libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Description: LibreOffice component for building database reports -- libraries
LibreOffice is a full-featured office productivity suite that provides
diff --git a/rules b/rules
index 6bf376a..ccd84cc 100755
--- a/rules
+++ b/rules
@@ -154,7 +154,7 @@ ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
JAVA_MAINVER=7
- ifneq (,$(filter hppa, $(DEB_HOST_ARCH)))
+ ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
endif
endif
@@ -450,7 +450,7 @@ $(eval $(call gen_no_archs,OOO_JAVA_ARCHS))
OOO_GCJ_ARCHS = $(filter-out $(OOO_OPENJDK_ARCHS), $(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_GCJ_ARCHS))
-OOO_GCJ_JDK_ARCHS := hppa
+OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i386 kfreebsd-amd64
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
--
LibreOffice packaging repository
Reply to: