From 82bada47316b25fb6c3755680414f32884caf0e5 Mon Sep 17 00:00:00 2001
From: damiano
Date: Tue, 22 Dec 1998 17:19:28 +0000
Subject: Debianisation des sources de la version de Stéphane C

---
 debian/changelog |  9 ++++++++-
 debian/control   |  2 +-
 debian/rules     |  6 +++---
 src/Makefile     | 23 ++++++++++-------------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6689ef1..7d36f03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ivy-c (1.1.1-1) unstable; urgency=low
+
+  * Mise au propre
+  * Ajout du mecanisme de choix des adresses de broadcast
+
+ -- Herve Damiano <damiano@cenatoulouse.dgac.fr>  Tue, 22 Dec 1998 16:13:18 +0100
+
 ivy-c (1.1-2) unstable; urgency=low
 
   * Suppression du header list.h qui est aussi défini dans utils-c.
@@ -13,5 +20,5 @@ ivy-c (1.1-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "lecoanet@cena.dgac.fr"
+add-log-mailing-address: "damiano@cenatoulouse.dgac.fr"
 End:
diff --git a/debian/control b/debian/control
index 8cd21eb..8ceda36 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ivy-c
 Section: devel
 Priority: extra
-Maintainer: Patrick Lecoanet <lecoanet@cena.dgac.fr>
+Maintainer: Herve Damiano <damiano@cenatoulouse.dgac.fr>
 Standards-Version: 2.3.0.0
 
 Package: ivy-c
diff --git a/debian/rules b/debian/rules
index 00dfae6..d5e8861 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 
 package=ivy-c
 
-version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
-version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
+VERSION=`sed -n 's/.*(\([^)]*\)).*/\1/p' changelog | head -1 | sed -n 's/\([0-9]*\)\..*/\1/p'`
+MAJOR_MINOR=`sed -n 's/.*(\([^)]*\)).*/\1/p' changelog | head -1 | sed -n 's/[0-9]*\.\([0-9\.]*\).*/\1/p'`
 
 build:
 	$(checkdir)
@@ -33,7 +33,7 @@ binary-arch:	checkroot build
 	install -d debian/tmp
 	cd debian/tmp && install -d `cat ../dirs`
 
-	cd src && make install DESTDIR=`pwd`/../debian/tmp
+	cd src && make install DESTDIR=`pwd`/../debian/tmp VERSION=$(VERSION) MAJOR=$(MAJOR) MINOR=$MINOR
 
 	debstd
 	-rmdir debian/tmp/usr/include
diff --git a/src/Makefile b/src/Makefile
index 086101e..a1d464b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,9 +17,6 @@ OBJ = ivyloop.o timer.o ivysocket.o ivy.o
 GOBJ = ivyloop.o timer.o ivysocket.o givy.o
 XTOBJ = ivyxtloop.o ivysocket.o ivy.o
 
-VERSION=1
-MAJOR=1
-
 .c.o:
 	$(CC) -fPIC $(CFLAGS) -c $*.c
 
@@ -27,7 +24,7 @@ all: static-libs commands shared-libs
 
 static-libs: libivy.a libgivy.a libxtivy.a
 
-shared-libs: libivy.so.$(VERSION).$(MAJOR) libgivy.so.$(VERSION).$(MAJOR) libxtivy.so.$(VERSION).$(MAJOR)
+shared-libs: libivy.so.$(VERSION).$(MAJOR_MINOR) libgivy.so.$(VERSION).$(MAJOR_MINOR libxtivy.so.$(VERSION).$(MAJOR_MINOR)
 
 commands: testivy testxtivy
 
@@ -55,13 +52,13 @@ libxtivy.a: $(XTOBJ)
 	rm -f $@
 	ar cq $@ $(XTOBJ)
 
-libivy.so.$(VERSION).$(MAJOR): $(OBJ)
+libivy.so.$(VERSION).$(MAJOR_MINOR): $(OBJ)
 	$(CC) -shared -Wl,-soname,libivy.so.$(VERSION) -o $@ $(OBJ) -lc
 
-libgivy.so.$(VERSION).$(MAJOR): $(GOBJ)
+libgivy.so.$(VERSION).$(MAJOR_MINOR): $(GOBJ)
 	$(CC) -shared -Wl,-soname,libgivy.so.$(VERSION) -o $@ $(GOBJ) -lc
 
-libxtivy.so.$(VERSION).$(MAJOR): $(XTOBJ)
+libxtivy.so.$(VERSION).$(MAJOR_MINOR): $(XTOBJ)
 	$(CC) -shared -Wl,-soname,libxtivy.so.$(VERSION) -o $@ \
 	$(XTOBJ) -L$(XTLIB) -lXt -lX11 -lc
 
@@ -76,11 +73,11 @@ install: all
 	install -m644 libgivy.a $(DESTDIR)/usr/lib
 	install -m644 libxtivy.a $(DESTDIR)/usr/X11R6/lib
 
-	install -m644 libivy.so.$(VERSION).$(MAJOR) $(DESTDIR)/usr/lib
-	install -m644 libgivy.so.$(VERSION).$(MAJOR) $(DESTDIR)/usr/lib
-	install -m644 libxtivy.so.$(VERSION).$(MAJOR) $(DESTDIR)/usr/X11R6/lib
-	cd $(DESTDIR)/usr/lib && ln -s libivy.so.$(VERSION).$(MAJOR) libivy.so
-	cd $(DESTDIR)/usr/lib && ln -s libgivy.so.$(VERSION).$(MAJOR) libgivy.so
-	cd $(DESTDIR)/usr/X11R6/lib && ln -s libxtivy.so.$(VERSION).$(MAJOR) libxtivy.so
+	install -m644 libivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/lib
+	install -m644 libgivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/lib
+	install -m644 libxtivy.so.$(VERSION).$(MAJOR_MINOR) $(DESTDIR)/usr/X11R6/lib
+	cd $(DESTDIR)/usr/lib && ln -s libivy.so.$(VERSION).$(MAJOR_MINOR) libivy.so
+	cd $(DESTDIR)/usr/lib && ln -s libgivy.so.$(VERSION).$(MAJOR_MINOR) libgivy.so
+	cd $(DESTDIR)/usr/X11R6/lib && ln -s libxtivy.so.$(VERSION).$(MAJOR_MINOR) libxtivy.so
 
 	install -m644 *.h $(DESTDIR)/usr/include
-- 
cgit v1.1