[Wisp-cvs] wisp/debian wisp.docs,NONE,1.1 .cvsignore,1.2,1.3 Makefile.am,1.6,1.7 changelog,1.3,1.4 control,1.3,1.4 rules,1.10,1.11

[<pi...@us...>]

Update of /cvsroot/wisp/wisp/debian
In directory sc8-pr-cvs1:/tmp/cvs-serv8936

Modified Files:
	.cvsignore Makefile.am changelog control rules 
Added Files:
	wisp.docs 
Log Message:
updated debian support

--- NEW FILE: wisp.docs ---
DISCLAIMER
NEWS
README

Index: .cvsignore
===================================================================
RCS file: /cvsroot/wisp/wisp/debian/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	22 Jul 2002 14:36:47 -0000	1.2
+++ .cvsignore	12 Apr 2003 12:34:29 -0000	1.3
@@ -3,3 +3,4 @@
 files
 substvars
 tmp
+copyright

Index: Makefile.am
===================================================================
RCS file: /cvsroot/wisp/wisp/debian/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	30 Jul 2002 21:43:59 -0000	1.6
+++ Makefile.am	12 Apr 2003 12:34:29 -0000	1.7
@@ -6,4 +6,4 @@
 #
 #### @(#) $Id$
 
-EXTRA_DIST = changelog control postinst prerm rules .cvsignore
+EXTRA_DIST = wisp.docs changelog control postinst prerm rules .cvsignore

Index: changelog
===================================================================
RCS file: /cvsroot/wisp/wisp/debian/changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- changelog	10 May 2002 07:24:38 -0000	1.3
+++ changelog	12 Apr 2003 12:34:29 -0000	1.4
@@ -1,3 +1,12 @@
+wisp (0.9.9-1) unstable; urgency=low
+
+  * New upstream version.
+  * Ported debian/rules to debhelper
+  * Upgraded the Debian policy conformance.
+  * Added some more docs to the package.
+
+ -- Martin Paljak <mar...@ma...>  Sat, 12 Apr 2003 15:18:18 +0300
+
 wisp (0.9.8-1) unstable; urgency=low
 
   * Upgraded the Debian policy conformance.

Index: control
===================================================================
RCS file: /cvsroot/wisp/wisp/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	10 May 2002 07:24:38 -0000	1.3
+++ control	12 Apr 2003 12:34:29 -0000	1.4
@@ -2,12 +2,12 @@
 Section: interpreters
 Priority: optional
 Maintainer: Andres Soolo <di...@us...>
-Standards-Version: 3.5.6.1
+Standards-Version: 3.5.8
+Build-Depends: libgc-dev, nasm, libgmp3-dev
 
 Package: wisp
 Architecture: i386
 Depends: ${shlibs:Depends}
-Build-Depends: libgc-dev
 Description: Interpreter for the Wisp programming language
  A Lisp dialect mostly resembling Scheme.
  .

Index: rules
===================================================================
RCS file: /cvsroot/wisp/wisp/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rules	8 Feb 2003 14:33:41 -0000	1.10
+++ rules	12 Apr 2003 12:34:29 -0000	1.11
@@ -9,59 +9,59 @@
 #### @(#) $Id$
 
 # Original: debian/rules for GNU Hello, by Ian Jackson
+# Modified: heavy borrowing from hello-debhelper
 
-package = wisp
-
-build:
-	$(checkdir)
+build: copyright
+	dh_testdir
 	./configure --prefix=/usr
-	$(MAKE)
+	$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"
 	touch build
 
 clean:
-	$(checkdir)
-	rm -f build
+	dh_testdir
+	dh_clean
+	rm -f debian/copyright
 	-$(MAKE) -i distclean
-	rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars
+	rm -f build
 
-binary: checkroot build
-	$(checkdir)
-	rm -rf debian/tmp
-	install -d debian/tmp/DEBIAN \
-                -d debian/tmp/usr/bin \
-                -d debian/tmp/usr/share/info \
-                -d debian/tmp/usr/share/wisp \
-                -d debian/tmp/usr/share/man/man1 \
-                -d debian/tmp/usr/share/doc/wisp
-	install -m755 debian/postinst debian/prerm debian/tmp/DEBIAN
-	$(MAKE) prefix=$$(pwd)/debian/tmp/usr install
-	strip debian/tmp/usr/bin/wisp
-	strip -R.comment -R.note debian/tmp/usr/bin/wisp
-	gzip -9v debian/tmp/usr/share/info/wisp.info
+
+install: build
+	dh_clean
+	dh_installdirs
+	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr \
+		mandir=$(CURDIR)/debian/tmp/usr/share/man \
+		infodir=$(CURDIR)/debian/tmp/usr/share/info \
+		install
+		      
+
+binary: install
+	dh_testdir
+	dh_testroot
+	dh_strip
+	dh_installdocs
+	dh_installchangelogs	
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums	
+	dh_builddeb
+
+
+.PHONY: binary clean install
+
+
+# XXX
+
+.PHONY: copyright
+copyright:
+	test -f debian/copyright || ( \
 	perl -npe 'exit if /full text of GPL/;' < COPYING \
-	        > debian/tmp/usr/share/doc/wisp/copyright
+	        > debian/copyright; \
 	( echo; \
 	  echo On Debian systems, a copy of the GNU General; \
 	  echo Public License is available in the file; \
 	  echo \'/usr/share/common-licenses/GPL\'; \
-	) >> debian/tmp/usr/share/doc/wisp/copyright
-	cd debian/tmp/usr/share/doc/wisp && chmod 644 copyright
-	install -m644 debian/changelog \
-                debian/tmp/usr/share/doc/wisp/changelog.Debian
-	cd debian/tmp/usr/share/doc/wisp && gzip -9v changelog.Debian
-	cd debian/tmp/usr/share/man/man1 && gzip -9v *.1
-	dpkg-shlibdeps src/wisp
-	dpkg-gencontrol -isp
-	chown -R root.root debian/tmp
-	chmod -R g-ws debian/tmp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-checkroot:
-	$(checkdir)
-	test $$(id -u) -eq 0
+	) >> debian/copyright )
 
-.PHONY: binary clean checkroot