Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv24849
Modified Files:
Tag: OPENOFFICE_ORG_1_1_1
rules
Log Message:
s/4.1/$(D)/
remove modified xmlhelp Java files
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.182.4.2
retrieving revision 1.182.4.3
diff -u -d -r1.182.4.2 -r1.182.4.3
--- rules 27 Jan 2004 00:04:06 -0000 1.182.4.2
+++ rules 27 Jan 2004 00:14:29 -0000 1.182.4.3
@@ -65,7 +65,7 @@
else
USE_JAVA=y
JDK_HOME:=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^.*jdkhome=\([^,]*\),.*/\1/p')
- LIBDB_JAR=/usr/share/java/libdb4.1-java.jar
+ 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
@@ -395,6 +395,9 @@
rm -f berkeleydb/prj/d.lst
rm -f extensions/prj/build.lst
+ for i in xmlhelp/source/com/sun/star/help/*.java.in; do \
+ rm -f `basename $$i .in`; \
+ done
$(MAKE) -f debian/rules control
