[Pkg-tcltk-commits] r336 - in tclreadline/trunk/debian: . patches

Sat Oct 20 16:19:20 UTC 2007

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

Added:
   tclreadline/trunk/debian/patches/tclrldir.diff
Modified:
   tclreadline/trunk/debian/changelog
   tclreadline/trunk/debian/compat
   tclreadline/trunk/debian/control
   tclreadline/trunk/debian/patches/series
   tclreadline/trunk/debian/patches/tclshpath.diff
   tclreadline/trunk/debian/patches/varnames.diff
   tclreadline/trunk/debian/rules
Log:
[tclreadline]
  * Adapted the package to Debian Tcl/Tk policy. This includes moving
    architecture independent files into a subdirectory of /usr/share/tcltk
    and rewriting dependencies in terms of default tcl package.
  * Removed #!tclsh line from tclreadline init scripts since they aren't
    supposed to be executed directly.
  * Bumped debhelper compatibility level to 5.


Modified: tclreadline/trunk/debian/changelog
===================================================================

--- tclreadline/trunk/debian/changelog	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/changelog	2007-10-20 16:19:20 UTC (rev 336)
@@ -1,3 +1,18 @@
+tclreadline (2.1.0-4) unstable; urgency=low
+
+  [ Sergei Golovan ]
+  * Adapted the package to Debian Tcl/Tk policy. This includes moving
+    architecture independent files into a subdirectory of /usr/share/tcltk
+    and rewriting dependencies in terms of default tcl package.
+  * Removed #!tclsh line from tclreadline init scripts since they aren't
+    supposed to be executed directly.
+  * Bumped debhelper compatibility level to 5.
+
+  [ Francesco Paolo Lovergine ]
+  * Added Homepage field in debian/control.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 20 Oct 2007 15:01:22 +0400
+
 tclreadline (2.1.0-3) unstable; urgency=low
 
   [ Sergei Golovan ]
@@ -4,11 +19,8 @@
   * Fixed building of shared library on kfreebsd-i386 and kfreebsd-amd64
     architectures.
 
-  [ Francesco Paolo Lovergine ]
-  * Added Homepage field in debian/control
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 16 Sep 2007 13:52:23 +0400
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 13 Oct 2007 20:05:36 +0200
-
 tclreadline (2.1.0-2) unstable; urgency=low
 
   * Added Sergei Golovan to uploaders.

Modified: tclreadline/trunk/debian/compat
===================================================================
--- tclreadline/trunk/debian/compat	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/compat	2007-10-20 16:19:20 UTC (rev 336)
@@ -1 +1 @@
-4
+5

Modified: tclreadline/trunk/debian/control
===================================================================
--- tclreadline/trunk/debian/control	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/control	2007-10-20 16:19:20 UTC (rev 336)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Chris Waters <xtifr at debian.org>, Anselm Lingnau <lingnau at debian.org>, Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 4.0), tcl8.4-dev, libreadline5-dev, autotools-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), tcl-dev, libreadline5-dev, autotools-dev, quilt
 Standards-Version: 3.7.2
 Homepage: http://tclreadline.sourceforge.net/
 
@@ -11,7 +11,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${tclsh:Depends}
 Description: GNU Readline Extension for Tcl/Tk
  tclreadline adds GNU Readline support to standard Tcl/Tk.  It provides
  interactive command editing and history for Tcl shells (this must be

Modified: tclreadline/trunk/debian/patches/series
===================================================================
--- tclreadline/trunk/debian/patches/series	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/patches/series	2007-10-20 16:19:20 UTC (rev 336)
@@ -4,4 +4,5 @@
 memuse.diff
 complete_nontcl.diff
 varnames.diff
+tclrldir.diff
 kfreebsd.diff

Added: tclreadline/trunk/debian/patches/tclrldir.diff
===================================================================
--- tclreadline/trunk/debian/patches/tclrldir.diff	                        (rev 0)
+++ tclreadline/trunk/debian/patches/tclrldir.diff	2007-10-20 16:19:20 UTC (rev 336)
@@ -0,0 +1,27 @@
+
+Index: tclreadline-2.1.0/configure
+===================================================================
+--- tclreadline-2.1.0.orig/configure
++++ tclreadline-2.1.0/configure
+@@ -1862,7 +1862,7 @@
+ fi
+ TCLRL_LIBDIR="${prefix}/lib"
+ 
+-TCLRL_DIR="${TCLRL_LIBDIR}/tclreadline$VERSION"
++TCLRL_DIR="/usr/share/tcltk/tclreadline$VERSION"
+ 
+ 
+ # HEADERS
+Index: tclreadline-2.1.0/configure.in
+===================================================================
+--- tclreadline-2.1.0.orig/configure.in
++++ tclreadline-2.1.0/configure.in
+@@ -91,7 +91,7 @@
+ fi
+ TCLRL_LIBDIR="${prefix}/lib"
+ AC_SUBST(TCLRL_LIBDIR)
+-TCLRL_DIR="${TCLRL_LIBDIR}/tclreadline$VERSION"
++TCLRL_DIR="/usr/share/tcltk/tclreadline$VERSION"
+ AC_SUBST(TCLRL_DIR)
+ 
+ # HEADERS

Modified: tclreadline/trunk/debian/patches/tclshpath.diff
===================================================================
--- tclreadline/trunk/debian/patches/tclshpath.diff	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/patches/tclshpath.diff	2007-10-20 16:19:20 UTC (rev 336)
@@ -2,9 +2,8 @@
 =====================================================================
 --- tclreadline.orig/pkgIndex.tcl.in
 +++ tclreadline/pkgIndex.tcl.in
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -#!/usr/local/bin/tclsh
-+#!/usr/bin/tclsh
  # FILE: "/home/joze/src/tclreadline/pkgIndex.tcl.in"
  # LAST MODIFICATION: "Sat, 01 Jul 2000 21:53:04 +0200 (joze)"
  # (C) 1998 - 2000 by Johannes Zellner, <johannes at zellner.org>
@@ -12,9 +11,8 @@
 =====================================================================
 --- tclreadline.orig/tclreadlineInit.tcl.in
 +++ tclreadline/tclreadlineInit.tcl.in
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -#!/usr/local/bin/tclsh
-+#!/usr/bin/tclsh
  # FILE: "/home/joze/src/tclreadline/tclreadlineInit.tcl.in"
  # LAST MODIFICATION: "Mit, 20 Sep 2000 19:29:26 +0200 (joze)"
  # (C) 1998 - 2000 by Johannes Zellner, <johannes at zellner.org>
@@ -22,9 +20,8 @@
 =====================================================================
 --- tclreadline.orig/tclreadlineSetup.tcl.in
 +++ tclreadline/tclreadlineSetup.tcl.in
-@@ -1,4 +1,4 @@
+@@ -1,4 +1,3 @@
 -#!/usr/locanl/bin/tclsh
-+#!/usr/bin/tclsh
  # FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in"
  # LAST MODIFICATION: "Sat, 01 Jul 2000 21:53:28 +0200 (joze)"
  # (C) 1998 - 2000 by Johannes Zellner, <johannes at zellner.org>

Modified: tclreadline/trunk/debian/patches/varnames.diff
===================================================================
--- tclreadline/trunk/debian/patches/varnames.diff	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/patches/varnames.diff	2007-10-20 16:19:20 UTC (rev 336)
@@ -18,7 +18,7 @@
 ===================================================================
 --- tclreadline.orig/tclreadlineSetup.tcl.in
 +++ tclreadline/tclreadlineSetup.tcl.in
-@@ -136,7 +136,7 @@
+@@ -135,7 +135,7 @@
  	    ::tclreadline::Init
  	}
  
