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

Bug#620527: [ooo-build-extensions] A couple of comments about #629768 and #620527



Hello, I have been trying to make this package to build again, but it
seems that is too much updated (for me).

I guess that a new upstream release (if that is still possible),
should be the best solution to make it compatible with the current
libreoffice.

Here is what I did:

- debian/control I have updated the build dependencies, see the
  control.diff patch attached.

- debian/rules I have changed the path to the JAVA_HOME that is hard
  coded in this file, just to try to be able to build the package (not
  intended as a final solution for that problem), see the rules.diff
  patch.

- coooder/ant/build.properties One path was updated in this upstream
  file, please see the attached 03_Use_libreoffice-dev_in_build.dpatch
  patch.

I hope that this could be helpful to fix the bug, or to consider to
remove the package from the archive.

-- 
Josué M. Abarca S.
Vos mereces Software Libre.
PGP key 4096R/70D8FB2A 2009-06-17
Huella de clave = B3ED 4984 F65A 9AE0 6511  DAF4 756B EB4B 70D8 FB2A
--- ooext-ref/ooo-build-extensions-3.0.0.9+r14588/debian/control	2012-06-22 13:15:35.000000000 -0600
+++ ooext/ooo-build-extensions-3.0.0.9+r14588/debian/control	2012-06-22 11:08:27.246370522 -0600
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
 Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: debhelper (>= 7), ant, openoffice.org-dev (>= 1:3.0.0-3), php-geshi, php5-cli, dpatch, openoffice.org-java-common, openjdk-6-jdk
+Build-Depends: debhelper (>= 7), ant, libreoffice-dev (>= 1:3.4.0~), php-geshi, php5-cli, dpatch, libreoffice-java-common (>= 1:3.4.0~), openjdk-6-jdk
 Standards-Version: 3.7.3
 Homepage: http://go-oo.org
 
--- ooext-ref/ooo-build-extensions-3.0.0.9+r14588/debian/rules	2012-06-22 13:15:35.000000000 -0600
+++ ooext/ooo-build-extensions-3.0.0.9+r14588/debian/rules	2012-06-22 12:06:46.483722269 -0600
@@ -8,7 +8,8 @@
 
 include /usr/share/dpatch/dpatch.make
 
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+#export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+export JAVA_HOME=/usr
 
 configure: configure-stamp
 configure-stamp: patch-stamp
@@ -45,7 +46,7 @@
 	dh_testdir
 	dh_testroot
 	dh_prep -i
-	
+
 	install -D -m644 coooder/build/dist/COOoder.oxt \
 		debian/openoffice.org-coooder/usr/lib/openoffice/share/extension/install/COOoder.oxt
 
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_Use_libreoffice-dev_in_build.dpatch by Josue Abarca <jmaslibre@debian.org.gt>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' ooo-build-extensions-3.0.0.9+r14588~/coooder/ant/build.properties ooo-build-extensions-3.0.0.9+r14588/coooder/ant/build.properties
--- ooo-build-extensions-3.0.0.9+r14588~/coooder/ant/build.properties	2012-06-22 13:05:41.000000000 -0600
+++ ooo-build-extensions-3.0.0.9+r14588/coooder/ant/build.properties	2012-06-22 13:07:57.189924310 -0600
@@ -3,9 +3,9 @@
 #sdk.bin.dir=linux/bin
 
 # Configuration for OOo 3.0
-sdk.dir=/usr/lib/openoffice/basis-link/sdk
+sdk.dir= /usr/lib/libreoffice/sdk
 sdk.bin.dir=bin
 
 # Generic configuration
-office.install.dir=/usr/lib/openoffice
+office.install.dir=/usr/lib/libreoffice
 java.debug=false

Reply to: