[Pkg-tcltk-commits] r544 - xotcl/trunk/debian

ssoberni-guest at alioth.debian.org ssoberni-guest at alioth.debian.org
Wed Mar 5 14:58:39 UTC 2008 

Author: ssoberni-guest
Date: 2008-03-05 14:58:37 +0000 (Wed, 05 Mar 2008)
New Revision: 544

Modified:
   xotcl/trunk/debian/control
   xotcl/trunk/debian/rules
   xotcl/trunk/debian/xotcl.lintian-overrides
Log:
Fixes for second round of review by sgolovan and frankie; added xotcl-shells binary package

Modified: xotcl/trunk/debian/control
===================================================================
--- xotcl/trunk/debian/control	2008-03-03 11:58:26 UTC (rev 543)
+++ xotcl/trunk/debian/control	2008-03-05 14:58:37 UTC (rev 544)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
-Uploaders: Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>, Francesco P. Lovergine <frankie at debian.org>, Sergei Golovan <sgolovan at debian.org>
+Uploaders: Stefan Sobernig <stefan.sobernig at wu-wien.ac.at>
 Build-Depends: debhelper (>= 5), autotools-dev, tcl-dev (>= 8.4), tk-dev (>= 8.4)
 Standards-Version: 3.7.3
 XS-X-Vcs-Svn: svn://svn.debian.org/viewsvn/pkg-tcltk/xotcl/
@@ -11,8 +11,8 @@
 Package: xotcl
 Section: libs
 Architecture: any
-Depends: libc6, tcl (>=8.4), tk (>= 8.4)
-Homepage: http://www.xotcl.org
+Depends: tcl (>=8.4), ${shlibs:Depends}
+Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - shared library
  Extended Object Tcl (for short: XOTcl, pronounced exotickle) is an
  object-oriented scripting language based on Tcl. It was originally
@@ -22,15 +22,26 @@
  constraining system developers. The basic object model is highly
  influenced by CLOS.
 
+Package: xotcl-shells
+Section: utils
+Architecture: any
+Depends: xotcl (= ${binary:Version}), tk (>=8.4), ${shlibs:Depends}
+Priority: optional
+Homepage: http://www.xotcl.org/
+Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - shells
+ This package provides you with two Tcl/Tk shell wrappers, xotclsh and
+ xowish. These shells offer ready-made environments for
+ XOTcl-empowered scripting.
+
 Package: xotcl-doc
 Section: doc
 Priority: optional
 Architecture: all
-Homepage: http://www.xotcl.org
+Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - manual
  This package brings the official XOTcl language reference and a
  comprehensive tutorial to you. They are registered with the doc-base
- family of tools. Moreover, you will find code examples for using
+ family of tools. Moreover, you will find code examples on how to use
  various XOTcl features and packages. 
 
 Package: xotcl-dev
@@ -38,7 +49,7 @@
 Priority: optional
 Architecture: any
 Depends: xotcl (= ${binary:Version})
-Homepage: http://www.xotcl.org
+Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for Tcl - development files
  Header files and static libraries for libxotcl.
 
@@ -46,8 +57,8 @@
 Section: web
 Priority: optional
 Architecture: all
-Depends: xotcl (>= ${binary:Version})
-Recommends: aolserver4 (>= 4)
+Depends: xotcl (>= ${binary:Version}), aolserver4 (>= 4)
+Homepage: http://www.xotcl.org/
 Description: Extended Object Tcl (XOTcl): Object orientation for AOLServer - module
  This package provides the XOTcl module for the AOLSERVER 4.0.10/4.5
  webserver.

Modified: xotcl/trunk/debian/rules
===================================================================
--- xotcl/trunk/debian/rules	2008-03-03 11:58:26 UTC (rev 543)
+++ xotcl/trunk/debian/rules	2008-03-05 14:58:37 UTC (rev 544)
@@ -42,6 +42,7 @@
 ARCH_INDEPENDENT=$(EXTENSION)/usr/share/tcltk
 DEV=$(EXTENSION)-dev
 DOC=$(EXTENSION)-doc
+SHELLS=$(EXTENSION)-shells
 AOL=$(DEB)/aolserver4-xotcl
 DOCDIR=$(DOC)/usr/share/doc/xotcl-doc
 
@@ -96,11 +97,9 @@
 	$(MAKE) DESTDIR=$(TARGET) XOTCLSH=xotclsh install
 	# / / / / / / / / / / / / / / / / / / / / / / / / / / /
 	# xotcl
-	install -d -m 755 -o root -g root $(EXTENSION)/usr/bin
 	#install -d -m 755 -o root -g root $(EXTENSION)/usr/lib
 	install -d -m 755 -o root -g root $(ARCH_DEPENDENT)/xotcl$(VERSION)
 	install -d -m 755 -o root -g root $(ARCH_INDEPENDENT)
