adaptations pour delivrer un paquet debian woody 3.0

propre dependant python2.1-tk-o et ivyc (>=3.3)

8 files changed, 59 insertions, 35 deletions

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 51e5d60..49bc898 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -12,6 +12,7 @@ VERSION := @VERSION@
 STATIC_EXAMPLES := pyhello.py testtk.py
 EXAMPLES        := $(addprefix docs/examples/, env.sh)
 DOCS            := $(addprefix docs/html/, index.html ivycpy_wrap.html)
+DEBIANSTUFF     := debian/copyright
 
 DEFINES   := @DEFINES@
 INCLUDES  := @INCLUDES@
@@ -27,9 +28,15 @@ mandir      := @mandir@
 infodir     := @infodir@
 pyexecdir   := @pyexecdir@
 pythondir   := @pythondir@
+pmode       := @pmode@        # package mode debian or default 
 
-PKGEXAMPLESDIR := $(datadir)/$(PACKAGE)-$(VERSION)/examples
+# PKGEXAMPLESDIR := $(datadir)/$(PACKAGE)-$(VERSION)/examples
+
+ifeq "$(pmode)" "debian"
+PKGDOCDIR      := $(datadir)/doc/$(PACKAGE)-$(VERSION)
+else
 PKGDOCDIR      := $(datadir)/$(PACKAGE)-$(VERSION)/docs
+endif 
 
 MKDIR := mkdir -p
 RMDIR := rmdir -p
@@ -74,7 +81,7 @@ CFLAGS   = @CFLAGS@  $(CC_OPTIONS)
 LDFLAGS  = @LDFLAGS@ $(LD_OPTIONS)
 LDLIBS   = $(LIBRARIES) @LIBS@
 
-default: ivycpy.so $(DOCS) $(EXAMPLES)
+default: ivycpy.so $(DOCS) $(EXAMPLES) $(DEBIANSTUFF)
 
 ivycpy.so: ivycpy_wrap_neat.o @PYTHON_LIBDIR@/python@PYTHON_VERSION@/lib-dynload/_tkinter.so
 	$(LINK.o) $(CC_SHARED_OPTIONS) $^ -o $@ -livy $(LDLIBS) -lc
@@ -111,13 +118,22 @@ VERSION:
 docs/examples/env.sh: env_tpl.sh
 	>|$@ sed -e "s|_IVYCPYPATH_|$(pythondir)|g" $<
 
+# debian
+
+debian/copyright: docs/copyright
+	$(INSTALL_DATA) $< debian
+
 install:: ivycpy.so
 	$(INSTALL_DIR) $(pythondir)
 	$(INSTALL_DATA) $< $(pythondir)
 
-install:: $(DOCS)
+# install of docs requires o exclude service file : CVS, .cvsignore
+install:: $(DOCS) $(EXAMPLES)
 	$(INSTALL_DIR) $(PKGDOCDIR)
