[Pkg-tcltk-commits] r605 - tdom/trunk/debian

ssoberni-guest at alioth.debian.org ssoberni-guest at alioth.debian.org
Wed May 14 01:48:36 UTC 2008


Author: ssoberni-guest
Date: 2008-05-14 01:48:35 +0000 (Wed, 14 May 2008)
New Revision: 605

Modified:
   tdom/trunk/debian/changelog
   tdom/trunk/debian/control
   tdom/trunk/debian/rules
Log:
Adding tdom-dev, clean-up of debian/rules, amending debian/control

Modified: tdom/trunk/debian/changelog
===================================================================
--- tdom/trunk/debian/changelog	2008-05-12 13:14:13 UTC (rev 604)
+++ tdom/trunk/debian/changelog	2008-05-14 01:48:35 UTC (rev 605)
@@ -1,8 +1,16 @@
 tdom (0.8.3-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
+  * Fixing clean target in debian/rules, turning it less verbose and
+    making call to upstream distclean target conditional
+  * Generalised build dependencies in source package to tcl-dev and
+    changed --with-tcl path accordingly
+  * Taking care of arch-independent file tdom.tcl
+  * Adding a dedicated tdom-dev binary package
+  * Fixed description of tdom binary package
+  * Added missing debian/control information
 
- -- Stefan Sobernig <ssoberni at atvie-debian4rc02.localdomain>  Sat, 26 Apr 2008 20:55:22 +0200
+ -- Stefan Sobernig <ssoberni at atvie-debian4rc02.localdomain>  Sun, 27 Apr 2008 22:18:26 +0200
 
 tdom (0.8.2-1) unstable; urgency=low
 

Modified: tdom/trunk/debian/control
===================================================================
--- tdom/trunk/debian/control	2008-05-12 13:14:13 UTC (rev 604)
+++ tdom/trunk/debian/control	2008-05-14 01:48:35 UTC (rev 605)
@@ -1,42 +1,35 @@
 Source: tdom
-Section: interpreters
+Section: libs
 Priority: optional
 Maintainer: Avni Khatri and Carl Blesius <tdom at blesius.org>
-Build-Depends: debhelper (>= 4.0.0), tcl8.4-dev
+Build-Depends: debhelper (>= 5), autotools-dev, tcl-dev (>= 8.4)
 Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/viewsvn/pkg-tcltk/tdom/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-tcltk/tdom/
 
 Package: tdom
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A fast XML/DOM/XPath/XSLT package for Tcl written in C
- tDOM contains:
- .
-    *  the newest version of Expat, the XML parser from James Clark,
-       including namesspace and DTD support.
- .
-    *  a modified version of Steve Ball's Tclexpat, the Tcl interface to 
-       expat, for event-like (SAX-like) XML parsing. The modifications
-       are for performance improvements, to make the newest Expat
-       features (XML namespace) available and for some additional features.
- .
-    *  a (partial) DOM I and II implementation in C for maximum
-       performance and minimum memory need following the W3C DOM Core
-       Level 1 recommendation using an OO-like syntax.
- .
-    *  a very complete, compliant and fast XPath implementation in C
-       following the November 99 W3C recommendation.
- .
-    *  a fast XSLT implementation in C following the W3C Recommendation
-       16 November 1999.
- .
-    *  a (partial) implementation in C of the XPointer (97) navigational 
-       functions.
- .
-    *  UTF-8 to 8 bit encoding back conversion functionality to support
-       Tcl version < 8.1x
- .
-    *  optional DTD validation
- .
-    *  additional convenience methods
- .
-    *  documentation in TMML, HTML and nroff formats
+Section: libs
+Depends: tcl (>=8.4), ${shlibs:Depends}, ${misc:Depends}
+Homepage: http://www.tdom.org
+Description: A fast XML/DOM/XPath/XSLT extension for Tcl written in C
+ tDOM takes advantage of the newest version of Expat, the XML parser
+ from James Clark, including namesspace and DTD support. It
+ includes a modified version of Steve Ball's Tclexpat, the Tcl
+ interface to expat, for event-like (SAX-like) XML parsing. Besides,
+ it comes with a (partial) DOM I and II implementation in C for maximum
+ performance and minimum memory need following the W3C DOM Core
+ Level 1 recommendation using an OO-like syntax. A very complete,
+ compliant and fast XPath implementation following the November 99 W3C
+ recommendation is provided.  A fast XSLT implementation in C
+ following the W3C Recommendation 16 November 1999 completes the
+ feature set. Documentation is provided in TMML, HTML and nroff formats.
+
+Package: tdom-dev
+Section: libdevel
+Priority: optional
+Architecture: any
+Depends: tdom (= ${binary:Version})
+Homepage: http://www.tdom.org/
+Description: A fast XML/DOM/XPath/XSLT extension for Tcl written in C - development files
+ Header files and static libraries for libtdom.

Modified: tdom/trunk/debian/rules
===================================================================
--- tdom/trunk/debian/rules	2008-05-12 13:14:13 UTC (rev 604)
+++ tdom/trunk/debian/rules	2008-05-14 01:48:35 UTC (rev 605)
@@ -12,8 +12,6 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-TCL_VERSION=8.4
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -25,10 +23,28 @@
 	INSTALL_PROGRAM += -s
 endif
 
+#
+# Extract version information from autoconf meta-data
+#
+
+
+VERSION=$(shell grep -m 1 AC_INIT configure.in | sed -e 's/AC_INIT(\[tdom\], \[//g' -e 's/\])//g')
+DEV=$(CURDIR)/debian/tdom-dev
+ARCH_DEPENDENT=$(CURDIR)/debian/tdom/usr/lib/tcltk
+
 config.status: configure
 	dh_testdir
-# Add here commands to configure the package.
-	( cd unix ; ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-tcl=/usr/lib/tcl$(TCL_VERSION) --libdir=\$${prefix}/lib/tcltk --enable-threads )
+	# Add here commands to configure the package.
+	( cd unix ; ../configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--prefix=$(CURDIR)/debian/tdom/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--with-tcl=/usr/lib/ \
+		--libdir=\$${prefix}/lib/tcltk \
+		--enable-threads \
+		--includedir=$(DEV)/usr/include/tdom )
 
 
 build: build-stamp
@@ -47,28 +63,49 @@
 	dh_testroot
 	rm -f build-stamp 
 
-# Add here commands to clean up after the build process.
-	-( cd unix; $(MAKE) distclean )
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	# Add here commands to clean up after the build process.
+	-( cd unix; [ ! -f Makefile ] || $(MAKE) distclean; )
 
-	rm -f config.log
+	dh_clean config.log config.status config.cache config.guess config.sub
 
-	dh_clean 
-
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	
-# Add here commands to install the package into debian/tdom.
-	( cd unix/ ; $(MAKE) install DESTDIR=$(CURDIR)/debian/tdom/ )
 
+	# Add here commands to install the package into debian/tdom.
+	# ( cd unix/ ; $(MAKE) install DESTDIR=$(CURDIR)/debian/tdom/ )
+	( cd unix/ ; $(MAKE) install )	
 
+	# move tdom.tcl and fix pkgIndex.tcl
+	install -d -m 755 -o root -g root $(CURDIR)/debian/tdom/usr/share/tcltk/tdom$(VERSION)
+	mv $(ARCH_DEPENDENT)/tdom$(VERSION)/tdom.tcl $(CURDIR)/debian/tdom/usr/share/tcltk/tdom$(VERSION)
+
+	perl -i -p -e "s|\\\$$dir tdom.tcl|/usr/share/tcltk/tdom$(VERSION) tdom.tcl|g" $(ARCH_DEPENDENT)/tdom$(VERSION)/pkgIndex.tcl	
+	# tdom-dev
+	# install -d -m 755 -o root -g root $(DEV)/usr/include/tdom
+	# cp -R $(TARGET)/usr/include/tdom/* $(DEV)/usr/include/tdom
+
+	# move and fix tdomConfig.sh
+	install -d -m 755 -o root -g root $(DEV)/usr/share/tcltk/tdom$(VERSION)
+	mv $(ARCH_DEPENDENT)/tdomConfig.sh $(DEV)/usr/share/tcltk/tdom$(VERSION)/
+
+	perl -i -p \
+	-e "s|^(TDOM_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/tdom$(VERSION) -ltdomstub$(VERSION)'|;" \
+	-e "s|^(TDOM_BUILD_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/tdom$(VERSION)/libtdomstub$(VERSION).a'|;" \
+	-e "s|^(TDOM_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib/tcltk/tdom$(VERSION) -ltdomstub$(VERSION)'|;" \
+	-e "s|^(TDOM_STUB_LIB_PATH)=.*$$|\1='/usr/lib/tcltk/tdom$(VERSION)/libtdomstub$(VERSION).a'|;" \
+	$(DEV)/usr/share/tcltk/tdom$(VERSION)/tdomConfig.sh
+
+	install -d -m 755 -o root -g root $(DEV)/usr/lib/tcltk/tdom$(VERSION)
+
+	# `- provide symlinks 
+	(cd $(DEV)/usr/lib; \
+	ln -sf ../share/tcltk/tdom$(VERSION)/tdomConfig.sh;)
+
+	# move tDOM stub library
+	mv $(ARCH_DEPENDENT)/tdom$(VERSION)/*.a $(DEV)/usr/lib/tcltk/tdom$(VERSION)/
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -93,7 +130,7 @@
 	dh_installman
 
 	# Delete unused /usr/bin directory, created by Makefile.in
-	rmdir debian/tdom/usr/bin
+	# rmdir debian/tdom/usr/bin
 
 	dh_link
 	dh_strip




More information about the Pkg-tcltk-commits mailing list