New Makefile => new version

add dependancy to tcl in control
add libtcl.so and libtcl.a in ivy-c-dev.files
Massive changes to match potato debian policy in rules
remove of /usr/doc in dirs
remove of debian/copyright. A copy of src/version.h to debian/copyright
       is done at build time

6 files changed, 41 insertions, 47 deletions

diff --git a/debian/changelog b/debian/changelog
index b93fed1..c519d8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
+ivy-c (3.2-1) unstable; urgency=low
+
+  * remove dependancy to utils-c-dev, not useful at install time, but
+  *   at build time only. See README.debian
+  * Makefile changed. Split install into several install* targets.
+  * rules changed to remove list.h from package.
+  * rules changed so that it won't use Makefile to install executables,
+  *   docs and links.
+
+ -- Herve DAMIANO <damiano@cena.fr>  Wed, 19 Jan 2000 15:56:37 +0100
+
 ivy-c (3.1-5) unstable; urgency=low
 
   * add a dependance for utils-c-dev, which provides list.h ...
 
- -- Yannick Jestin <jestin@cena.fr> Fri Jan 14 15:58:52 CET 2000
+ -- Yannick Jestin <jestin@cena.fr>  Fri,  Jan 14 15:58:52 CET 2000
 
 ivy-c (3.1-4) unstable; urgency=low
 
@@ -67,5 +78,5 @@ ivy-c (1.1-1) unstable; urgency=low
 
 Local variables:
 mode: debian-changelog
-add-log-mailing-address: "damiano@cenatoulouse.dgac.fr"
+add-log-mailing-address: "damiano@cena.fr"
 End:
diff --git a/debian/control b/debian/control
index 47f1afa..a6aa7ba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ivy-c
 Section: devel
 Priority: extra
-Maintainer: Herve Damiano <damiano@cenatoulouse.dgac.fr>
+Maintainer: Herve Damiano <damiano@cena.fr>
 Standards-Version: 2.3.0.0
 
 Package: ivy-c
@@ -13,8 +13,6 @@ Description: Bus logiciel PII.
 
 Package: ivy-c-dev
 Architecture: any
-Depends: ivy-c (= 3.1-5), libc6-dev, xlib6g-dev, utils-c-dev
-Provides: ivy-c-dev
-Conflicts: ivy-c-dev
+Depends: ivy-c (= 3.2-1), libc6-dev, xlib6g-dev, tcl8.2-dev
 Description: Bus logiciel PII.
  Bus logiciel PII. Fichiers nécessaires au développement.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 28c4502..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,8 +0,0 @@
-This package was debianized by Patrick Lecoanet lecoanet@cena.dgac.fr on
-Tue, 13 Oct 1998 09:52:30 +0200.
-
-It was downloaded from <fill in ftp site>
-
-Copyright:
-
-<Must follow here>
diff --git a/debian/dirs b/debian/dirs
index 076dde4..e09a7e3 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,3 @@
-usr/doc/ivy-c
 usr/man/man1
 usr/lib
 usr/bin
diff --git a/debian/ivy-c-dev.files b/debian/ivy-c-dev.files
index 8bf1137..73fa322 100644
--- a/debian/ivy-c-dev.files
+++ b/debian/ivy-c-dev.files
@@ -3,5 +3,7 @@ usr/lib/libivy.a
 usr/lib/libivy.so
 usr/lib/libgivy.a
 usr/lib/libgivy.so
+usr/lib/libtclivy.a
+usr/lib/libtclivy.so
 usr/X11R6/lib/libxtivy.a
 usr/X11R6/lib/libxtivy.so
diff --git a/debian/rules b/debian/rules
index 335a5b2..f45b1d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,19 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-package=ivy-c
-
 SED_COMMAND='s/.*(\([^)]*\)).*/\1/p'
 MAJOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/\([0-9]*\)\..*/\1/p')
 MINOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/[0-9]*\.\([0-9\.]*\).*/\1/p')
-VERSION = $(MAJOR).$(MINOR)
-CVS_TAG := V$(shell echo -n $(VERSION) | sed -n 's/\./_/gp')
+
+package=ivy-c
 
 build:
 	$(checkdir)
