[Pkg-tcltk-commits] r1143 - in tk8.6/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Jul 20 17:54:26 UTC 2011 

Author: sgolovan
Date: 2011-07-20 17:54:26 +0000 (Wed, 20 Jul 2011)
New Revision: 1143

Added:
   tk8.6/trunk/debian/patches/xft.diff
Modified:
   tk8.6/trunk/debian/changelog
   tk8.6/trunk/debian/control
   tk8.6/trunk/debian/patches/confsearch.diff
   tk8.6/trunk/debian/patches/manpages.diff
   tk8.6/trunk/debian/patches/non-linux.diff
   tk8.6/trunk/debian/patches/rpath.diff
   tk8.6/trunk/debian/patches/series
   tk8.6/trunk/debian/patches/tklibrary.diff
   tk8.6/trunk/debian/patches/tkport.diff
   tk8.6/trunk/debian/patches/tkprivate.diff
   tk8.6/trunk/debian/rules
   tk8.6/trunk/debian/tk8.6-dev.dirs
   tk8.6/trunk/debian/tk8.6-dev.files
Log:
[tk8.6]
  * New upstream release.
  * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6
  * Fixed Xft detection in configure script, which is broken since xft-config
    was removed from the libxft-dev package.
  * Bumped standards version to 3.9.2.


Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/changelog	2011-07-20 17:54:26 UTC (rev 1143)
@@ -1,8 +1,12 @@
-tk8.6 (8.6.0~b1-4) UNRELEASED; urgency=low
+tk8.6 (8.6.0~b2~rc0-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6
+  * Fixed Xft detection in configure script, which is broken since xft-config
+    was removed from the libxft-dev package.
+  * Bumped standards version to 3.9.2.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 31 Oct 2010 15:40:29 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 20 Jul 2011 15:38:18 +0400
 
 tk8.6 (8.6.0~b1-3) experimental; urgency=low
 

Modified: tk8.6/trunk/debian/control
===================================================================
--- tk8.6/trunk/debian/control	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/control	2011-07-20 17:54:26 UTC (rev 1143)
@@ -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 (>= 5.0.0), x11proto-core-dev, libx11-dev, libxt-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.6-dev (>= 8.6.0~b1), quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.tcl.tk/
 
 Package: tk8.6

Modified: tk8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.6/trunk/debian/patches/confsearch.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/confsearch.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -2,31 +2,31 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.6-8.6.0~b1.orig/unix/configure
-+++ tk8.6-8.6.0~b1/unix/configure
-@@ -1430,6 +1430,7 @@
+--- tk8.6b2.orig/unix/configure
++++ tk8.6b2/unix/configure
+@@ -1432,6 +1432,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.6-8.6.0~b1.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~b1/unix/tcl.m4
+--- tk8.6b2.orig/unix/tcl.m4
++++ tk8.6b2/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 @@
  			`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

Modified: tk8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.6/trunk/debian/patches/manpages.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/manpages.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -2,22 +2,26 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.6-8.6.0~b1.orig/unix/installManPage
-+++ tk8.6-8.6.0~b1/unix/installManPage
-@@ -51,7 +51,16 @@
-     }' $MANPAGE`
+--- tk8.6b2.orig/unix/installManPage
++++ tk8.6b2/unix/installManPage
+@@ -92,12 +92,20 @@
+ 	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`
+ 
+ ########################################################################
+ ### Process Page to Create Target Pages
+ ###
+ 
++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
+ First=""
+ for Target in $Names; do
+     Target=$Target.$Section$Suffix

Modified: tk8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/non-linux.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.6-8.6.0~b1.orig/unix/configure
-+++ tk8.6-8.6.0~b1/unix/configure
-@@ -4420,6 +4420,9 @@
+--- tk8.6b2.orig/unix/configure
++++ tk8.6b2/unix/configure
+@@ -4497,6 +4497,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,17 +13,17 @@
  	    fi
  	fi
  
-@@ -5221,7 +5224,7 @@
+@@ -5333,7 +5336,7 @@
  fi
  
  	    ;;
 -	Linux*)
 +	Linux*|GNU*|NetBSD-Debian)
  	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tk8.6-8.6.0~b1.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~b1/unix/tcl.m4
+ 
+--- tk8.6b2.orig/unix/tcl.m4
++++ tk8.6b2/unix/tcl.m4
 @@ -925,6 +925,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -34,12 +34,12 @@
  	    fi
  	fi
      ])
-@@ -1383,7 +1386,7 @@
+@@ -1379,7 +1382,7 @@
  	        ])
  	    ])
  	    ;;
 -	Linux*)
 +	Linux*|GNU*|NetBSD-Debian)
  	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
+ 

Modified: tk8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.6/trunk/debian/patches/rpath.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/rpath.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -3,9 +3,9 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.6-8.6.0~b1.orig/unix/configure
-+++ tk8.6-8.6.0~b1/unix/configure
-@@ -5232,6 +5232,9 @@
+--- tk8.6b2.orig/unix/configure
++++ tk8.6b2/unix/configure
+@@ -5343,6 +5343,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -15,20 +15,20 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.6-8.6.0~b1.orig/unix/Makefile.in
-+++ tk8.6-8.6.0~b1/unix/Makefile.in
-@@ -712,7 +712,7 @@
- 		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
+--- tk8.6b2.orig/unix/Makefile.in
++++ tk8.6b2/unix/Makefile.in
+@@ -725,7 +725,7 @@
+ 	    echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} 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)\
 -		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
 +		[list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
  	    ) > "$(PKG_INDEX)"; \
  	    fi
- 	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.6-8.6.0~b1.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~b1/unix/tcl.m4
-@@ -1394,6 +1394,9 @@
+ 	@echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/"
+--- tk8.6b2.orig/unix/tcl.m4
++++ tk8.6b2/unix/tcl.m4
+@@ -1389,6 +1389,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tk8.6/trunk/debian/patches/series
===================================================================
--- tk8.6/trunk/debian/patches/series	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/series	2011-07-20 17:54:26 UTC (rev 1143)
@@ -5,3 +5,4 @@
 rpath.diff
 non-linux.diff
 manpages.diff
+xft.diff

Modified: tk8.6/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/trunk/debian/patches/tklibrary.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/tklibrary.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -1,6 +1,6 @@
---- tk8.6-8.6.0~b1.orig/unix/configure
-+++ tk8.6-8.6.0~b1/unix/configure
-@@ -10429,7 +10429,7 @@
+--- tk8.6b2.orig/unix/configure
++++ tk8.6b2/unix/configure
+@@ -10956,7 +10956,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
---- tk8.6-8.6.0~b1.orig/unix/configure.in
-+++ tk8.6-8.6.0~b1/unix/configure.in
-@@ -553,7 +553,7 @@
+--- tk8.6b2.orig/unix/configure.in
++++ tk8.6b2/unix/configure.in
+@@ -625,7 +625,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.6/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkport.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/tkport.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -1,9 +1,9 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
 
---- tk8.6-8.6.0~b1.orig/generic/tkPort.h
-+++ tk8.6-8.6.0~b1/generic/tkPort.h
-@@ -29,7 +29,7 @@
+--- tk8.6b2.orig/generic/tkPort.h
++++ tk8.6b2/generic/tkPort.h
+@@ -24,7 +24,7 @@
  #   if defined(MAC_OSX_TK)
  #	include "tkMacOSXPort.h"
  #   else

Modified: tk8.6/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkprivate.diff	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/patches/tkprivate.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -2,9 +2,9 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
---- tk8.6-8.6.0~b1.orig/unix/tkConfig.sh.in
-+++ tk8.6-8.6.0~b1/unix/tkConfig.sh.in
-@@ -55,7 +55,7 @@
+--- tk8.6b2.orig/unix/tkConfig.sh.in
++++ tk8.6b2/unix/tkConfig.sh.in
+@@ -53,7 +53,7 @@
  
  # String to pass to linker to pick up the Tk library from its
  # build directory.
@@ -13,7 +13,7 @@
  
  # String to pass to linker to pick up the Tk library from its
  # installed directory.
-@@ -71,7 +71,7 @@
+@@ -69,7 +69,7 @@
  # different place than the directory containing the source files, this
  # points to the location of the sources, not the location where Tk was
  # compiled.
@@ -22,7 +22,7 @@
  
  # Needed if you want to make a 'fat' shared library library
  # containing tk objects or link a different wish.
-@@ -86,14 +86,14 @@
+@@ -84,14 +84,14 @@
  
  # String to pass to linker to pick up the Tk stub library from its
  # build directory.

Added: tk8.6/trunk/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff	                        (rev 0)
+++ tk8.6/trunk/debian/patches/xft.diff	2011-07-20 17:54:26 UTC (rev 1143)
@@ -0,0 +1,32 @@
+Author: Sergei Golovan
+Description: Patch fixes Xft detection and list of libraries to link to.
+Forwarded: yes
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
+Last-updated: Wed, 20 Jul 2011 16:11:14 +0400
+
+--- tk8.6b2.orig/unix/configure.in
++++ tk8.6b2/unix/configure.in
+@@ -548,8 +548,8 @@
+ 	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+ 	if test "$found_xft" = "no" ; then
+ 	    found_xft=yes
+-	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+-	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++	    XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
++	    XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+ 	fi
+ 	AC_MSG_RESULT([$found_xft])
+ 	dnl make sure that compiling against Xft header file doesn't bomb
+--- tk8.6b2.orig/unix/configure
++++ tk8.6b2/unix/configure
+@@ -10692,8 +10692,8 @@
+ 	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+ 	if test "$found_xft" = "no" ; then
+ 	    found_xft=yes
+-	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+-	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++	    XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
++	    XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+ 	fi
+ 	echo "$as_me:$LINENO: result: $found_xft" >&5
+ echo "${ECHO_T}$found_xft" >&6

Modified: tk8.6/trunk/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/rules	2011-07-20 17:54:26 UTC (rev 1143)
@@ -26,7 +26,7 @@
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
-	quilt push -a || test $$? = 2
+	quilt push -a -v || test $$? = 2
 	touch patch-stamp
 
 build: build-stamp
@@ -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
@@ -143,11 +143,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
@@ -173,8 +168,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.6_8.6.0~b1.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.6b1-src.tar.gz
+	wget -O tk8.6_8.6.0~b2~rc0.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.6b2rc0-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Modified: tk8.6/trunk/debian/tk8.6-dev.dirs
===================================================================
--- tk8.6/trunk/debian/tk8.6-dev.dirs	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/tk8.6-dev.dirs	2011-07-20 17:54:26 UTC (rev 1143)
@@ -1,2 +1 @@
 usr/lib/tk8.6
-usr/share/tcltk/tk8.6

Modified: tk8.6/trunk/debian/tk8.6-dev.files
===================================================================
--- tk8.6/trunk/debian/tk8.6-dev.files	2011-07-20 17:53:46 UTC (rev 1142)
+++ tk8.6/trunk/debian/tk8.6-dev.files	2011-07-20 17:54:26 UTC (rev 1143)
@@ -1,3 +1,4 @@
 usr/include
 usr/lib/*.a
 usr/lib/*.so
+usr/lib/tcl8.6/*.sh

More information about the Pkg-tcltk-commits mailing list