[Pkg-tcltk-commits] r1350 - in tcllib/trunk/debian: . patches source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat May 11 14:49:10 UTC 2013
Author: sgolovan
Date: 2013-05-11 14:49:10 +0000 (Sat, 11 May 2013)
New Revision: 1350
Added:
tcllib/trunk/debian/docs
tcllib/trunk/debian/install
tcllib/trunk/debian/manpages
tcllib/trunk/debian/source/
tcllib/trunk/debian/source/format
Removed:
tcllib/trunk/debian/patches/build.diff
tcllib/trunk/debian/patches/ini.diff
tcllib/trunk/debian/patches/manpages.diff
Modified:
tcllib/trunk/debian/changelog
tcllib/trunk/debian/compat
tcllib/trunk/debian/control
tcllib/trunk/debian/patches/series
tcllib/trunk/debian/rules
Log:
[tcllib]
* Switched to 3.0 (quilt) source package format.
* Bumped standards version to 3.9.4.
* Use debhelper 8.9.7 features in debian/rules and updated the build
dependency accordingly.
* Removed unecessary patch of Makefile.in (closes: #702520).
* Renamed manpages which conflict with ones from the tcl8.6-doc and
tcl-memchan packages (closes: #700501, #702502, #704641).
* Removed incorrect install-stamp.gz from the binary package
(closes: #700503).
* Removed unnecessary patch which fixed whatis entries.
Modified: tcllib/trunk/debian/changelog
===================================================================
--- tcllib/trunk/debian/changelog 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/changelog 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1,9 +1,25 @@
-tcllib (1.14-dfsg-4) UNRELEASED; urgency=low
+tcllib (1.15-dfsg-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Switched to 3.0 (quilt) source package format.
+ * Bumped standards version to 3.9.4.
+ * Use debhelper 8.9.7 features in debian/rules and updated the build
+ dependency accordingly.
+ * Removed unecessary patch of Makefile.in (closes: #702520).
+ * Renamed manpages which conflict with ones from the tcl8.6-doc and
+ tcl-memchan packages (closes: #700501, #702502, #704641).
+ * Removed incorrect install-stamp.gz from the binary package
+ (closes: #700503).
+ * Removed unnecessary patch which fixed whatis entries.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 26 Jun 2012 16:59:00 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 11 May 2013 18:48:26 +0400
+tcllib (1.15-dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ * Removed patch for inifile module.
+
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 06 Feb 2013 23:06:05 +0400
+
tcllib (1.14-dfsg-3) unstable; urgency=low
* Added a patch which fixes ::ini::commit procedure in the inifile module.
Modified: tcllib/trunk/debian/compat
===================================================================
--- tcllib/trunk/debian/compat 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/compat 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1 +1 @@
-5
+8
Modified: tcllib/trunk/debian/control
===================================================================
--- tcllib/trunk/debian/control 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/control 2013-05-11 14:49:10 UTC (rev 1350)
@@ -3,9 +3,9 @@
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 (>= 5.0.0), quilt
+Build-Depends: debhelper (>= 8.9.7)
Build-Depends-Indep: tcl-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://tcl.activestate.com/software/tcllib/
Package: tcllib
@@ -28,6 +28,7 @@
* bibtex: parser for bibliographies in BibTeX format
* blowfish: blowfish encryption
* cache: asynchronous in-memory cache
+ * clock: date/time utilities
* cmdline: a command line argument processor similar to opt
* comm: remote communications facility
* control: procedures for control flow structures
@@ -44,6 +45,7 @@
* ftp: Tcl interface to the FTP protocol
* ftpd: implementation of functions needed for an FTP server
* fumagic: file utilities
+ * generator: Tcl generator commands
* gpx: GPS eXchange Format (GPX)
* grammar_aycock: Aycock-Horspool-Earley parser generator for Tcl
* grammar_fa: finite automaton operations and usage
@@ -121,3 +123,4 @@
* virtchannel: reflected/virtual channel support
* wip: word interpreter
* yaml: YAML format encoder/decoder
+ * zip: working with zip archives
Added: tcllib/trunk/debian/docs
===================================================================
--- tcllib/trunk/debian/docs (rev 0)
+++ tcllib/trunk/debian/docs 2013-05-11 14:49:10 UTC (rev 1350)
@@ -0,0 +1,2 @@
+doc/html
+debian/tmp/index.html
Added: tcllib/trunk/debian/install
===================================================================
--- tcllib/trunk/debian/install (rev 0)
+++ tcllib/trunk/debian/install 2013-05-11 14:49:10 UTC (rev 1350)
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin
+debian/tmp/usr/lib/* usr/share/tcltk
Added: tcllib/trunk/debian/manpages
===================================================================
--- tcllib/trunk/debian/manpages (rev 0)
+++ tcllib/trunk/debian/manpages 2013-05-11 14:49:10 UTC (rev 1350)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/mann/*
Deleted: tcllib/trunk/debian/patches/build.diff
===================================================================
--- tcllib/trunk/debian/patches/build.diff 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/patches/build.diff 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1,17 +0,0 @@
---- tcllib-1.12-dfsg.orig/Makefile.in
-+++ tcllib-1.12-dfsg/Makefile.in
-@@ -49,12 +49,14 @@
- all:
- doc: html-doc nroff-doc
-
-+# set -app-path for Debian to hack around broken script
- install:
- $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/installer.tcl` \
- -no-examples -no-html \
- -pkg-path $(DESTDIR)$(pkglibdir) \
- -app-path $(DESTDIR)$(bindir) \
- -nroff-path $(DESTDIR)$(mandir)/mann \
-+ -app-path $(DESTDIR)/usr/bin \
- -no-wait -no-gui
-
- install-libraries:
Deleted: tcllib/trunk/debian/patches/ini.diff
===================================================================
--- tcllib/trunk/debian/patches/ini.diff 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/patches/ini.diff 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1,15 +0,0 @@
-Author: Upstream
-Description: Patch fixes ::ini::commit
-Last-updated: Tue, 26 Jun 2012 16:25:46 +0400
-
---- tcllib-1.14-dfsg.orig/modules/inifile/ini.tcl
-+++ tcllib-1.14-dfsg/modules/inifile/ini.tcl
-@@ -89,7 +89,7 @@
- }
- puts $channel ""
- }
-- close $channel
-+ ::close $channel
- ::set channel [::open $file r+]
- return
- }
Deleted: tcllib/trunk/debian/patches/manpages.diff
===================================================================
--- tcllib/trunk/debian/patches/manpages.diff 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/patches/manpages.diff 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1,42 +0,0 @@
-Patch by Sergei Golovan fixes bad whatis entries for older versions of
-struct::graph, struct::matrix and struct::tree packages.
-
---- tcllib-1.12-dfsg.orig/modules/struct/graph1.man
-+++ tcllib-1.12-dfsg/modules.struct/graph1.man
-@@ -1,8 +1,8 @@
- [comment {-*- tcl -*-}]
--[manpage_begin {struct::graph v1} n 1.2.1]
-+[manpage_begin {struct::graph1} n 1.2.1]
- [copyright {2002 Andreas Kupries <andreas_kupries at users.sourceforge.net>}]
- [moddesc {Tcl Data Structures}]
--[titledesc {Create and manipulate directed graph objects}]
-+[titledesc {Create and manipulate directed graph objects (version 1)}]
- [category {Data structures}]
- [require Tcl 8.2]
- [require struct::graph [opt 1.2.1]]
---- tcllib-1.12-dfsg.orig/modules/struct/matrix1.man
-+++ tcllib-1.12-dfsg/modules.struct/matrix1.man
-@@ -1,8 +1,8 @@
- [comment {-*- tcl -*-}]
--[manpage_begin {struct::matrix v1} n 1.2.1]
-+[manpage_begin {struct::matrix1} n 1.2.1]
- [copyright {2002 Andreas Kupries <andreas_kupries at users.sourceforge.net>}]
- [moddesc {Tcl Data Structures}]
--[titledesc {Create and manipulate matrix objects}]
-+[titledesc {Create and manipulate matrix objects (version 1)}]
- [category {Data structures}]
- [require Tcl 8.2]
- [require struct::matrix [opt 1.2.1]]
---- tcllib-1.12-dfsg.orig/modules/struct/struct_tree1.man
-+++ tcllib-1.12-dfsg/modules.struct/struct_tree1.man
-@@ -1,8 +1,8 @@
- [comment {-*- tcl -*-}]
--[manpage_begin {struct::tree v1} n 1.2.2]
-+[manpage_begin {struct::tree1} n 1.2.2]
- [copyright {2002 Andreas Kupries <andreas_kupries at users.sourceforge.net>}]
- [moddesc {Tcl Data Structures}]
--[titledesc {Create and manipulate tree objects}]
-+[titledesc {Create and manipulate tree objects (version 1)}]
- [category {Data structures}]
- [require Tcl 8.2]
- [require struct::tree [opt 1.2.2]]
Modified: tcllib/trunk/debian/patches/series
===================================================================
--- tcllib/trunk/debian/patches/series 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/patches/series 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1,3 +1 @@
-build.diff
-manpages.diff
-ini.diff
+#
Modified: tcllib/trunk/debian/rules
===================================================================
--- tcllib/trunk/debian/rules 2013-05-06 09:39:33 UTC (rev 1349)
+++ tcllib/trunk/debian/rules 2013-05-11 14:49:10 UTC (rev 1350)
@@ -1,60 +1,45 @@
#!/usr/bin/make -f
# debian/rules that uses debhelper.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export QUILT_PATCHES := debian/patches
-
-destdir=debian/tcllib
+destdir=debian/tmp
mandir=/usr/share/man
docdir=/usr/share/doc/tcllib
exampledir=$(docdir)/examples
-unpatch:
- dh_testdir
- quilt pop -a || test $$? = 2
- rm -rf patch-stamp .pc
+%:
+ dh $@
-patch: patch-stamp
-patch-stamp:
+override_dh_clean:
dh_testdir
- quilt push -a || test $$? = 2
- touch patch-stamp
+ dh_testroot
+ #
+ [ ! -f Makefile ] || $(MAKE) distclean
+ #
+ rm -f config.cache config.status
+ dh_clean
-# build mostly covers docs and such
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: patch-stamp
+# Build mostly covers docs and such
+override_dh_auto_build-indep:
dh_testdir
- ./configure --prefix=/usr --mandir=$(mandir)
+ #
$(MAKE) html-doc
#
# Remove doc for non-existent module
rm doc/html/exif.html
#
- touch build-stamp
+ # Fix broken examples permissions
+ chmod 644 examples/csv/bench_join
+ chmod 644 examples/logger/snit-logger.tcl
+ chmod 644 examples/logger/xotcl-logger.tcl
+ chmod 644 examples/mapproj/*
-clean: clean-patched unpatch
- dh_testdir
- dh_testroot
- dh_clean
+override_dh_auto_test:
+ # Disable tests (TODO: add all required packages to build dependencies
+ # and enable tests)
-clean-patched: patch-stamp
+override_dh_auto_install-indep:
dh_testdir
#
- [ ! -f Makefile ] || $(MAKE) distclean
- #
- rm -f build-stamp install-stamp
- rm -f config.cache config.status
-
-install: build install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_installdirs
- #
$(MAKE) DESTDIR=$(destdir) install
#
# install the mpexpand script, which doesn't otherwise get installed.
@@ -65,37 +50,43 @@
find . -type f -print | xargs chmod 644
#
# move scripts to /usr/share
- mv $(destdir)/usr/lib/* $(destdir)/usr/share/tcltk
- rmdir $(destdir)/usr/lib
+ #mv $(destdir)/usr/lib/* $(destdir)/usr/share/tcltk
+ #rmdir $(destdir)/usr/lib
#
# rename the man pages into section 3
- mv $(destdir)$(mandir)/mann $(destdir)$(mandir)/man3
+ #mv $(destdir)$(mandir)/mann $(destdir)$(mandir)/man3
#
- # move the man pages for mpexpand, dtplite, page and mpexpand to section 1
- mkdir $(destdir)$(mandir)/man1
- mv $(destdir)$(mandir)/man3/mpexpand.n $(destdir)$(mandir)/man1
- mv $(destdir)$(mandir)/man3/dtplite.n $(destdir)$(mandir)/man1
- mv $(destdir)$(mandir)/man3/page.n $(destdir)$(mandir)/man1
- mv $(destdir)$(mandir)/man3/tcldocstrip.n $(destdir)$(mandir)/man1
+ # move the man pages for command line utilities to section 1
+ #mkdir $(destdir)$(mandir)/man1
+ #for f in dtplite mpexpand nns nnsd nnslog page tcldocstrip ; do \
+ # mv $(destdir)$(mandir)/man3/$$f.n $(destdir)$(mandir)/man1 ; \
+ #done
#
# cleanup manpages
- cd $(destdir)$(mandir)/man1 && \
- for f in *.n ; do \
+ cd $(destdir)$(mandir)/mann && \
+ for f in dtplite mpexpand nns nnsd nnslog page tcldocstrip ; do \
sed -e'/\.so man.macros/ d' \
-e's/^\.TH \([^ ]\+\) n/.TH \1 1/' \
- -e's/try(n)/(3tcllib)/g' \
-e's/(n)/(3tcl)/g' \
-e's/^\.dtx/\\\&.dtx/' \
-e's/^\.\.\(.\)/\\\&..\1/' \
- $$f > `basename $$f .n`.1; \
- rm $$f; \
+ $$f.n > $$f.1; \
+ rm $$f.n; \
done
#
- cd $(destdir)$(mandir)/man3 && \
+ cd $(destdir)$(mandir)/mann && \
for f in *.n ; do \
sed -e'/\.so man.macros/ d' \
-e's/^\.TH "math::roman" 1\.0/.TH "math::roman" 3tcl 1.0/' \
- -e's/^\.TH "try" [in] /.TH "try" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::fifo" [in] /.TH "tcl::chan::fifo" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::fifo2" [in] /.TH "tcl::chan::fifo2" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::memchan" [in] /.TH "tcl::chan::memchan" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::null" [in] /.TH "tcl::chan::null" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::random" [in] /.TH "tcl::chan::random" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::string" [in] /.TH "tcl::chan::string" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::variable" [in] /.TH "tcl::chan::variable" 3tcllib /' \
+ -e's/^\.TH "tcl::chan::zero" [in] /.TH "tcl::chan::zero" 3tcllib /' \
+ -e's/^\.TH "tcl::transform::zlib" [in] /.TH "tcl::transform::zlib" 3tcllib /' \
-e's/^\.TH \(.\+\) [in] /.TH \1 3tcl /' \
-e's/send(n)/send(3tk)/g' \
-e's/(n)/(3tcl)/g' \
@@ -113,63 +104,42 @@
-e's/^\.mycombo/\\\&.mycombo/' \
$$f > `basename $$f .n`.3tcl; \
rm $$f; \
- done && \
- mv try.3tcl try.3tcllib
- touch install-stamp
+ done
#
# cleanup docs
cd doc/html && \
for f in *.html ; do \
sed -i -e's/\(^\|[^:]\+\)send(n)/\1send(3tk)/g' \
-e's/math::roman()/math::roman(3tcl)/' \
- -e's/try(n)/try(3tcllib)/' \
-e's/(n)/(3tcl)/g' $$f; \
done
#
# generate documentation index
- tclsh debian/gen_index.tcl doc/html >$(destdir)$(docdir)/index.html
+ tclsh debian/gen_index.tcl doc/html >$(destdir)/index.html
+ #
+ dh_install -i
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs doc/html
- dh_installexamples
- # fix some broken permissions
- chmod 644 $(destdir)$(exampledir)/csv/bench_join
- chmod 644 $(destdir)$(exampledir)/math/bigfloat.demo.tcl
- chmod 644 $(destdir)$(exampledir)/logger/snit-logger.tcl
- chmod 644 $(destdir)$(exampledir)/logger/xotcl-logger.tcl
- chmod 644 $(destdir)$(exampledir)/mapproj/*
- dh_installchangelogs ChangeLog
- dh_link
+override_dh_compress:
dh_compress -Xusr/share/doc/tcllib/examples/ \
-Xusr/share/doc/tcllib/html/
- dh_fixperms
- dh_installdeb
+
+override_dh_gencontrol:
tcltk-depends
dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary-arch: build install
+v=1.15
-binary: binary-indep binary-arch
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-VER=1.14
-
get-orig-source:
CURDIR=`pwd` && \
TMPDIR=`mktemp -d /tmp/tcllib.XXXXXX` && \
cd $$TMPDIR && \
- wget -O - http://prdownloads.sourceforge.net/tcllib/tcllib-$(VER).tar.gz | tar -zx && \
+ wget -O - http://prdownloads.sourceforge.net/tcllib/tcllib-$(v).tar.gz | tar -zx && \
for f in `grep -rl '^Network Working Group' *` ; do \
echo "REMOVING NON-FREE RFC $$f" ; rm -f $$f ; \
done && \
- tar -zcf $$CURDIR/tcllib_$(VER)-dfsg.orig.tar.gz tcllib-$(VER) && \
+ tar -zcf $$CURDIR/tcllib_$(v)-dfsg.orig.tar.gz tcllib-$(v) && \
rm -rf $$TMPDIR
-.PHONY: patch unpatch clean-patched build build-indep build-arch clean binary-indep binary-arch binary install get-orig-source
+.PHONY: override_dh_clean override_dh_auto_build-indep override_dh_auto_install-indep \
+ override_dh_compress override_dh_gencontrol get-orig-source
Added: tcllib/trunk/debian/source/format
===================================================================
--- tcllib/trunk/debian/source/format (rev 0)
+++ tcllib/trunk/debian/source/format 2013-05-11 14:49:10 UTC (rev 1350)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-tcltk-commits
mailing list