./packages/openofficeorg/3.1/unstable r1560: + * debian/rules:
------------------------------------------------------------
revno: 1560
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-05-20 11:22:21 +0200
message:
+ * debian/rules:
+ - use gcj-jdk instead of java-gcj-compat-dev (closes: #526292)
+ * debian/control.in:
+ - make -evolution depend on libebook-1.2-9 (which is dlopen()ed)
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-05-20 09:52:41 +0000
+++ b/changelog 2009-05-20 09:22:21 +0000
@@ -1,3 +1,12 @@
+openoffice.org (1:3.1.0-4) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - use gcj-jdk instead of java-gcj-compat-dev (closes: #526292)
+ * debian/control.in:
+ - make -evolution depend on libebook-1.2-9 (which is dlopen()ed)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 19 May 2009 13:45:06 +0200
+
openoffice.org (1:3.1.0-3) unstable; urgency=low
* ooo-build:
=== modified file 'control'
--- a/control 2009-05-20 00:13:41 +0000
+++ b/control 2009-05-20 09:22:21 +0000
@@ -359,7 +359,7 @@
Package: openoffice.org-evolution
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Section: gnome
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base, ${shlibs:Depends}, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base, ${shlibs:Depends}, libebook-1.2-9, ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version})
Provides: openoffice.org2-evolution
=== modified file 'control.in'
--- a/control.in 2009-05-18 21:50:39 +0000
+++ b/control.in 2009-05-20 09:22:21 +0000
@@ -629,6 +629,7 @@
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base,
${shlibs:Depends},
+ libebook-1.2-9,
${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version})
=== modified file 'rules'
--- a/rules 2009-05-20 00:13:41 +0000
+++ b/rules 2009-05-20 09:22:21 +0000
@@ -103,10 +103,10 @@
ENABLE_JAVA=y
JDK=openjdk
ifeq "$(ARCH)" "ia64"
- JDK=java-gcj-compat
+ JDK=gcj-jdk
endif
ifneq (,$(findstring mips,$(ARCH)))
- JDK=java-gcj-compat
+ JDK=gcj-jdk
endif
ENABLE_MONO=y
MONO2=y
@@ -289,6 +289,12 @@
endif
CURL_SECTYPE=openssl
HSQLDB_MINVER= (>> 1.8.0.9)
+ifeq "$(ARCH)" "ia64"
+ JDK=java-gcj-compat-dev
+endif
+ifneq (,$(findstring mips,$(ARCH)))
+ JDK=java-gcj-compat-dev
+endif
endif
#############
@@ -598,6 +604,10 @@
BUILD_DEPS += , gcj-4.3 (>= 4.3.1-2) [armel]
endif
endif
+ ifeq "$(JDK)" "gcj-jdk"
+ JAVA_HOME=/usr/lib/jvm/java-gcj
+ BUILD_DEPS += , gcj-jdk [$(OOO_JAVA_ARCHS)]
+ endif
ifeq "$(JDK)" "openjdk"
BUILD_DEPS += , openjdk-6-jdk
JAVA_HOME=/usr/lib/jvm/java-6-openjdk
@@ -610,9 +620,10 @@
endif
ifeq "$(BUILD_JARS_NATIVE)" "y"
CONFIGURE_FLAGS += --enable-gcjaot
+ ifeq "$(LENNY_BACKPORT)" "y"
BUILD_DEPS += , gij [$(OOO_GCJ_ARCHS)], java-gcj-compat-dev (>= 1.0.76-7) [$(OOO_GCJ_ARCHS)], libgcj-bc [$(OOO_GCJ_ARCHS)]
- ifneq "$(LENNY_BACKPORT)" "y"
- BUILD_DEPS += , gcj [$(OOO_GCJ_ARCHS)]
+ else
+ BUILD_DEPS += gcj-jdk [$(OOO_GCJ_ARCHS)], , libgcj-common (>= 1:4.4.0) [$(OOO_GCJ_ARCHS)]
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
Reply to: