[Pkg-tcltk-commits] r1122 - in tk8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Mar 2 18:42:06 UTC 2011 

Author: sgolovan
Date: 2011-03-02 18:42:05 +0000 (Wed, 02 Mar 2011)
New Revision: 1122

Removed:
   tk8.5/trunk/debian/patches/display.patch
   tk8.5/trunk/debian/patches/icons.patch
   tk8.5/trunk/debian/patches/xauth.patch
Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/copyright
   tk8.5/trunk/debian/patches/confsearch.diff
   tk8.5/trunk/debian/patches/manpages.diff
   tk8.5/trunk/debian/patches/non-linux.diff
   tk8.5/trunk/debian/patches/rpath.diff
   tk8.5/trunk/debian/patches/series
   tk8.5/trunk/debian/patches/tklibrary.diff
   tk8.5/trunk/debian/patches/tkport.diff
   tk8.5/trunk/debian/patches/tkprivate.diff
   tk8.5/trunk/debian/rules
   tk8.5/trunk/debian/tk8.5-dev.files
Log:
[tk8.5]
  * Merged changes from an experimental branch.
  * Moved /usr/share/tcltk/tk8.5/tkConfig.sh back to the /usr/lib/tk8.5
    directory because it is architecture dependent.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/changelog	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,17 +1,20 @@
-tk8.5 (8.5.8-2) unstable; urgency=low
+tk8.5 (8.5.9-2) unstable; urgency=low
 
+  * Moved /usr/share/tcltk/tk8.5/tkConfig.sh back to the /usr/lib/tk8.5
+    directory because it is architecture dependent.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 05 Nov 2010 14:06:18 +0300
+
+tk8.5 (8.5.9-1) experimental; urgency=low
+
+  * New upstream release.
   * Removed unused patches from debian/patches.
+  * Fixed license in debian/copyright.
   * Added ${misc:Depends} to debian/control file because the binary packages
     are built using debhelper.
   * Bumped standards version to 3.9.1.
