[pkg-jboss-commits] cvs commit to jboss3/debian by agx

[pkg-jboss-commits@lists.alioth.debian.org]

Update of /cvsroot/pkg-jboss/jboss3/debian
In directory haydn:/tmp/cvs-serv14211

Modified Files:
	rules 
Log Message:
add missing jdom.jar (fixes links in jmx console)

Index: rules
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rules	17 May 2004 09:03:02 -0000	1.4
+++ rules	17 May 2004 13:28:15 -0000	1.5
@@ -13,9 +13,10 @@
 JAVA_HOME ?= $(shell for jdir in $(jdk_dirs) ; do if [ -d "$$jdir" ]; then echo $$jdir;exit 0;fi;done)
 export JAVA_HOME
 
-JBOSS_DIR=$(CURDIR)/debian/jboss3
-JBOSS_DOC_DIR=$(CURDIR)/debian/jboss3-doc
-JBOSS_CLIENT_DIR=$(CURDIR)/debian/jboss3-client
+PKG=jboss3
+JBOSS_DIR=$(CURDIR)/debian/${PKG}
+JBOSS_DOC_DIR=$(CURDIR)/debian/${PKG}-doc
+JBOSS_CLIENT_DIR=$(CURDIR)/debian/${PKG}-client
 BUILD_DIR=build/output/jboss-3.2.4RC1
 
 configure: configure-stamp
@@ -57,23 +58,29 @@
 	dh_clean -k 
 	dh_installdirs -i
 
-	# install file for jboss3-doc package
-	mv $(BUILD_DIR)/docs/* $(JBOSS_DOC_DIR)/usr/share/doc/jboss3-doc/
+	# install file for ${PKG}-doc package
+	mv $(BUILD_DIR)/docs/* $(JBOSS_DOC_DIR)/usr/share/doc/${PKG}-doc/
 	rmdir $(BUILD_DIR)/docs
 
-	mv $(BUILD_DIR)/client/*.conf $(JBOSS_CLIENT_DIR)/etc/jboss3/client
-	mv $(BUILD_DIR)/client $(JBOSS_CLIENT_DIR)/usr/share/jboss3/
+	mv $(BUILD_DIR)/client/*.conf $(JBOSS_CLIENT_DIR)/etc/${PKG}/client
+	mv $(BUILD_DIR)/client $(JBOSS_CLIENT_DIR)/usr/share/${PKG}/
 
 	# install files for jboss-server-<type> packages
 	for i in minimal all default; do		\
 	    mv $(BUILD_DIR)/server/$$i/conf/* 		\
-	    	$(JBOSS_DIR)-server-$$i/etc/jboss3/$$i;	\
+	    	$(JBOSS_DIR)-server-$$i/etc/${PKG}/$$i;	\
 	    rmdir $(BUILD_DIR)/server/$$i/conf;		\
 	    mv $(BUILD_DIR)/server/$$i			\
-	    	$(JBOSS_DIR)-server-$$i/usr/share/jboss3/server; \
+	    	$(JBOSS_DIR)-server-$$i/usr/share/${PKG}/server; \
 	done
 
-	cp -a $(BUILD_DIR)/* $(JBOSS_DIR)/usr/share/jboss3
+	# Bug: install missing jdom package:
+	for i in all default; do			\
+	cp thirdparty/jdom/lib/jdom.jar    		\
+	    	$(JBOSS_DIR)-server-$$i/usr/share/${PKG}/server/$$i/lib/; \
+	done
+
+	cp -a $(BUILD_DIR)/* $(JBOSS_DIR)/usr/share/${PKG}
 
 
 # Build architecture-independent files here.