-	cp -rp docs/* $(PKGDOCDIR)
+	# cp -rp docs/* $(PKGDOCDIR)
+	cd docs && \
+    find . -type d ! \( -name 'CVS*' -o -name '.' \) -exec install -d $(PKGDOCDIR)/{} ";" && \
+    find . -type f ! -name '.cvsignore'  -exec cp -p {} $(PKGDOCDIR)/{} ";"
 
 .PHONY: default install VERSION
 
diff --git a/debian/control b/debian/control
index 9d1502c..201fd09 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: ivycpy
-Version: ivycpy213sa
+Version: ivycpy213
 Section: devel
 Priority: optional
 Maintainer: Didier Pavet <pavet@cena.fr>
@@ -9,11 +9,11 @@ Build-Depends: debhelper
 Package: ivycpy
 Section: devel
 Architecture: i386
-Depends: ${shlibs:Depends}, libc6-dev, python-tk (=2.1.3-3.2)
+Depends: libc6-dev, python2.1-tk-o (=2.1.3-3.2), ivy-c (>= 3.3)
+Conflicts: ivycpy213sa
 Description: Ivy stub for Python (wrapper above ivyc).
- Ivycpy is a wrapper above ivyc library (3.4) and procures functions
- to plug a Python application onto the Ivy Bus;
- This version is a very early release (ivycpy213sa stands for ivycpy for
- Python 213 Stand Alone) which embodies ivy object modules,
- and procures its own tkinter shared library . Further release should
- just rely on dynamic linking with both libivy.so and native _tkinter.so 
+ Ivycpy provides a Python access to the Ivy Bus. It is a wrapper above ivyc library ([3.3 .. 3.6]).
+ This version is the version for debian woody (ivycpy213 stands for ivycpy for
+ Python 213); it is dymically linked with libivy.
+ It requires to install python2.1-tk-o which is the Opened Tkinter version with the suited patch
+ on _tkinter.so sharable lib for ivycpy.
diff --git a/debian/ivycpy.3 b/debian/ivycpy.3
index 059d4d7..47650e2 100644
--- a/debian/ivycpy.3
+++ b/debian/ivycpy.3
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH IVYCPY 3 "Feb, 2003" "ivycpy" "Python library for accessing Ivy Bus"
+.TH IVYCPY 3 "Sept, 2004" "ivycpy" "Python library for accessing Ivy Bus, v0.5"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -22,18 +22,24 @@ ivycpy \- a Python library for accessing Ivy Bus
 
 .B from ivycpy import *
 
+.B # tbc 
+
 .SH DESCRIPTION
 This manual page documents briefly the
 .B ivycpy library.
 
 This Python library (actually C wrapper around ivy-c library) allow
-to use Ivy bus using Python. This library is a wrapper above ivyc library (3.4)
+to use Ivy bus using Python. This library is a wrapper above ivyc library (>=3.3)
 and procures functions to plug a Python application onto the Ivy Bus.
-This version is a very early release (ivycpy213sa stands for ivycpy for
-Python 213 - Stand Alone) which embodies ivy object modules,
-and procures its own tkinter shared library . Further release should
-just rely on dynamic linking with both libivy.so and native _tkinter.so, but
-some details stuff required to hack both ivy-c and tkinter themselves, so.
+
+This version is strictly compatible with ivy-c [3.2 .. 3.6] and can be
+dynamically linked to a new version of ivy-c, if ivy-c api is unchanged which is
+quite unlikely.
+
+This current source version allows to link ivycpy with an dedicated version of
+[Python/Tkinter] . ivycpy requires to share some internal data with _tkinter.c
+and thus a dedicated version of tkinter is required to make ivycpy working.
+
 .PP
 Ivycpy is developped using SWIG (Simplified Wrapper and Interface Generator),
 see http://www.swig.org for further inforation on SWIG.
@@ -43,8 +49,10 @@ see http://www.swig.org for further inforation on SWIG.
 .\" respectively.
 .SH EXAMPLES
 Some examples of Python scripts are provided in
-/usr/share/doc/ivycpy directory .
+/usr/share/doc/ivycpy(version)/examples directory .
 .SH SEE ALSO
+Documentation is available at :
+/usr/share/doc/ivycpy(version)/
 For further information about Ivy, visit the Ivy web site : 
 http://www.tls.cena.fr/products/ivy/
 .SH AUTHOR
diff --git a/debian/postinst b/debian/postinst
index bcbd460..6ae18fa 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -28,11 +28,11 @@ EXAMPLEDIR="/usr/share/doc/ivycpy/examples"
 case "$1" in
     configure)
 	#touch $TKINTERDIR/ivycpy.touch
-	if [ -f $TKINTERDIR/_tkinter.so ]
-	then
-		mv $TKINTERDIR/_tkinter.so $TKINTERDIR/_tkinter.so.orig
-		ln -s $TKINTERDIR/_tkinter.so.ivycpy $TKINTERDIR/_tkinter.so
-	fi
+	# if [ -f $TKINTERDIR/_tkinter.so ]
+	#then
+	#	mv $TKINTERDIR/_tkinter.so $TKINTERDIR/_tkinter.so.orig
+	#	ln -s $TKINTERDIR/_tkinter.so.ivycpy $TKINTERDIR/_tkinter.so
+	# fi
 	for i in $EXAMPLEDIR ; do
             python -O /usr/lib/python2.1/compileall.py -q $i
             python /usr/lib/python2.1/compileall.py -q $i
diff --git a/debian/postrm b/debian/postrm
index f5979ce..fd23f5c 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -20,10 +20,10 @@ TKINTERDIR="/usr/lib/python2.1/lib-dynload"
 
 case "$1" in
        purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-	if [ -f $TKINTERDIR/_tkinter.so.orig ]
-	then
-		mv -f $TKINTERDIR/_tkinter.so.orig $TKINTERDIR/_tkinter.so
-	fi
+	#if [ -f $TKINTERDIR/_tkinter.so.orig ]
+	#then
+	#	mv -f $TKINTERDIR/_tkinter.so.orig $TKINTERDIR/_tkinter.so
+	#fi
        ;;
 
     *)
diff --git a/debian/prerm b/debian/prerm
index 6c5dae3..d59dc0b 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -3,7 +3,7 @@
 
 set -e
 #
-EXAMPLEDIR="/usr/share/doc/ivycpy/examples"
+# EXAMPLEDIR="/usr/share/doc/ivycpy/examples"
 
 # summary of how this script can be called:
 #        * <prerm> `remove'
@@ -19,7 +19,7 @@ case "$1" in
     remove|upgrade|deconfigure)
 #       install-info --quiet --remove /usr/info/ivycpy.info.gz
 #  removing example file 
-		rm $EXAMPLEDIR/*.*
+# 		rm $EXAMPLEDIR/*.*
         ;;
     failed-upgrade)
         ;;
diff --git a/debian/rules b/debian/rules
index b443946..20311f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-tcl=/usr/lib/tcl8.3/
 	# Add here commands to compile the package.
 	#$(MAKE)
 
@@ -35,7 +35,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
-	$(MAKE) install prefix=`pwd`/debian/tmp
+	$(MAKE) install prefix=`pwd`/debian/tmp/usr pmode=debian
 
 
 # Build architecture-independent files here.
@@ -69,7 +69,7 @@ binary-arch: build install
 #	dh_makeshlibs
 	dh_installdeb    
 #	dh_perl
-	dh_shlibdeps
+#	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff --git a/debian/substvars b/debian/substvars
index 56f0f5f..e5cfd3d 100644
--- a/debian/substvars
+++ b/debian/substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.2.4-4), tcl8.3 (>= 8.3.0), tk8.3 (>= 8.3.0), xlibs (>> 4.1.0)
+shlibs:Depends=ivy-c, libc6 (>= 2.2.4-4), tcl8.3 (>= 8.3.0)