-  * Backported patch by upstream which fixes [send] command for ServerInterpreted
-    X host access.
-  * Backported patch from upstream which fixes application icon for 64-bit
-    architectures.
-  * Backported patch from upstream which fixes Tk in case when :: is contained
-    in $DISPLAY variable.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 04 Nov 2010 22:33:13 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 05 Nov 2010 13:56:40 +0300
 
 tk8.5 (8.5.8-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/copyright
===================================================================
--- tk8.5/trunk/debian/copyright	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/copyright	2011-03-02 18:42:05 UTC (rev 1122)
@@ -68,7 +68,7 @@
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
 Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+252.227-7013 (b) (3) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
 terms specified in this license.

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -2,31 +2,31 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.8.orig/unix/configure
-+++ tk8.5-8.5.8/unix/configure
+--- tk8.5-8.5.9.orig/unix/configure
++++ tk8.5-8.5.9/unix/configure
 @@ -1431,6 +1431,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
 +			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/lib64 2>/dev/null` \
  			; do
- 		    if test -f "$i/tclConfig.sh" ; then
---- tk8.5-8.5.8.orig/unix/tcl.m4
-+++ tk8.5-8.5.8/unix/tcl.m4
+--- tk8.5-8.5.9.orig/unix/tcl.m4
++++ tk8.5-8.5.9/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
 +			`ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/lib64 2>/dev/null` \
  			; do
- 		    if test -f "$i/tclConfig.sh" ; then
-@@ -223,6 +224,7 @@
+@@ -224,6 +225,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
 +			`ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
  			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/lib64 2>/dev/null` \
  			; do
- 		    if test -f "$i/tkConfig.sh" ; then

Deleted: tk8.5/trunk/debian/patches/display.patch
===================================================================
--- tk8.5/trunk/debian/patches/display.patch	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/display.patch	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,16 +0,0 @@
---- tk8.5.orig/library/tk.tcl
-+++ tk8.5/library/tk.tcl
-@@ -248,7 +248,12 @@
- 	set disp $screen
-     }
- 
--    uplevel #0 upvar #0 ::tk::Priv.$disp ::tk::Priv
-+    # Ensure that namespace separators never occur in the display name (as
-+    # they cause problems in variable names). Double-colons exist in some VNC
-+    # display names. [Bug 2912473]
-+    set disp [string map {:: _doublecolon_} $disp]
-+
-+    uplevel #0 [list upvar #0 ::tk::Priv.$disp ::tk::Priv]
-     variable ::tk::Priv
-     global tcl_platform
- 

Deleted: tk8.5/trunk/debian/patches/icons.patch
===================================================================
--- tk8.5/trunk/debian/patches/icons.patch	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/icons.patch	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,42 +0,0 @@
---- tk8.5.orig/unix/tkUnixWm.c
-+++ tk8.5/unix/tkUnixWm.c
-@@ -2335,7 +2336,7 @@
-     Tk_PhotoHandle photo;
-     Tk_PhotoImageBlock block;
-     int i, size = 0, width, height, index = 0, x, y, isDefault = 0;
--    unsigned int *iconPropertyData;
-+    unsigned long *iconPropertyData;
- 
-     if (objc < 4) {
- 	Tcl_WrongNumArgs(interp, 2, objv,
-@@ -2375,15 +2376,17 @@
- 
-     /*
-      * We have calculated the size of the data. Try to allocate the needed
--     * memory space.
-+     * memory space. This is an unsigned long array (despite this being twice
-+     * as much as is really needed on LP64 platforms) because that's what X
-+     * defines CARD32 arrays to use. [Bug 2902814]
-      */
- 
--    iconPropertyData = (unsigned int *)
--	    Tcl_AttemptAlloc(sizeof(unsigned int) * size);
-+    iconPropertyData = (unsigned long *)
-+	    attemptckalloc(sizeof(unsigned long) * size);
-     if (iconPropertyData == NULL) {
- 	return TCL_ERROR;
-     }
--    memset(iconPropertyData, 0, sizeof(unsigned int) * size);
-+    memset(iconPropertyData, 0, sizeof(unsigned long) * size);
- 
-     for (i = 3 + isDefault; i < objc; i++) {
- 	photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i]));
-@@ -2421,7 +2424,7 @@
- 	    for (x = 0; x < width; x++) {
- 		register unsigned char *pixelPtr =
- 			block.pixelPtr + x*block.pixelSize + y*block.pitch;
--		register unsigned int R, G, B, A;
-+		register unsigned long R, G, B, A;
- 
- 		R = pixelPtr[block.offset[0]];
- 		G = pixelPtr[block.offset[1]];

Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/manpages.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -2,22 +2,22 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.8.orig/unix/installManPage
-+++ tk8.5-8.5.8/unix/installManPage
-@@ -51,7 +51,16 @@
-     }' $MANPAGE`
+--- tk8.5-8.5.9.orig/unix/installManPage
++++ tk8.5-8.5.9/unix/installManPage
+@@ -91,8 +91,16 @@
+ 	exit 2 ;;
+ esac
  
- SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'`
-+NAME=`basename $MANPAGE .$SECTION`
- SRCDIR=`dirname $MANPAGE`
-+
-+SPECIALS="FindPhoto"
-+for n in $SPECIALS; do
-+    if [ "$NAME" = "$n" ] ; then
-+	NAMES="$n $NAMES"
++Name=`basename $ManPage .$Section`
+ SrcDir=`dirname $ManPage`
+ 
++Specials="FindPhoto"
++for n in $Specials; do
++    if [ "$Name" = "$n" ] ; then
++	Names="$n $Names"
 +    fi
 +done
 +
- FIRST=""
- for f in $NAMES; do
-     f=$f.$SECTION$SUFFIX
+ ########################################################################
+ ### Process Page to Create Target Pages
+ ###

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.5-8.5.8.orig/unix/configure
-+++ tk8.5-8.5.8/unix/configure
-@@ -4742,6 +4742,9 @@
+--- tk8.5-8.5.9.orig/unix/configure
++++ tk8.5-8.5.9/unix/configure
+@@ -4743,6 +4743,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -5546,7 +5549,7 @@
+@@ -5524,7 +5527,7 @@
  fi
  
  	    ;;
@@ -22,9 +22,9 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tk8.5-8.5.8.orig/unix/tcl.m4
-+++ tk8.5-8.5.8/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tk8.5-8.5.9.orig/unix/tcl.m4
++++ tk8.5-8.5.9/unix/tcl.m4
+@@ -964,6 +964,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -34,7 +34,7 @@
  	    fi
  	fi
      ])