-#	$(checkversion)
-	cd src && make all MAJOR=$(MAJOR) MINOR=$(MINOR)
-
+	cd src && make all MAJOR=$(MAJOR) MINOR=$(MINOR) CFLAGS="-g -fPIC -D_REENTRANT"
 	touch build
 
 clean:
 	$(checkdir)
-#	$(checkversion)
 	-rm -f build
 	-rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
 	-rm -f debian/*substvars
@@ -27,26 +22,40 @@ clean:
 
 binary-indep:	checkroot build
 	$(checkdir)
-#	$(checkversion)
 # There are no architecture-independent files to be uploaded
 # generated by this package.  If there were any they would be
 # made here.
 
 binary-arch:	checkroot build 
 	$(checkdir)
-#	$(checkversion)
 	-rm -rf debian/tmp `find debian/* -type d ! -name CVS`
 	install -d debian/tmp
 	cd debian/tmp && install -d `cat ../dirs`
 
-	cd src && make install PREFIX=`pwd`/../debian/tmp MAJOR=$(MAJOR) MINOR=$(MINOR)
+	cd src && make installlibs PREFIX=`pwd`/../debian/tmp MAJOR=$(MAJOR) MINOR=$(MINOR)
+
+	-rm debian/tmp/usr/include/list.h # it's yet in utils-c-dev
+	-cp src/version.h debian/copyright
+	-strip --strip-unneeded debian/tmp/usr/lib/libivy.so.$(MAJOR).$(MINOR)
+	-strip --strip-unneeded debian/tmp/usr/lib/libtclivy.so.$(MAJOR).$(MINOR)
+	-strip --strip-unneeded debian/tmp/usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR)
+
+	dh_link usr/lib/libivy.so.$(MAJOR).$(MINOR) usr/lib/libivy.so.$(MAJOR)
+	dh_link usr/lib/libgivy.so.$(MAJOR).$(MINOR) usr/lib/libgivy.so.$(MAJOR)
+	dh_link usr/lib/libtclivy.so.$(MAJOR).$(MINOR) usr/lib/libtclivy.so.$(MAJOR)
+	dh_link usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) usr/X11R6/lib/libxtivy.so.$(MAJOR)
+	dh_link usr/lib/libivy.so.$(MAJOR).$(MINOR) usr/lib/libivy.so
+	dh_link usr/lib/libgivy.so.$(MAJOR).$(MINOR) usr/lib/libgivy.so
+	dh_link usr/lib/libtclivy.so.$(MAJOR).$(MINOR) usr/lib/libtclivy.so
+	dh_link usr/lib/libxtivy.so.$(MAJOR).$(MINOR) usr/X11R6/lib/libxtivy.so
+
+	dh_fixperms
+
+	debstd
 
-	debstd -p doc/*.html doc/ChangeLog doc/NEWS doc/TODO doc/BUGS doc/README
 	-rmdir debian/tmp/usr/include
 
-	dpkg-gencontrol -p$(package)
-	chown -R root.root debian/tmp
-	chmod -R go=rX debian/tmp
+	dpkg-gencontrol -p$(package) -isp
 	dpkg --build debian/tmp ..
 
 define checkdir
@@ -61,21 +70,4 @@ checkroot:
 	$(checkdir)
 	test root = "`whoami`"
 
-define checkversion
-	-@echo $(VERSION)
-	-@echo $(CVS_TAG)
-	-@if (test -d CVS); then \
-		if (cvs status -v debian/changelog | grep --silent $(CVS_TAG)); then \
-		 	echo "cvs tag $(CVS_TAG) matches package version $(VERSION)"; \
-		else \
-			echo "debian/rules: *** Warning : No cvs tag $(CVS_TAG) matches package version $(VERSION) for file changelog. You can tag your cvs module by doing debian/rules tag"; \
-			echo -n "debian/rules: *** Existing tags are : "; \
-			cvs status -v debian/changelog | sed -n 's/.*\(V.*_[0-9]\).*/\1/p'; \
-		fi \
-	fi
-endef
-
-tag:
-	-@if (test -x `which cvs`); then cvs tag $(CVS_TAG) .; fi
-
 .PHONY: binary binary-arch binary-indep clean checkroot