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

./packages/openofficeorg/3.1/unstable r1638: use gcj-jdk/java-gcj-compat-dev on kfreebsd-*



------------------------------------------------------------
revno: 1638
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-08-17 02:52:50 +0200
message:
  use gcj-jdk/java-gcj-compat-dev on kfreebsd-*
modified:
  changelog
  rules
=== modified file 'changelog'
--- a/changelog	2009-08-17 00:47:08 +0000
+++ b/changelog	2009-08-17 00:52:50 +0000
@@ -8,13 +8,14 @@
     - remove result/ and test/ from OOos own copy of libxml2, too...
       (see #331534)
     - use gcc-mingw32 instead of mingw32 when we build with gcc 4.4
+    - use gcj-jdk/java-gcj-compat-dev on kfreebsd-*
   * debian/rules, debian/openoffice.org-filter-binfilter-*:
     Move libbf_migratefilter* back to -filter-binfilter as it's linked to
     libs there. Add the regcomp (un)registering.
   * debian/source.lintian-overrides:
     - remove, lintian is fixed to not complain about these anymore
 
- -- Rene Engelhard <rene@debian.org>  Mon, 17 Aug 2009 01:09:08 +0200
+ -- Rene Engelhard <rene@debian.org>  Mon, 17 Aug 2009 02:50:51 +0200
 
 openoffice.org (1:3.1.1~rc1-1) experimental; urgency=low
 

=== modified file 'rules'
--- a/rules	2009-08-17 00:47:08 +0000
+++ b/rules	2009-08-17 00:52:50 +0000
@@ -108,6 +108,9 @@
 ifneq (,$(findstring mips,$(ARCH)))
   JDK=gcj-jdk
 endif
+ifneq (,$(findstring kfreebsd,$(ARCH)))
+  JDK=gcj-jdk
+endif
 ENABLE_MONO=y
 MONO2=y
 ifeq "$(MONO2)" "y"
@@ -309,6 +312,9 @@
 ifneq (,$(findstring mips,$(ARCH)))
   JDK=java-gcj-compat-dev
 endif
+ifneq (,$(findstring kfreebsd,$(ARCH)))
+  JDK=java-gcj-compat-dev
+endif
 endif
 
 #############


Reply to: