[Pkg-tcltk-commits] r335 - in tcllib/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-10-20 16:16:37 +0000 (Sat, 20 Oct 2007)
New Revision: 335

Added:
   tcllib/trunk/debian/patches/blowfish.diff
Removed:
   tcllib/trunk/debian/links
Modified:
   tcllib/trunk/debian/changelog
   tcllib/trunk/debian/control
   tcllib/trunk/debian/dirs
   tcllib/trunk/debian/patches/series
   tcllib/trunk/debian/rules
Log:
[tcllib]
  * Fixed ::blowfish::blowfish option processing if -dir isn't specified
    directly.
  * Adapted the package to Debian Tcl/Tk policy. This includes moving the Tcl
    modules into a subdirectory of /usr/share/tcltk and switching to default
    tcl package in dependencies.


Modified: tcllib/trunk/debian/changelog
===================================================================
--- tcllib/trunk/debian/changelog	2007-10-20 13:34:41 UTC (rev 334)
+++ tcllib/trunk/debian/changelog	2007-10-20 16:16:37 UTC (rev 335)
@@ -1,3 +1,17 @@
+tcllib (1.10-dfsg-2) unstable; urgency=low
+
+  [ Sergei Golovan ]
+  * Fixed ::blowfish::blowfish option processing if -dir isn't specified
+    directly.
+  * Adapted the package to Debian Tcl/Tk policy. This includes moving the Tcl
+    modules into a subdirectory of /usr/share/tcltk and switching to default
+    tcl package in dependencies.
+
+  [ Francesco Paolo Lovergine ]
+  * Added Homepage field in debian/control.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 20 Oct 2007 17:37:31 +0400
+
 tcllib (1.10-dfsg-1) unstable; urgency=low
 
   [ Sergei Golovan ]
@@ -10,11 +24,8 @@
   * Rewritten clean target in debian/rules to ignore only missing Makefile
     error.
 
-  [ Francesco Paolo Lovergine ]
-  * Added Homepage field in debian/control
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 16 Sep 2007 13:05:26 +0400
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 13 Oct 2007 20:04:41 +0200
-
 tcllib (1.9.dfsg1-1) unstable; urgency=low
 
   [ Sergei Golovan ]

Modified: tcllib/trunk/debian/control
===================================================================
--- tcllib/trunk/debian/control	2007-10-20 13:34:41 UTC (rev 334)
+++ tcllib/trunk/debian/control	2007-10-20 16:16:37 UTC (rev 335)
@@ -4,7 +4,7 @@
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 4.0), quilt
-Build-Depends-Indep: tcl8.4
+Build-Depends-Indep: tcl
 Standards-Version: 3.7.2
 Homepage: http://tcl.activestate.com/software/tcllib/
 
@@ -12,7 +12,7 @@
 Section: interpreters
 Priority: optional
 Architecture: all
-Depends: tcl8.4 | tclsh
+Depends: ${tclsh:Depends}
 Description: the Standard Tcl Library
  Tcllib, the standard Tcl library, is a collection of common utility
  functions and modules all written in high-level Tcl.
@@ -102,4 +102,3 @@
    * uri: functions to generate and manipulate commonly-used URIs
    * uuid: generator of universally unique identifiers (UUID)
    * wip: word interpreter
- .

Modified: tcllib/trunk/debian/dirs
===================================================================
--- tcllib/trunk/debian/dirs	2007-10-20 13:34:41 UTC (rev 334)
+++ tcllib/trunk/debian/dirs	2007-10-20 16:16:37 UTC (rev 335)
@@ -1,4 +1,5 @@
 usr/bin
 usr/share/man
+usr/share/tcltk
 usr/share/doc/tcllib
 usr/share/linda/overrides

Deleted: tcllib/trunk/debian/links
===================================================================
--- tcllib/trunk/debian/links	2007-10-20 13:34:41 UTC (rev 334)
+++ tcllib/trunk/debian/links	2007-10-20 16:16:37 UTC (rev 335)
@@ -1 +0,0 @@
-usr/share/tcllib1.10 usr/lib/tcllib1.10

Added: tcllib/trunk/debian/patches/blowfish.diff
===================================================================
--- tcllib/trunk/debian/patches/blowfish.diff	                        (rev 0)
+++ tcllib/trunk/debian/patches/blowfish.diff	2007-10-20 16:16:37 UTC (rev 335)
@@ -0,0 +1,15 @@
+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/series
===================================================================
--- tcllib/trunk/debian/patches/series	2007-10-20 13:34:41 UTC (rev 334)
+++ tcllib/trunk/debian/patches/series	2007-10-20 16:16:37 UTC (rev 335)
@@ -1 +1,2 @@
 build.diff
+blowfish.diff

Modified: tcllib/trunk/debian/rules
===================================================================
--- tcllib/trunk/debian/rules	2007-10-20 13:34:41 UTC (rev 334)
+++ tcllib/trunk/debian/rules	2007-10-20 16:16:37 UTC (rev 335)
@@ -57,7 +57,7 @@
 		find . -type f -print | xargs chmod 644
 
 	# move scripts to /usr/share
-	mv $(destdir)/usr/lib/* $(destdir)/usr/share
+	mv $(destdir)/usr/lib/* $(destdir)/usr/share/tcltk
 
 	# rename the man pages into section 3
 	mv $(destdir)$(mandir)/mann $(destdir)$(mandir)/man3
@@ -131,6 +131,7 @@
 		    -Xusr/share/doc/tcllib/html/
 	dh_fixperms
 	dh_installdeb
+	tcltk-depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb