[Pkg-tcltk-commits] r842 - in tcllib/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Thu Mar 19 15:16:40 UTC 2009
Author: sgolovan-guest
Date: 2009-03-19 15:16:40 +0000 (Thu, 19 Mar 2009)
New Revision: 842
Removed:
tcllib/trunk/debian/patches/blowfish.diff
Modified:
tcllib/trunk/debian/changelog
tcllib/trunk/debian/control
tcllib/trunk/debian/gen_index.tcl
tcllib/trunk/debian/patches/build.diff
tcllib/trunk/debian/patches/series
tcllib/trunk/debian/rules
tcllib/trunk/debian/watch
Log:
[tcllib]
* Merged changes from experimental branch.
* Use Sourceforge redirector in uscan control file debian/watch.
* Renamed random.3tcl manpage to random.3tcllib to prevent conflict with
the random manpage in libmemchan-tcl package.
Modified: tcllib/trunk/debian/changelog
===================================================================
--- tcllib/trunk/debian/changelog 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/changelog 2009-03-19 15:16:40 UTC (rev 842)
@@ -1,9 +1,19 @@
-tcllib (1.10-dfsg-4) UNRELEASED; urgency=low
+tcllib (1.11.1-dfsg-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Use Sourceforge redirector in uscan control file debian/watch.
+ * Renamed random.3tcl manpage to random.3tcllib to prevent conflict with
+ the random manpage in libmemchan-tcl package.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 8 Jun 2008 15:32:57 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 19 Mar 2009 17:55:04 +0300
+tcllib (1.11.1-dfsg-1) experimental; urgency=low
+
+ * New upstream release.
+ * Mangled debian version in uscan control file.
+ * Bumped standards version to 3.8.0.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 21 Dec 2008 12:23:04 +0300
+
tcllib (1.10-dfsg-3) unstable; urgency=low
* Protected quilt invocation in debian/rules to make it possible to convert
Modified: tcllib/trunk/debian/control
===================================================================
--- tcllib/trunk/debian/control 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/control 2009-03-19 15:16:40 UTC (rev 842)
@@ -5,7 +5,7 @@
Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
Build-Depends: debhelper (>= 5.0.0), quilt
Build-Depends-Indep: tcl-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://tcl.activestate.com/software/tcllib/
Package: tcllib
@@ -19,6 +19,7 @@
.
Modules included:
* aes: advanced encryption standard
+ * amazon-s3: Amazon S3 web service interface
* asn: an ASN.1 encoder and decoder
* base32: a base32 encoder and decoder
* base64: a base64 encoder and decoder
@@ -26,6 +27,7 @@
* bench: benchmark tool
* bibtex: parser for bibliographies in BibTeX format
* blowfish: blowfish encryption
+ * cache: asynchronous in-memory cache
* cmdline: a command line argument processor similar to opt
* comm: remote communications facility
* control: procedures for control flow structures
@@ -57,6 +59,7 @@
* json: JSON parser
* ldap: LDAP client and extended object interface
* log: functions to log messages with various facilities and levels
+ * map: mapping utilities
* mapproj: map projection routines
* math: common math functions like min, max, and others
* md4: md4 hashing functions
@@ -83,11 +86,13 @@
* ripemd: RIPEMD message-digest algorithm
* sasl: Simple Authentication and Security Layer implementation
* sha1: sha1 hashing functions
+ * simulation: Tcl simulation tools
* smtpd: implementation of functions needed for an SMTP server
* snit: snit's not incr Tcl, OO system
* soundex: comparison of words based on their phonetic likeness
* stooop: simple Tcl-only object oriented programming scheme -
provides C++/Java-like OOP interfaces
+ * stringprep: preparation of internationalized strings
* struct: Tcl implementations of common data structures (tree, graph,
etc)
* tar: functions to manipulate tar files
@@ -102,3 +107,4 @@
* uri: functions to generate and manipulate commonly-used URIs
* uuid: generator of universally unique identifiers (UUID)
* wip: word interpreter
+ * yaml: YAML format encoder/decoder
Modified: tcllib/trunk/debian/gen_index.tcl
===================================================================
--- tcllib/trunk/debian/gen_index.tcl 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/gen_index.tcl 2009-03-19 15:16:40 UTC (rev 842)
@@ -12,7 +12,7 @@
}
while {[gets $fd line] >= 0} {
- if {[regexp {<h1>\s*(.*)\((3tcl)?\)\s+(\S+)\s+(\S+)\s+(.*)</h1>} $line -> \
+ if {[regexp {<h1[^>]*>\s*(.*)\((3tcl)?\)\s+(\S+)\s+(\S+)\s+(.*)</h1>} $line -> \
name - version module title]} {
lappend manuals [list $module!$title!$name $module $name $version $title [file tail $docfile]]
break
@@ -27,7 +27,7 @@
<style type=\"text/css\">
<!--
ul {
- background: lightyellow;
+ background: #80ffff;
border-style: solid;
border-width: 1px;
border-color: black;
@@ -38,6 +38,14 @@
li a {
font-weight: bold;
}
+h1, h2, h3, h4 {
+ margin-top: 1em;
+ font-family: sans-serif;
+ font-size: large;
+ color: #005A9C;
+ background: transparent;
+ text-align: left;
+}
-->
</style>
</head>
Deleted: tcllib/trunk/debian/patches/blowfish.diff
===================================================================
--- tcllib/trunk/debian/patches/blowfish.diff 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/patches/blowfish.diff 2009-03-19 15:16:40 UTC (rev 842)
@@ -1,15 +0,0 @@
-Patch fixes Blowfish encryption if it is implicitly assumed.
-
-Index: tcllib-1.10/modules/blowfish/blowfish.tcl
-===================================================================
---- tcllib-1.10.orig/modules/blowfish/blowfish.tcl
-+++ tcllib-1.10/modules/blowfish/blowfish.tcl
-@@ -605,7 +605,7 @@
-
- proc ::blowfish::blowfish {args} {
- variable accel
-- array set opts {-dir enc -mode cbc -key {} -in {} -out {} -hex 0 -pad \0}
-+ array set opts {-dir encrypt -mode cbc -key {} -in {} -out {} -hex 0 -pad \0}
- set opts(-chunksize) 4096
- set opts(-iv) [string repeat \0 8]
- set modes {ecb cbc}
Modified: tcllib/trunk/debian/patches/build.diff
===================================================================
--- tcllib/trunk/debian/patches/build.diff 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/patches/build.diff 2009-03-19 15:16:40 UTC (rev 842)
@@ -1,7 +1,5 @@
-Index: tcllib/Makefile.in
-=====================================================================
---- tcllib.orig/Makefile.in
-+++ tcllib/Makefile.in
+--- tcllib-1.11.1-dfsg.orig/Makefile.in
++++ tcllib-1.11.1-dfsg/Makefile.in
@@ -49,12 +49,14 @@
all:
doc: html-doc nroff-doc
Modified: tcllib/trunk/debian/patches/series
===================================================================
--- tcllib/trunk/debian/patches/series 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/patches/series 2009-03-19 15:16:40 UTC (rev 842)
@@ -1,2 +1 @@
build.diff
-blowfish.diff
Modified: tcllib/trunk/debian/rules
===================================================================
--- tcllib/trunk/debian/rules 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/rules 2009-03-19 15:16:40 UTC (rev 842)
@@ -79,7 +79,8 @@
sed -e'/\.so man.macros/ d' \
-e's/^\.TH \([^ ]\+\) n/.TH \1 1/' \
-e's/(n)/(3tcl)/g' \
- -e's/^\.dtx/\\a.dtx/' \
+ -e's/^\.dtx/\\\&.dtx/' \
+ -e's/^\.\.\(.\)/\\\&..\1/' \
$$f > `basename $$f .n`.1; \
rm $$f; \
done
@@ -92,15 +93,24 @@
-e's/send(n)/send(3tk)/g' \
-e's/(n)/(3tcl)/g' \
-e's/^\.RE\([^ ]\)/.RE\n\1/' \
- -e's/^\.dtx/\\a.dtx/' \
+ -e's/^\.dtx/\\\&.dtx/' \
-e's/^\.sppp/.sp/' \
- -e's/^\.plot/\\a.plot/' \
+ -e's/^\.plot/\\\&.plot/' \
-e's/^\.sp /.sp\n/' \
-e's/\xf6/\\[:o]/g' \
-e"s/\xe9/\\['e]/g" \
+ -e's/^\.\.\(.\)/\\\&..\1/' \
+ -e's/^\.ddt/\\\&.ddt/' \
+ -e's/^\. It/\\\&. It/' \
+ -e's/^\.text/\\\&.text/' \
+ -e's/^\.mycombo/\\\&.mycombo/' \
$$f > `basename $$f .n`.3tcl; \
rm $$f; \
done
+ # prevent conflict with memchan package
+ # TODO: find a better solution
+ mv $(destdir)$(mandir)/man3/random.3tcl \
+ $(destdir)$(mandir)/man3/random.3tcllib
#
touch install-stamp
#
@@ -148,11 +158,11 @@
CURDIR=`pwd` && \
TMPDIR=`mktemp -d /tmp/tcllib.XXXXXX` && \
cd $$TMPDIR && \
- wget -O - http://heanet.dl.sourceforge.net/sourceforge/tcllib/tcllib-1.10.tar.gz | tar -zx && \
+ wget -O - http://heanet.dl.sourceforge.net/sourceforge/tcllib/tcllib-1.11.1.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_1.10-dfsg.orig.tar.gz tcllib-1.10 && \
+ tar -zcf $$CURDIR/tcllib_1.11.1-dfsg.orig.tar.gz tcllib-1.11.1 && \
rm -rf $$TMPDIR
.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
Modified: tcllib/trunk/debian/watch
===================================================================
--- tcllib/trunk/debian/watch 2009-03-01 10:22:03 UTC (rev 841)
+++ tcllib/trunk/debian/watch 2009-03-19 15:16:40 UTC (rev 842)
@@ -3,4 +3,5 @@
# Compulsory line, this is a version 3 file
version=3
-http://heanet.dl.sourceforge.net/sourceforge/tcllib/tcllib-([\d.]*).tar.gz
+opts=dversionmangle=s/-dfsg\d*$// \
+ http://sf.net/tcllib/tcllib-([\d.]*).tar.gz
More information about the Pkg-tcltk-commits
mailing list