tag 403971 - help
thanks

Heya,


attached patch should fix this bug. Also the packaging should support
DH_COMPAT=4 now - if I didn't miss anything.

Cheers,

-- 
Bernd Zeimetz
<[EMAIL PROTECTED]>                         <http://bzed.de/>

diff -Nuw debian.orig/control debian/control
--- debian.orig/control	2007-03-23 20:48:25.000000000 +0100
+++ debian/control	2007-03-23 20:47:23.000000000 +0100
@@ -1,7 +1,8 @@
 Source: megahal
 Section: misc
 Priority: optional
-Build-Depends: debhelper, tcl8.3-dev, python-dev
+Build-Depends: debhelper, tcl8.3-dev, python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep: python-support (>= 0.3)
 Maintainer: Laurent Fousse <[EMAIL PROTECTED]>
 Uploaders: Drew Scott Daniels <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1
@@ -9,7 +10,8 @@
 Package: megahal
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: python
+Provides: ${python:Provides}
+Suggests: ${python:Depends}
 Description: conversation simulator that can learn as you talk to it
  Conversation simulators are computer programs which give the appearance of
  conversing with a user in natural language. Such programs are effective
diff -Nuw debian.orig/dirs debian/dirs
--- debian.orig/dirs	1970-01-01 01:00:00.000000000 +0100
+++ debian/dirs	2007-03-23 20:27:39.000000000 +0100
@@ -0,0 +1,2 @@
+usr/bin
+usr/lib/megahal
diff -Nuw debian.orig/docs debian/docs
--- debian.orig/docs	1970-01-01 01:00:00.000000000 +0100
+++ debian/docs	2007-03-23 20:28:03.000000000 +0100
@@ -0,0 +1,2 @@
+docs/paper.txt
+docs/README.TXT
diff -Nuw debian.orig/examples debian/examples
--- debian.orig/examples	1970-01-01 01:00:00.000000000 +0100
+++ debian/examples	2007-03-23 20:28:36.000000000 +0100
@@ -0,0 +1,4 @@
+debian/hal.pl
+debian/Hal.pm
+quick-learn.py
+quick-learn.pl
diff -Nuw debian.orig/pyversions debian/pyversions
--- debian.orig/pyversions	1970-01-01 01:00:00.000000000 +0100
+++ debian/pyversions	2007-03-23 20:25:33.000000000 +0100
@@ -0,0 +1 @@
+2.3-
diff -Nuw debian.orig/rules debian/rules
--- debian.orig/rules	2007-03-23 20:48:25.000000000 +0100
+++ debian/rules	2007-03-23 20:50:35.000000000 +0100
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+export DH_COMPAT=4
+
 CFLAGS= -g -W -Wall -Wmissing-prototypes
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14,14 +16,18 @@
 		
 
 TCLVERSION=8.3
+PYVERS=$(shell pysupport-parseversions -l debian/pyversions)
 
 build: build-stamp
 build-stamp:
 	dh_testdir	
 	$(MAKE) "C_INCLUDE_PATH=/usr/include/tcl$(TCLVERSION)" "CFLAGS=$(CFLAGS)" 
-	$(MAKE) pythonmodule
 	$(MAKE) perlmodule
 	
+	for python in $(PYVERS); do \
+		$$python setup.py build; \
+	done	
+
 	touch build-stamp
 
 clean:
@@ -29,7 +35,10 @@
 	dh_testroot
 	rm -f build-stamp
 	make clean
-	dh_clean megahal
+	for python in $(PYVERS); do \
+		$$python setup.py clean; \
+	done
+	dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build
@@ -40,18 +49,22 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs usr/bin usr/lib/megahal
-	install -s megahal debian/tmp/usr/bin
-	install debian/megahal-personal debian/tmp/usr/bin
+	dh_installdirs 
+	install -s megahal debian/megahal/usr/bin
+	install debian/megahal-personal debian/megahal/usr/bin
 	cp -a megahal.aux megahal.ban megahal.grt megahal.swp megahal.trn \
-		debian/tmp/usr/lib/megahal
-	cp -a libmh_tcl.so debian/tmp/usr/lib/megahal
+		debian/megahal/usr/lib/megahal
+	cp -a libmh_tcl.so debian/megahal/usr/lib/megahal
 # Python module
-	make pythonmodule-install DESTDIR=debian/tmp
+	for python in $(PYVERS); do \
+		$$python setup.py install --root=debian/megahal \
+                                          --install-lib=/usr/lib/python-support/megahal/$$python; \
+	done
+	dh_pysupport
 # Perl module
-	make perlmodule-install DESTDIR=$(CURDIR)/debian/tmp
-	dh_installdocs docs/paper.txt docs/README.TXT
-	dh_installexamples debian/hal.pl debian/Hal.pm quick-learn.py quick-learn.pl
+	make perlmodule-install DESTDIR=$(CURDIR)/debian/megahal
+	dh_installdocs 
+	dh_installexamples 
 	dh_installmenu
 #	dh_installinit
 	dh_installcron

Reply via email to