@@ -27,7 +27,7 @@
  
  	    namespace eval ::tclreadline {
  		variable prompt_string
-@@ -171,6 +171,16 @@
+@@ -170,6 +170,16 @@
  	    # puts body=[info body ::tclreadline::prompt1]
  	}
  
@@ -44,7 +44,7 @@
  	if {"" == [info procs exit]} {
  
  	    catch {rename ::tclreadline::Exit ""}
-@@ -263,22 +273,21 @@
+@@ -262,22 +272,21 @@
  
  	while {1} {
  
@@ -77,7 +77,7 @@
  		}
  	    } ::tclreadline::errorMsg]} {
  		puts stderr [list tclreadline::Loop: error. \
-@@ -294,19 +303,20 @@
+@@ -293,19 +302,20 @@
  	    # from tcsh's behaviour, but I found it quite convenient
  	    # while using mshell on os9.
  	    #

Modified: tclreadline/trunk/debian/rules
===================================================================
--- tclreadline/trunk/debian/rules	2007-10-20 16:16:37 UTC (rev 335)
+++ tclreadline/trunk/debian/rules	2007-10-20 16:19:20 UTC (rev 336)
@@ -11,7 +11,12 @@
 
 export QUILT_PATCHES := debian/patches
 
-tcltk = 8.4
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+CFLAGS="-g -O0 -Wall"
+else
+# See bug #446335
+CFLAGS="-g -O2 -Wall"
+endif
 
 DESTDIR = $(shell pwd)/debian/tclreadline
 
@@ -36,14 +41,15 @@
 build-stamp: patch-stamp
 	dh_testdir
 
+	touch Makefile.in && \
+	touch aclocal.m4 && \
 	./configure --host=$(DEB_HOST_GNU_TYPE) \
 		    --build=$(DEB_BUILD_GNU_TYPE) \
 		    --prefix=/usr \
 		    --mandir=/usr/share/man \
-		    --with-tcl=/usr/lib/tcl$(tcltk) \
-		    --with-tk=/usr/lib/tk$(tcltk) \
-		    --with-tcl-includes=/usr/include/tcl$(tcltk)
-	$(MAKE) CFLAGS="-g -O2 -Wall -D_REENTRANT"
+		    --with-tcl=/usr/lib \
+		    --with-tcl-includes=/usr/include/tcl && \
+	$(MAKE) CFLAGS=$(CFLAGS)
 
 	touch build-stamp
 
@@ -67,10 +73,6 @@
 	$(MAKE) DESTDIR=$(DESTDIR) install
 # fix up library permissions (so we can strip)
 #	find $(DESTDIR)/usr/lib -name '*.so.*' -print | xargs chmod 755
-# Fix up Tcl scripts permissions
-	chmod 755 $(DESTDIR)/usr/lib/tclreadline*/pkgIndex.tcl
-	chmod 755 $(DESTDIR)/usr/lib/tclreadline*/tclreadlineInit.tcl
-	chmod 755 $(DESTDIR)/usr/lib/tclreadline*/tclreadlineSetup.tcl
 # Fix up the manpages.
 	mv $(DESTDIR)/usr/share/man/mann $(DESTDIR)/usr/share/man/man3
 	cd $(DESTDIR)/usr/share/man/man3 && mv tclreadline.n tclreadline.3tcl
@@ -93,7 +95,8 @@
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_installdeb -a
-	dh_shlibdeps -a -u'-e/usr/bin/tclsh$(tcltk)'
+	tcltk-depends -a
+	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a


