[Pkg-tcltk-commits] r500 - in tcl8.4/trunk/debian: . patches

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2008-02-08 19:03:50 +0000 (Fri, 08 Feb 2008)
New Revision: 500

Added:
   tcl8.4/trunk/debian/tcl8.4.dirs
   tcl8.4/trunk/debian/tcl8.4.lintian-override
Modified:
   tcl8.4/trunk/debian/changelog
   tcl8.4/trunk/debian/patches/tcllibrary.diff
   tcl8.4/trunk/debian/rules
Log:
[tcl8.4]
  * New upstream release.
  * Overridden lintian warning package-name-doesnt-match-sonames since tcl8.4
    package contains not only a library, and it's unreasonable to split it
    into smaller parts.


Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog	2008-02-08 18:34:42 UTC (rev 499)
+++ tcl8.4/trunk/debian/changelog	2008-02-08 19:03:50 UTC (rev 500)
@@ -1,16 +1,12 @@
-tcl8.4 (8.4.17-2exp2) UNRELEASED; urgency=low
+tcl8.4 (8.4.18-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Overridden lintian warning package-name-doesnt-match-sonames since tcl8.4
+    package contains not only a library, and it's unreasonable to split it
+    into smaller parts.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 16 Jan 2008 22:02:17 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 08 Feb 2008 21:35:49 +0300
 
-tcl8.4 (8.4.17-2exp1) experimental; urgency=low
-
-  * Preliminarily removed /usr/lib from auto_path to test compliance of
-    Tcl-related packages to Debian Tcl/Tk policy.
-
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 16 Jan 2008 21:51:01 +0300
-
 tcl8.4 (8.4.17-1) unstable; urgency=low
 
   * New upstream release.

Modified: tcl8.4/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tcllibrary.diff	2008-02-08 18:34:42 UTC (rev 499)
+++ tcl8.4/trunk/debian/patches/tcllibrary.diff	2008-02-08 19:03:50 UTC (rev 500)
@@ -28,7 +28,7 @@
 ===================================================================
 --- tcl8.4-8.4.16.orig/library/init.tcl	2007-07-05 22:03:45.000000000 +0400
 +++ tcl8.4-8.4.16/library/init.tcl	2007-10-18 20:28:54.000000000 +0400
-@@ -49,17 +49,12 @@
+@@ -49,7 +49,7 @@
  namespace eval tcl {
      variable Dir
      if {[info library] ne ""} {
@@ -37,13 +37,3 @@
  	    if {[lsearch -exact $::auto_path $Dir] < 0} {
  		lappend ::auto_path $Dir
  	    }
- 	}
-     }
--    set Dir [file join [file dirname [file dirname \
--	    [info nameofexecutable]]] lib]
--    if {[lsearch -exact $::auto_path $Dir] < 0} {
--	lappend ::auto_path $Dir
--    }
-     if {[info exists ::tcl_pkgPath]} {
- 	foreach Dir $::tcl_pkgPath {
- 	    if {[lsearch -exact $::auto_path $Dir] < 0} {

Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules	2008-02-08 18:34:42 UTC (rev 499)
+++ tcl8.4/trunk/debian/rules	2008-02-08 19:03:50 UTC (rev 500)
@@ -34,7 +34,7 @@
 	touch generic/tclStubInit.c
 	cd unix && \
 	  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
-	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk" \
+	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
 	  ./configure --prefix=/usr \
 		      --includedir=/usr/include/tcl$(v) \
 	    	      --enable-shared \
@@ -146,6 +146,8 @@
 	dh_installdocs -a
 	dh_installmenu -a
 	dh_installchangelogs -a ChangeLog
+	install -m 644 debian/tcl$(v).lintian-override \
+		debian/tcl$(v)/usr/share/lintian/overrides/tcl$(v)
 	dh_fixperms -a
 	dh_strip -a
 	dh_compress -a
@@ -162,8 +164,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.4_8.4.17.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.4.17-src.tar.gz
+	wget -O tcl8.4_8.4.18.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.4.18-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Added: tcl8.4/trunk/debian/tcl8.4.dirs
===================================================================
--- tcl8.4/trunk/debian/tcl8.4.dirs	                        (rev 0)
+++ tcl8.4/trunk/debian/tcl8.4.dirs	2008-02-08 19:03:50 UTC (rev 500)
@@ -0,0 +1 @@
+usr/share/lintian/overrides

Added: tcl8.4/trunk/debian/tcl8.4.lintian-override
===================================================================
--- tcl8.4/trunk/debian/tcl8.4.lintian-override	                        (rev 0)
+++ tcl8.4/trunk/debian/tcl8.4.lintian-override	2008-02-08 19:03:50 UTC (rev 500)
@@ -0,0 +1 @@
+tcl8.4: package-name-doesnt-match-sonames