-	@cp -R $(TARGET)/usr/bin/* $(EXTENSION)/usr/bin/
 	@cp -R $(TARGET)/usr/lib/* $(ARCH_DEPENDENT)
 	for d in $$(cat $(DEB)/xotcl.arch_independent); do \
 		mv $(ARCH_DEPENDENT)/xotcl$(VERSION)/$$d $(ARCH_INDEPENDENT)/xotcl$(VERSION)-$$d; \
@@ -112,25 +111,35 @@
 	$(CURDIR)/debian/xotcl.lintian-overrides \
 	$(EXTENSION)/usr/share/lintian/overrides/xotcl
 
-	# `- fix build-related symlinks = remove it
-	(cd $(ARCH_DEPENDENT); \
-	rm -f libxotcl$(VERSION).so;)
-	#ln -sf ./xotcl$(VERSION)/libxotcl$(VERSION).so libxotcl$(VERSIO	N).so;)
+	# `- fix build-related symlinks
+	(cd $(EXTENSION)/usr/lib; \
+	ln -sf ./tcltk/xotcl$(VERSION)/libxotcl$(VERSION).so;)
+	@rm -f $(ARCH_DEPENDENT)/libxotcl$(VERSION).so
 
-		
+	
 	# fix lintian script-not-executable warnings
 	for f in $$(cat $(DEB)/xotcl.script-not-executable); do \
 		chmod 755 $(ARCH_INDEPENDENT)/xotcl$(VERSION)-$$f; \
 	done	
-
-	# man pages go with extension package (as required
-	# by Debian policy, section 12.1)
-	install -d -m 755 -o root -g root $(EXTENSION)/usr/share/man/man1
-	cp -R $(TARGET)/usr/share/man/man1/* $(EXTENSION)/usr/share/man/man1
 	
 	# remove misplaced/ inappropriate files
-	rm -f $(EXTENSION)/xotcl$(VERSION)/COPYRIGHT
+	rm -f $(ARCH_DEPENDENT)/xotcl$(VERSION)/COPYRIGHT
 
+	# xotcl-shells
+	install -d -m 755 -o root -g root $(SHELLS)/usr/bin
+	@cp -R $(TARGET)/usr/bin/* $(SHELLS)/usr/bin/
+
+	# man pages go with shells package (as required
+	# by Debian policy, section 12.1)
+	install -d -m 755 -o root -g root $(SHELLS)/usr/share/man/man1
+	cp -R $(TARGET)/usr/share/man/man1/* $(SHELLS)/usr/share/man/man1
+
+	# put lintian overrides in place
+	install -d -m 755 -o root -g root $(SHELLS)/usr/share/lintian/overrides	
+	install -m 644 -o root -g root \
+	$(CURDIR)/debian/xotcl-shells.lintian-overrides \
+	$(SHELLS)/usr/share/lintian/overrides/xotcl-shells
+
 	# xotcl-dev
 	install -d -m 755 -o root -g root $(DEV)/usr/include/xotcl
 	cp -R $(TARGET)/usr/include/xotcl/* $(DEV)/usr/include/xotcl
@@ -143,17 +152,20 @@
 	-e "s|^(XOTCL_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/xotcl$(VERSION) -lxotclstub$(VERSION)'|;" \
 	-e "s|^(XOTCL_INCLUDE_DIR)=.*$$|\1='/usr/include/xotcl'|;" \
 	-e "s|^(XOTCL_BUILD_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/xotcl$(VERSION)/libxotclstub$(VERSION).a'|;" \
+	-e "s|^(XOTCL_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/xotcl$(VERSION) -lxotcl$(VERSION)'|;" \
+	-e "s|^(XOTCL_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/xotcl$(VERSION) -lxotclstub$(VERSION)'|;" \
+	-e "s|^(XOTCL_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/xotcl$(VERSION)/libxotclstub$(VERSION).a'|;" \
 	$(DEV)/usr/share/tcltk/xotcl$(VERSION)/xotclConfig.sh
 
 	# `- provide symlinks 
 	install -d -m 755 -o root -g root $(DEV)/usr/lib/tcltk/xotcl$(VERSION)
-	
-	(cd $(DEV)/usr/lib/tcltk; \
-	ln -sf ../../share/tcltk/xotcl$(VERSION)/xotclConfig.sh;)
 
-	(cd $(DEV)/usr/lib/tcltk/xotcl$(VERSION); \
-	ln -sf ../../share/tcltk/xotcl$(VERSION)/xotclConfig.sh;)
+	(cd $(DEV)/usr/lib; \
+	ln -sf ../share/tcltk/xotcl$(VERSION)/xotclConfig.sh;)
 
+	# (cd $(DEV)/usr/lib/tcltk/xotcl$(VERSION); \
+	# ln -sf ../../share/tcltk/xotcl$(VERSION)/xotclConfig.sh;)
+
 	# move XOTCL stub library
 	mv $(ARCH_DEPENDENT)/xotcl$(VERSION)/*.a $(DEV)/usr/lib/tcltk/xotcl$(VERSION)/
 
@@ -207,34 +219,34 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installchangelogs -i ChangeLog
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a ChangeLog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
\ No newline at end of file

Modified: xotcl/trunk/debian/xotcl.lintian-overrides
===================================================================
--- xotcl/trunk/debian/xotcl.lintian-overrides	2008-03-03 11:58:26 UTC (rev 543)
+++ xotcl/trunk/debian/xotcl.lintian-overrides	2008-03-05 14:58:37 UTC (rev 544)
@@ -2,7 +2,3 @@
 # Lintian reports xotclsh/xowish as "unusual"
 # interpreters, otherwise ...
 xotcl: unusual-interpreter
-
-# / / / / / / / / / / / / / / / / / / / / / / / / / /
-# Lintian reports invalid man option -wmax (?)
-xotcl: manpage-has-errors-from-man

More information about the Pkg-tcltk-commits mailing list