-@@ -1422,7 +1425,7 @@
+@@ -1410,7 +1413,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/rpath.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -3,9 +3,9 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.5-8.5.8.orig/unix/configure
-+++ tk8.5-8.5.8/unix/configure
-@@ -5557,6 +5557,9 @@
+--- tk8.5-8.5.9.orig/unix/configure
++++ tk8.5-8.5.9/unix/configure
+@@ -5535,6 +5535,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -15,9 +15,9 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.5-8.5.8.orig/unix/Makefile.in
-+++ tk8.5-8.5.8/unix/Makefile.in
-@@ -713,7 +713,7 @@
+--- tk8.5-8.5.9.orig/unix/Makefile.in
++++ tk8.5-8.5.9/unix/Makefile.in
+@@ -719,7 +719,7 @@
  	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
  	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
@@ -26,9 +26,9 @@
  	    ) > "$(PKG_INDEX)"; \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.8.orig/unix/tcl.m4
-+++ tk8.5-8.5.8/unix/tcl.m4
-@@ -1433,6 +1433,9 @@
+--- tk8.5-8.5.9.orig/unix/tcl.m4
++++ tk8.5-8.5.9/unix/tcl.m4
+@@ -1421,6 +1421,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/series	2011-03-02 18:42:05 UTC (rev 1122)
@@ -5,6 +5,3 @@
 rpath.diff
 non-linux.diff
 manpages.diff
-display.patch
-icons.patch
-xauth.patch

Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.8.orig/unix/configure
-+++ tk8.5-8.5.8/unix/configure
-@@ -11070,7 +11070,7 @@
+--- tk8.5-8.5.9.orig/unix/configure
++++ tk8.5-8.5.9/unix/configure
+@@ -11087,7 +11087,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -9,8 +9,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
---- tk8.5-8.5.8.orig/unix/configure.in
-+++ tk8.5-8.5.8/unix/configure.in
+--- tk8.5-8.5.9.orig/unix/configure.in
++++ tk8.5-8.5.9/unix/configure.in
 @@ -607,7 +607,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi

Modified: tk8.5/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/tkport.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,8 +1,8 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
 
---- tk8.5-8.5.8.orig/generic/tkPort.h
-+++ tk8.5-8.5.8/generic/tkPort.h
+--- tk8.5-8.5.9.orig/generic/tkPort.h
++++ tk8.5-8.5.9/generic/tkPort.h
 @@ -29,7 +29,7 @@
  #   if defined(MAC_OSX_TK)
  #	include "tkMacOSXPort.h"

Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2011-03-02 18:42:05 UTC (rev 1122)
@@ -2,8 +2,8 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
---- tk8.5-8.5.8.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.8/unix/tkConfig.sh.in
+--- tk8.5-8.5.9.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.9/unix/tkConfig.sh.in
 @@ -55,7 +55,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Deleted: tk8.5/trunk/debian/patches/xauth.patch
