nettoyage des fichiers qui ne servent plus à construire la paquet. Doc du

changelog, et mis à jour du numéro de lib dans les makefiles.

10 files changed, 24 insertions, 318 deletions

diff --git a/Changelog b/Changelog
index aad1481..68598af 100644
--- a/Changelog
+++ b/Changelog
@@ -1,10 +1,19 @@
 --------------------------------------------------------------------
+1.2.10 et 11
+
+  documentation updated
+  bug fix: jafter script
+  added jdaemon script
+
+--------------------------------------------------------------------
 1.2.9
+
   bug remaining
     - the overhead is quite important on a loaded setup
   bugfixes
     - unexpected disconnections after the broadcast
   new features
+    - added the unique token in the UDP broadcast
     - Ivy.setFilter() aka message classes, reduces the number of regexp
     matching, improves performance especially when there are *many* clients
     and *many* regexps, most of them ^bounded . See doc for details
diff --git a/Makefile b/Makefile
index f8208cb..59e416c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include java.mk
 
 # Be sure to set this before compiling ...
-  VERSION = 1.2.10
+  VERSION = 1.2.11
      DIST = ivy-$(VERSION).jar 
      DOCS = doc/html/api
      #dist = woody/
@@ -39,6 +39,7 @@ clean:
 	( cd src; make clean ;)
 	( cd tests; make clean ; )
 	( cd examples; make clean; )
+	rm -f -- $(DIST)
 
 install:
 	install -m 0755 tools/jprobe $(DESTDIR)/usr/bin/
