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

pkg-jboss-commits@lists.alioth.debian.org pkg-jboss-commits@lists.alioth.debian.org
Tue, 22 Jun 2004 01:25:57 -0600


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

Modified Files:
	rules changelog 
Log Message:
fix minimal config, depend on the exact jboss3 version

Index: rules
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/rules,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rules	18 Jun 2004 12:00:26 -0000	1.9
+++ rules	22 Jun 2004 07:25:54 -0000	1.10
@@ -18,6 +18,7 @@
 JBOSS_DOC_DIR=$(CURDIR)/debian/${PKG}-doc
 JBOSS_CLIENT_DIR=$(CURDIR)/debian/${PKG}-client
 BUILD_DIR=build/output/jboss-3.2.4
+INSTALL=/usr/bin/install
 
 configure: configure-stamp
 configure-stamp:
@@ -83,6 +84,10 @@
 	cp thirdparty/jdom/lib/jdom.jar    		\
 	    	$(JBOSS_DIR)-server-$$i/usr/share/${PKG}/server/$$i/lib/; \
 	done
+
+	# Bug: fix minimal config (https://sourceforge.net/tracker/?func=detail&atid=376685&aid=969292&group_id=22866)
+	cp server/output/lib/jboss.jar \
+		$(JBOSS_DIR)-server-minimal/usr/share/${PKG}/server/minimal/lib/
 
 	# clone jboss-server-default to jboss-server-debian
 	cp -a $(JBOSS_DIR)-server-default/etc/${PKG}/default/* $(JBOSS_DIR)-server-debian/etc/${PKG}/debian/

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/changelog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- changelog	21 Jun 2004 14:31:53 -0000	1.8
+++ changelog	22 Jun 2004 07:25:54 -0000	1.9
@@ -4,7 +4,10 @@
     * jboss3.init: also look for j2sdk 1.3
     * jboss3.init: fix startup message if JBOSS_USER is empty
     * jboss3.default: fix typos
-    * control: jboss3-server-config depends on the same jboss3 version
+    * control: jboss3-server-configs must depend on exactly the same jboss3
+      version
+    * copy jboss.jar into minimal/lib to make this config work 
+      (Upstream Bug #969292)
 
  -- Guido Guenther <agx@debian.org>  Mon, 21 Jun 2004 12:29:08 +0200