===================================================================
--- tk8.5/trunk/debian/patches/xauth.patch	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/patches/xauth.patch	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,106 +0,0 @@
---- tk8.5.orig/unix/tkUnixSend.c
-+++ tk8.5/unix/tkUnixSend.c
-@@ -679,54 +679,74 @@
-     int numHosts, secure;
-     Bool enabled;
- 
--    secure = 0;
-     addrPtr = XListHosts(dispPtr->display, &numHosts, &enabled);
--    if (enabled) {
--	if (numHosts == 0) {
--	    secure = 1;
--	}
--
-+    if (!enabled) {
-+    insecure:
-+	secure = 0;
-+    } else if (numHosts == 0) {
-+	secure = 1;
-+    } else {
- 	/*
- 	 * Recent versions of X11 have the extra feature of allowing more
- 	 * sophisticated authorization checks to be performed than the dozy
- 	 * old ones that used to plague xhost usage. However, not all deployed
- 	 * versions of Xlib know how to deal with this feature, so this code
- 	 * is conditional on having the right #def in place. [Bug 1909931]
-+	 *
-+	 * Note that at this point we know that there's at least one entry in
-+	 * the list returned by XListHosts. However there may be multiple
-+	 * entries; as long as each is one of either 'SI:localhost:*' or
-+	 * 'SI:localgroup:*' then we will claim to be secure enough.
- 	 */
- 
- #ifdef FamilyServerInterpreted
--	if (numHosts == 1 && addrPtr[0].family == FamilyServerInterpreted) {
--	    XServerInterpretedAddress *siPtr =
--		    (XServerInterpretedAddress *) addrPtr[0].address;
--
--	    if (siPtr->typelength==9 && !memcmp(siPtr->type,"localuser",9)) {
--		/*
--		 * We don't check the username here. This is because it's
--		 * officially non-portable and we are just making sure there
--		 * aren't silly misconfigurations. (Apparently 'root' is not a
--		 * very good choice, but we still don't put any effort in to
--		 * spot that.)
--		 */
-+	XServerInterpretedAddress *siPtr;
-+	int i;
- 
--		secure = 1;
--	    } else if (siPtr->typelength == 10
--		    && !memcmp(siPtr->type, "localgroup", 10)) {
-+	for (i=0 ; i<numHosts ; i++) {
-+	    if (addrPtr[i].family != FamilyServerInterpreted) {
- 		/*
--		 * Similarly to above, we don't attempt to peek inside server
--		 * interpreted group names. If someone set it, it's what they
--		 * want and we assume it's OK.
-+		 * We don't understand what the X server is letting in, so we
-+		 * err on the side of safety.
- 		 */
- 
--		secure = 1;
-+		goto insecure;
- 	    }
-+	    siPtr = (XServerInterpretedAddress *) addrPtr[0].address;
- 
- 	    /*
--	     * The other defined types of server-interpreted controls involve
--	     * particular hosts; these are still insecure for the same reasons
--	     * that classic xhost access is insecure.
-+	     * We don't check the username or group here. This is because it's
-+	     * officially non-portable and we are just making sure there
-+	     * aren't silly misconfigurations. (Apparently 'root' is not a
-+	     * very good choice, but we still don't put any effort in to spot
-+	     * that.) However we do check to see that the constraints are
-+	     * imposed against the connecting user and/or group.
- 	     */
-+
-+	    if (       !(siPtr->typelength == 9 /* ==strlen("localuser") */
-+			&& !memcmp(siPtr->type, "localuser", 9))
-+		    && !(siPtr->typelength == 10 /* ==strlen("localgroup") */
-+			&& !memcmp(siPtr->type, "localgroup", 10))) {
-+		/*
-+		 * The other defined types of server-interpreted controls
-+		 * involve particular hosts. These are still insecure for the
-+		 * same reasons that classic xhost access is insecure; there's
-+		 * just no way to be sure that the users on those systems are
-+		 * the ones who should be allowed to connect to this display.
-+		 */
-+
-+		goto insecure;
-+	    }
- 	}
--#endif
-+	secure = 1;
-+#else
-+	/*
-+	 * We don't understand what the X server is letting in, so we err on
-+	 * the side of safety.
-+	 */
-+
-+	goto insecure;
-+#endif /* FamilyServerInterpreted */
-     }
-     if (addrPtr != NULL) {
- 	XFree((char *) addrPtr);

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/rules	2011-03-02 18:42:05 UTC (rev 1122)
@@ -81,7 +81,7 @@
 	cp unix/libtk$(v).a debian/tmp/usr/lib
 	mv debian/tmp/usr/lib/libtk$(v).so debian/tmp/usr/lib/libtk$(v).so.0
 	ln -sf libtk$(v).so.0 debian/tmp/usr/lib/libtk$(v).so
-	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tk$(v)
+	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/tk$(v)
 	# Fix up the include files.
 	install -d debian/tmp/usr/include/tcl$(v)/tk-private/generic/ttk
 	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic
@@ -145,11 +145,6 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_movefiles -a
-	# now, fix up file locations for .sh
-	mv debian/tk$(v)/usr/share/tcltk/tk$(v)/*.sh \
-	   debian/tk$(v)-dev/usr/share/tcltk/tk$(v)
-	ln -s ../../share/tcltk/tk$(v)/tkConfig.sh \
-	      debian/tk$(v)-dev/usr/lib/tk$(v)/tkConfig.sh
 	dh_installdocs -a
 	install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/
 	# move around the demos
@@ -175,8 +170,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_8.5.8.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5.8-src.tar.gz
+	wget -O tk8.5_8.5.9.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5.9-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Modified: tk8.5/trunk/debian/tk8.5-dev.files
===================================================================
--- tk8.5/trunk/debian/tk8.5-dev.files	2011-03-02 18:17:46 UTC (rev 1121)
+++ tk8.5/trunk/debian/tk8.5-dev.files	2011-03-02 18:42:05 UTC (rev 1122)
@@ -1,3 +1,4 @@
 usr/include
 usr/lib/*.a
 usr/lib/*.so
+usr/lib/tk8.5/*.sh

More information about the Pkg-tcltk-commits mailing list