CVS:oo-deb/debian changelog,1.373,1.374 rules,1.237,1.238
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv25081
Modified Files:
changelog rules
Log Message:
build with free jars
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- changelog 21 Oct 2004 22:24:31 -0000 1.373
+++ changelog 28 Oct 2004 23:02:56 -0000 1.374
@@ -1,10 +1,16 @@
-openoffice.org (1.1.2-5.6pre) unstable; urgency=low
+openoffice.org (1.1.2.dfsg.1-0.1pre) unstable; urgency=medium
+ * Remove non-free stuff from the .orig.tar.gz: [RE]
+ - neon/download/neon-0.23.5.tar.gz: contains FDL docs...
+ - external/common/*: propriatary sun Jars
* New patches:
- - l10n-YTL.diff: backport tr_TR localedata patch from cws_srx645_trcurrency
- to add YTL (.tr currency as of 2005-01-01) support; make it default [RE]
+ - l10n-YTL.diff: backport tr_TR localedata patch from
+ cws_srx645_trcurrency to add YTL (.tr currency as of 2005-01-01)
+ support; make it default [RE]
- sysui-mimetypes.diff: add MimeType entries to the
.desktop files (closes: #272638) [RE]
+ - fix-jars.patch: patch to be able to use free jars, thanks
+ Marco Pratesi [RE]
* Modified patches:
- sysui-translations.diff: fix ca encoding, thanks Jordi Mallach
(closes: #275968)
@@ -12,7 +18,11 @@
- remove Jan-Hendrik Palic from Uploaders: [RE]
* debian/rules:
- add LIBSUFFIX as defined in debian/scripts/vars.$(ARCH) to the
- maintainer scripts
+ maintainer scripts [RE]
+ - add the libxerces2-java, libxp-java, and libxt-java .jars to
+ XCLASSPATH. Check for them at the appropriate place and symlink to
+ them from external/common since for xt and xp the addition to the
+ classpath doesn't work in readlicense_oo and officecfg :/ [RE]
* debian/java-lib.sh: use ${LIBSUFFIX} instead of hardcoded li to
make it work on !i386
* debian/desktop-lib.sh: add, run update-desktop-database -q in
@@ -21,7 +31,7 @@
and rm /usr/share/fonts/truetype/openoffice/fonts.cache* on purge to
get ttf-opensymbol purged cleanly (closes: #270729)
- -- Rene Engelhard <rene@debian.org> Fri, 22 Oct 2004 00:21:27 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 28 Oct 2004 11:48:29 +0200
openoffice.org (1.1.2-5) unstable; urgency=high
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- rules 21 Oct 2004 15:28:35 -0000 1.237
+++ rules 28 Oct 2004 23:02:57 -0000 1.238
@@ -71,13 +71,14 @@
# Non-1.4 Jdks need extra jar files
ifneq (1.4,$(findstring 1.4,$(SUNJDK_VER)))
- BUILDCMD+= XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar
+ BUILDCMD+= XCLASSPATH=$$XCLASSPATH::/usr/share/java/crimson.jar:/usr/share/java/xalan.jar:/usr/share/java/xml-apis.jar:/usr/share/java/xalan2.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xz.jar:/usr/share/java/xp.jar
endif
LIBDB_JAR=/usr/share/java/libdb$(D)-java.jar
CONFIGURE_FLAGS+= --with-jdk-home=$(JDK_HOME) --with-db-jar=$(LIBDB_JAR)
JAVA_ADDITIONAL_DEPENDS=, libdb$(D)-java
IGNORE_MANIFEST_CHANGES=1
export IGNORE_MANIFEST_CHANGES
+ BUILDCMD+= XCLASSPATH=$$XCLASSPATH::/usr/share/java/xmlParserAPIs.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xt.jar:/usr/share/java/xp.jar
endif
# You build just one language by passing lang=<langcode> such as 'en' in DEB_BUILD_OPTIONS
@@ -448,6 +449,10 @@
rm -f `basename $$i .in`; \
done
+ # remove created links
+ rm -f external/common/xt.jar
+ rm -f external/common/parser.jar
+
$(MAKE) -f debian/rules control
@@ -588,6 +593,14 @@
touch -r $(OOO_BUILD)/fonts/opens___.ttf $(OOO_BUILD)/fonts/opens___.ttf.uu ;\
fi
+ifeq "$(USE_JAVA)" "y"
+ # adding them to the classpath somehow doesn't help (done neverthless)
+ # we need to make symlinks here...
+ if [ ! -d external/common ]; then mkdir -p external/common; fi
+ ln -sf /usr/share/java/xp.jar external/common/parser.jar
+ ln -sf /usr/share/java/xt.jar external/common/xt.jar
+endif
+
touch $@
build.prepare.artwork: $(STAMP_DIR)/build.prepare.artwork
@@ -635,10 +648,18 @@
# DEB_BUILD_OPTIONS=jdkhome=/absolute/path/to/jdk
test -x /$(JDK_HOME)/bin/javac
+ # Make sure we have all the necessary java packages. If this test
+ # fails, please ensure that the libxt-java, libxp-java and
+ # libxerces2-java packages are installed
+ test -r /usr/share/java/xmlParserAPIs.jar
+ test -r /usr/share/java/xercesImpl.jar
+ test -r /usr/share/java/xt.jar
+ test -r /usr/share/java/xp.jar
+
# Non-1.4 Jdks need extra jar files
ifneq (1.4,$(findstring 1.4,$(SUNJDK_VER)))
- # Make sure we have all the necessary java packages. If this
- # test fails, please ensure that the
+ # Make sure we have all the necessary java packages when building
+ # with 1.3. If this test fails, please ensure that the
# libcrimson-java, libxalan-java, and libxalan2-java packages are
# installed.
test -r /usr/share/java/crimson.jar
Reply to:
- Prev by Date:
Bug#278668: must set LC_ALL for locale to take effect
- Next by Date:
CVS:oo-deb/debian changelog,1.362.2.28,1.362.2.29 control,1.186.2.15,1.186.2.16 control.in,1.153.2.13,1.153.2.14
- Previous by thread:
Bug#278668: must set LC_ALL for locale to take effect
- Next by thread:
CVS:oo-deb/debian changelog,1.362.2.28,1.362.2.29 control,1.186.2.15,1.186.2.16 control.in,1.153.2.13,1.153.2.14
- Index(es):