[Pkg-tcltk-commits] r1790 - tcllib/trunk/debian

Wed Feb 10 10:45:36 UTC 2016

Author: sgolovan
Date: 2016-02-10 10:45:36 +0000 (Wed, 10 Feb 2016)
New Revision: 1790

Added:
   tcllib/trunk/debian/tcllib-critcl.install
Modified:
   tcllib/trunk/debian/changelog
   tcllib/trunk/debian/control
   tcllib/trunk/debian/dirs
   tcllib/trunk/debian/rules
Log:
[tcllib]
  * New upstream release.
  * Added a new optional tcllib-critcl package with some CPU-intensive
    code written in C and built with critcl.


Modified: tcllib/trunk/debian/changelog
===================================================================

--- tcllib/trunk/debian/changelog	2016-01-16 10:28:38 UTC (rev 1789)
+++ tcllib/trunk/debian/changelog	2016-02-10 10:45:36 UTC (rev 1790)
@@ -1,8 +1,10 @@
-tcllib (1.17-dfsg-2) UNRELEASED; urgency=medium
+tcllib (1.18-dfsg-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Added a new optional tcllib-critcl package with some CPU-intensive
+    code written in C and built with critcl.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 23 May 2015 09:58:57 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 06 Feb 2016 09:49:51 +0300
 
 tcllib (1.17-dfsg-1) unstable; urgency=medium
 

Modified: tcllib/trunk/debian/control
===================================================================
--- tcllib/trunk/debian/control	2016-01-16 10:28:38 UTC (rev 1789)
+++ tcllib/trunk/debian/control	2016-02-10 10:45:36 UTC (rev 1790)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 8.9.7)
+Build-Depends: debhelper (>= 8.9.7), critcl
 Build-Depends-Indep: tcl-dev
 Standards-Version: 3.9.6
 Homepage: https://core.tcl.tk/tcllib/home
@@ -13,6 +13,7 @@
 Priority: optional
 Architecture: all
 Depends: ${tclsh:Depends}, ${misc:Depends}
+Suggests: tcllib-critcl
 Description: Standard Tcl Library
  Tcllib, the standard Tcl library, is a collection of common utility
  functions and modules all written in high-level Tcl.
@@ -133,3 +134,17 @@
    * wip: word interpreter
    * yaml: YAML format encoder/decoder
    * zip: working with zip archives
+
+Package: tcllib-critcl
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlib:Depends}, ${misc:Depends}
+Multi-Arch: same
+Enhances: tcllib
+Description: Standard Tcl Library (CriTcl accelerators)
+ Tcllib, the standard Tcl library, is a collection of common utility
+ functions and modules all written in high-level Tcl.
+ .
+ This package includes several Tcllib CPU intensive procedures rewritten
+ in C and built with CriTcl.

Modified: tcllib/trunk/debian/dirs
===================================================================
--- tcllib/trunk/debian/dirs	2016-01-16 10:28:38 UTC (rev 1789)
+++ tcllib/trunk/debian/dirs	2016-02-10 10:45:36 UTC (rev 1790)
@@ -1,4 +1,5 @@
 usr/bin
+usr/lib/tcltk
 usr/share/man
 usr/share/tcltk
 usr/share/doc/tcllib

Modified: tcllib/trunk/debian/rules
===================================================================
--- tcllib/trunk/debian/rules	2016-01-16 10:28:38 UTC (rev 1789)
+++ tcllib/trunk/debian/rules	2016-02-10 10:45:36 UTC (rev 1790)
@@ -1,10 +1,13 @@
 #!/usr/bin/make -f
 # debian/rules that uses debhelper.
 
+include /usr/share/dpkg/architecture.mk
+
 destdir=debian/tmp
 mandir=/usr/share/man
 docdir=/usr/share/doc/tcllib
 exampledir=$(docdir)/examples
+tcllibcdir=debian/tcllib-critcl/usr/lib/tcltk/tcllibc
 
 %:
 	dh $@
@@ -18,7 +21,13 @@
 	rm -f config.cache config.status
 	dh_clean
 
-# Build mostly covers docs and such
+# Build-arch works with the critcl part
+override_dh_auto_build-arch:
+	dh_testdir
+	#
+	$(MAKE) critcl
+
+# Build-indep mostly covers docs and such
 override_dh_auto_build-indep:
 	dh_testdir
 	#
@@ -37,6 +46,8 @@
 	# Disable tests (TODO: add all required packages to build dependencies
 	# and enable tests)
 
+override_dh_auto_install-arch:
+
 override_dh_auto_install-indep:
 	dh_testdir
 	#
@@ -109,8 +120,24 @@
 	#
 	# generate documentation index
 	tclsh debian/gen_index.tcl doc/html >$(destdir)/index.html
+
+override_dh_install-arch:
+	dh_install -a
 	#
-	dh_install -i
+	# remove unneded files
+	rm $(tcllibcdir)/license.terms
+	rm $(tcllibcdir)/teapot.txt
+	#
+	# relocate library file
+	mv $(tcllibcdir)/*/*.so $(tcllibcdir)/
+	sed -i -e 's/file join \$$path/file join \$$dir/' $(tcllibcdir)/pkgIndex.tcl
+	#
+	# move all the library
+	mkdir debian/tcllib-critcl/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+	mv $(tcllibcdir) debian/tcllib-critcl/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+	#
+	# cleanup
+	find debian/tcllib-critcl -type d -empty -delete
 
 override_dh_compress:
 	dh_compress -Xusr/share/doc/tcllib/examples/ \
@@ -120,7 +147,7 @@
 	tcltk-depends
 	dh_gencontrol
 
-v=1.17
+v=1.18
 
 get-orig-source:
 	CURDIR=`pwd` && \
@@ -134,6 +161,7 @@
 	tar -Jcf $$CURDIR/tcllib_$(v)-dfsg.orig.tar.xz tcllib-$(v) && \
 	rm -rf $$TMPDIR
 
-.PHONY: override_dh_clean override_dh_auto_build-indep override_dh_auto_install-indep \
+.PHONY: override_dh_clean
+	override_dh_auto_build-arch override_dh_auto_install-arch override_dh_install-arch \
+	override_dh_auto_build-indep override_dh_auto_install-indep \
 	override_dh_compress override_dh_gencontrol get-orig-source
-

Added: tcllib/trunk/debian/tcllib-critcl.install
===================================================================
--- tcllib/trunk/debian/tcllib-critcl.install	                        (rev 0)
+++ tcllib/trunk/debian/tcllib-critcl.install	2016-02-10 10:45:36 UTC (rev 1790)
@@ -0,0 +1 @@
+modules/tcllibc		usr/lib/tcltk