diff --git a/debian/README.build-system b/debian/README.build-system
deleted file mode 100644
index 7f460d1..0000000
--- a/debian/README.build-system
+++ /dev/null
@@ -1,6 +0,0 @@
-
-$Id$
-
-This package uses a new experimental debian/rules helper, librules.mk,
-written by Antti-Juhani Kaijanaho <ajk@debian.org>.  Documentation for
-it is available in the file librules-manual.txt.
diff --git a/debian/changelog b/debian/changelog
index 4b8f359..2c6533a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libivy-java (1.2.11) unstable; urgency=low
+
+  * major documentation update ( programmers's guide )
+  * debian packaging system modified to use dhelper
+  * added jafter and jdaemon in the shell scripts
+  * added the ID in the UDP broadcast
+
+ -- Yannick Jestin <yannick.jestin@enac.fr>  Thu, 20 Jul 2006 14:48:00 +0200
+
 libivy-java (1.2.10) unstable; urgency=low
 
   * modified the domain parsing to allow -b :3110 e.g. , it is still a bug ... 
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..5fd0386
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+usr/share/java
+usr/bin
+usr/man/man1
diff --git a/debian/librules-manual.txt b/debian/librules-manual.txt
deleted file mode 100644
index db0be37..0000000
--- a/debian/librules-manual.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-Manual for the librules helper                          -*- Text -*-
-------------------------------
-$Id$
-
-This file documents an experimental new debian/rules helper, a
-makefile called "librules.mk", which does all the boring work of
-building a package.
-
-Usage:
-
-The very first non-comment thing in your debian/rules should be the
-following line:
-librules_interface = 1
-This helps to spot incompatibilities with debian/rules and the
-librules.mk file currently in use.
-
-Include "debian/librules.mk" just after that line.  Precede it with a
-variable definition "librules_native_pkg=yes" if the package you are building
-is a Debian native package.
-
-Define a target debian/stamp/build that builds the package (like the
-build target does in conventional debian/rules files).  Put "touch $@"
-as the last action in that rule.
-
-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>
-debian/stamp/binary/<package>: debian/stamp/build
-        $(prebinary)
-        # Add here your own commands
-        $(postbinary)
-        touch $@
-
-     The $(prebinary) macro will create a skeletal build tree for the 
-     package.  It also installs debian/prerm.<package> and
-     debian/postinst.<package> as the prerm and postinst scripts;
-     it will also install the copyright file (debian/copyright)
-     and the Debian changelog file (debian/changelog).
-
-     See below for instructions about how to write your own install commands.
-
-     The $(postbinary) macro fixes directory permissions, generates the binary
-     control file and builds the package.
-
-   - You may want to define targets "clean", "clean-binary" and "clean-build"
-     to reverse the effects of your own commands in the build and binary targets.
-     The librules.mk file cleans up for itself, you don't need to worry about that.
-
-
-How to write your own commands for binary targets:
-
-Use the following macros to install files:
-
-      $(install_exec) SOURCE TARGET
-      $(install_exec) SOURCE SOURCE ... DIRECTORY
-          installs one or more binary executables
-          (TARGET need not be a directory name)
-
-      $(install_nonex) SOURCE TARGET
-      $(install_nonex) SOURCE SOURCE ... DIRECTORY
-          install one or more non-executable files
-          (TARGET need not be a directory name)
-
-      $(install_dir) DIRECTORY
-          create the directory
-
-      $(install_script) SOURCE TARGET
-      $(install_script) SOURCE SOURCE ... DIRECTORY
-          install one or more executable scripts          
-          (TARGET need not be a directory name)
-
-The macros above are wrappers around the "install" utility.
-
-      $(install_symlink) SOURCE [TARGET]
-           Install a symlink from SOURCE to TARGET
-           (This macro is a wrapper around ln -s)
-
-      $(gzip) FILE ...
-           Compress the given files
-           (This is a wrapper around gzip)
-
-      $(strip_lib) FILE ...
-           Strip the given files the way shared libraries are stripped
-           (This is a wrapper around strip)
-
-
-*Never* refer to a file in the install target tree by their real name.
-Use the following macros instead:
-
-      $(rootdir) - the directory that masquerades as / in the target tree
-                   (usually a subdirectory under debian/tmp)
-      $(ctldir)  - the directory where control files are installed
-                   (usually $(rootdir)/DEBIAN)
-      $(bindir)  - the main binary directory
-                   (usually $(rootdir)/usr/bin)
-      $(docdir)  - the main doc directory
-                   (usually $(rootdir)/usr/share/doc/<package>)
-      ...
-(see librules.mk for what's available)
-
-
-If your debian/rules needs the dpkg-architecture variables, add the
-definition "librules_need_archvars=yes" before the include at the top
-of the file.  If you use this feature, you need to Build-Depend on
-"dpkg-dev (>= 1.4.1.5)".
-
-If you want to patch/unpatch the package, add the definitions
-"librules_patch_support=yes" and "librules_patches=file1.diff
-file2.diff ... filen.diff" before the include at the top of the file.
-If you use this, you need to Build-Depend on "patch".
diff --git a/debian/librules.mk b/debian/librules.mk
deleted file mode 100644
index 3e88780..0000000
--- a/debian/librules.mk
+++ /dev/null
@@ -1,172 +0,0 @@
-# librules.mk - a library of convenient rules and macros for debian/rules files
-#
-# Copyright © 1999, 2000 Antti-Juhani Kaijanaho.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this file, to deal in this file without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of this file, and to permit persons to whom this file is furnished
-# to do so, subject to the following condition: The above copyright
-# notice and this permission notice shall be included in all copies or
-# substantial portions of this file.
-#
-# THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT.  IN NO EVENT SHALL SOFTWARE IN THE PUBLIC INTEREST,
-# INC.  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-# IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN THIS
-# FILE.
-#
-# Except as contained in this notice, the name of the author(s) of
-# this file shall not be used in advertising or otherwise to promote
-# the sale, use or other dealings in this file without prior written
-# authorization from the author(s).
-
-# This file is set up to be compliant with Debian Standards Version
-# 3.2.1.
-
-# $Id$
-
-default:
-	@echo You need to specify a target.
-	@exit 1
-
-librules_a_variable_just_to_run_the_commands1 := $(shell mkdir debian/stamp)
-librules_a_variable_just_to_run_the_commands2 := $(shell mkdir debian/stamp/binary)
-
-# Make sure we don't get used by an incompatible debian/rules
-# WHEN YOU MAKE INCOMPATIBLE CHANGES, EDIT THIS!
-ifneq ($(librules_interface),1)
-$(error incompatible debian/rules)
-endif
-
-# Standard interface targets
-build: debian/stamp/build
-binary: binary-indep binary-arch
-binary-arch: debian/stamp/binary/arch
-binary-indep: debian/stamp/binary/indep
-clean: clean-build clean-binary clean-std
-
-
-# Nonstandard interface targets
-clean-build: clean-build-std
-clean-binary: clean-binary-std
-
-# Stamp targets for the standard binary targets
-debian/stamp/binary/arch: debian/stamp/build
-	touch $@
-
-debian/stamp/binary/indep: debian/stamp/build
-	touch $@
-
-.PHONY: default build binary binary-arch binary-indep \
-	clean clean-build clean-binary
-
-ifeq ($(librules_need_archvars),yes)
-DEB_BUILD_ARCH       = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_TYPE   = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_CPU    = $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_SYSTEM = $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_HOST_ARCH        = $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE    = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_CPU     = $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_GNU_SYSTEM  = $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-endif
-
-CFLAGS = -O2 -Wall
-STRIP =
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-STRIP = -s
-endif
-
-export CFLAGS
-
-install         := install -o root -g root
-install_exec    := $(install) -m 0755 $(STRIP)
-install_nonex   := $(install) -m 0644
-install_dir     := $(install) -m 0755 -d
-install_script  := $(install) -m 0755
-install_symlink := ln -s
-gzip            := gzip -9
-strip_lib       := strip --strip-unneeded
-
-tmpdir := $(shell pwd)/debian/tmp
-
-# These must not be :='s!
-rootdir = $(tmpdir)/$(package)
-ctldir = $(rootdir)/DEBIAN
-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
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-sharedir = $(rootdir)/usr/share/$(package_base)
-libdir = $(rootdir)/usr/lib/$(package_base)
-docbasedir = $(rootdir)/usr/share/doc-base
-usrlib = $(rootdir)/usr/lib
-includedir = $(rootdir)/usr/include
-
-ifeq ($(librules_native_pkg),yes)
-librules_changelog=changelog
-else
-librules_changelog=changelog.Debian
-endif
-
-define prebinary
-	$(RM) -r $(rootdir)
-	$(install_dir) $(ctldir)
-	$(install_script) debian/prerm.$(package) $(ctldir)/prerm
-	$(install_script) debian/postinst.$(package) $(ctldir)/postinst
-	$(install_dir) $(docdir)
-	$(install_nonex) debian/copyright $(docdir)
-	$(install_nonex) debian/changelog $(docdir)/$(librules_changelog)
-	$(gzip) $(docdir)/$(librules_changelog)
-endef
-
-define postbinary
-	chmod -R g-s $(rootdir)
-	dpkg-gencontrol -isp -p$(package) -P$(rootdir) $(gencontrol_options)
-	dpkg --build $(rootdir) ..
-endef
-
-clean-build-std:
-	rm -f debian/stamp/build
-
-clean-binary-std:
-	rm -f debian/stamp/binary/*
-	rm -f debian/files debian/substvars
-	rm -rf $(tmpdir)
-
-clean-std:
-	rm -rf debian/stamp/
-
-# Patching support
-ifeq ($(librules_patch_support),yes)
-debian/stamp/build: debian/stamp/patch
-clean-build: unpatch
-
-debian/stamp/patch:
-	$(foreach patch, $(librules_patches), patch -fs < $(patch) && )true
-	touch $@
-
-unpatch: debian/stamp/patch
-	$(foreach patch, $(librules_patches), patch -fsR < $(patch) && )true
-	rm -f debian/stamp/patch
-endif
diff --git a/debian/postinst.libivy-java b/debian/postinst.libivy-java
deleted file mode 100644
index eb4437c..0000000
--- a/debian/postinst.libivy-java
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
- 
-set -e
diff --git a/debian/prerm.libivy-java b/debian/prerm.libivy-java
deleted file mode 100644
index 8927c6d..0000000
--- a/debian/prerm.libivy-java
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
- 
-set -e
- 
-package=ivy-java
-docs="ivy-java"
-
-# FHS transition
-if [ -L /usr/doc/$package ]; then
-   rm -f /usr/doc/$package
-fi             
-
-if [ "$1" = remove -o "$1" = upgrade ]; then
-    if command -v install-docs >/dev/null 2>&1; then
-        for doc in $docs
-        do
-            install-docs -r $doc
-        done
-    fi
-fi
diff --git a/src/Ivy.java b/src/Ivy.java
index 4b76490..7e14619 100755
--- a/src/Ivy.java
+++ b/src/Ivy.java
@@ -112,7 +112,7 @@ public class Ivy implements Runnable {
    * the library version, useful for development purposes only, when java is
    * invoked with -DIVY_DEBUG
    */
-  public static final String libVersion ="1.2.10";
+  public static final String libVersion ="1.2.11";
 
   private boolean debug;
   private ServerSocket app;