closer to the java debian packaging policy

5 files changed, 20 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index b87c569..7639608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 ivy-java (1.2.3) unstable; urgency=low
 
+  - debian packaging corrected, now build-depends on java-compiler and
+    depends on java-virtual-machine. I should switch to libivy-java.
+    The classes are not unpacked in the repository, but whithin a jar file.
+  - added a jprobe shell script
+  - added the testbench code in the documentation
   - Many bugfixes thanks to a new testbench
    * the datagram sender is in its own thread. Now works with jdk1.2
    * IvyClient doesn't loop any more on a remote disconnexion
diff --git a/debian/control b/debian/control
index ca318e4..598ace3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: devel
 Priority: optional
 Maintainer: Yannick Jestin <jestin@cena.fr>
 #Standards-Version: 3.5.2
-Build-Depends: lynx, lib-gnu.regexp-java, lib-gnu.getopt-java
+Build-Depends: java-compiler, lynx, lib-gnu.regexp-java, lib-gnu.getopt-java
 
 Package: ivy-java
 Architecture: all
-Depends: java-common, lib-gnu.getopt-java, lib-gnu.regexp-java
-Suggests: j2sdk1.3, jikes
+Depends: java-virtual-machine, lib-gnu.getopt-java, lib-gnu.regexp-java
+Suggests: jikes
 Description: Ivy Software bus for java
  The ivy-java package is a pure-Java implementation of the Ivy software bus
  messaging scheme. It intends to ease the programming of distributed systems,
diff --git a/debian/librules-manual.txt b/debian/librules-manual.txt
index 5ddb48a..db0be37 100644
--- a/debian/librules-manual.txt
+++ b/debian/librules-manual.txt
@@ -27,7 +27,6 @@ For every binary package <package> you want to build:
    - If the package is "arch: all", make debian/stamp/binary/indep depend
      on debian/stamp/binary/<package>; otherwise make debian/stamp/binary/arch
      depend on that target
-
    - Write a target debian/stamp/binary/<package> using the following template:
 
 debian/stamp/binary/<package>: package=<package>
diff --git a/debian/librules.mk b/debian/librules.mk
index d330865..3e88780 100644
--- a/debian/librules.mk
+++ b/debian/librules.mk
@@ -105,6 +105,7 @@ bindir = $(rootdir)/usr/bin
 sbindir = $(rootdir)/usr/sbin
 docdir = $(rootdir)/usr/share/doc/$(package)
 exampledir = $(docdir)/examples
+testsdir = $(docdir)/tests
 mandir = $(rootdir)/usr/share/man
 elispdir = $(rootdir)/usr/share/emacs/site-lisp
 emacs_d_dir = $(rootdir)/etc/emacs/site-start.d
diff --git a/debian/rules b/debian/rules
index cd86e0f..4a21b02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ include debian/librules.mk
 
 debian/stamp/binary/arch : debian/stamp/binary/ivy-java
 
-#export CLASSPATH=.:/usr/share/kaffe/Klasses.jar:/usr/share/java/repository
-
 debian/stamp/build :
 	$(MAKE) -C src
 	touch $@
@@ -17,29 +15,35 @@ debian/stamp/build :
 debian/stamp/clean-build:
 	-$(MAKE) -C src clean
 
-javarep=$(rootdir)/usr/share/java/repository	
+javarep=$(rootdir)/usr/share/java
 mandir=$(rootdir)/usr/share/man/man1
 
 debian/stamp/binary/ivy-java	: package=ivy-java
 debian/stamp/binary/ivy-java	: debian/stamp/build
 	$(prebinary)
+	$(install_dir) $(bindir)
 	$(install_dir) $(javarep)
+	$(install_dir) $(javarep)/repository
 	$(install_dir) $(exampledir)
+	$(install_dir) $(testsdir)
 	$(install_dir) $(docbasedir)
 	$(install_dir) $(mandir)
-	cp -r src/fr $(javarep)
-	mkdirhier $(docdir)/doc/html/api 
-	( cd src; javadoc -d $(docdir)/doc/html/api *java )
+	( cd src; jar cvf $(javarep)/ivy.jar fr )
+	cp -r src/fr $(javarep)/repository/
+	cp tools/jprobe $(bindir)/jprobe
 	cp -r Changelog $(docdir)
 	gzip -9 $(docdir)/Changelog
+	make docs
 	cp doc/ivy-java.1 $(mandir)
-	( cd doc ; make )
+	mkdirhier $(docdir)/doc/html/api 
+	( cd src; javadoc -d $(docdir)/doc/html/api *java )
 	cp -R doc/ivy-java $(docdir)/doc/programmersguide
 	cp -R doc/ivy-java.pdf $(docdir)/programmersguide.pdf
 	gzip -9 $(mandir)/ivy-java.1
 	$(install_nonex) debian/README.Debian $(docdir)
 	$(install_nonex) BUGS README $(docdir)
 	$(install_nonex) examples/*.java $(exampledir)
+	$(install_nonex) tests/*.java $(testsdir)
 	$(install_nonex) debian/ivy-java $(docbasedir)
 	$(install_nonex) debian/changelog $(docdir)/Changelog.debian
 	$(gzip) $(docdir)/Changelog.debian