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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Dec 8 11:54:04 UTC 2011 

Author: sgolovan
Date: 2011-12-08 11:54:03 +0000 (Thu, 08 Dec 2011)
New Revision: 1200

Modified:
   tk8.5/trunk/debian/changelog
   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/tklibrary.diff
   tk8.5/trunk/debian/patches/tkport.diff
   tk8.5/trunk/debian/patches/tkprivate.diff
   tk8.5/trunk/debian/patches/xft.diff
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
  * New upstream release.
  * Added build-arch and build-indep targets to debian/rules (closes: #648883).


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/changelog	2011-12-08 11:54:03 UTC (rev 1200)
@@ -1,8 +1,9 @@
-tk8.5 (8.5.10-2) UNRELEASED; urgency=low
+tk8.5 (8.5.11-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Added build-arch and build-indep targets to debian/rules (closes: #648883).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 26 Jun 2011 12:34:17 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 08 Dec 2011 15:19:10 +0400
 
 tk8.5 (8.5.10-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.10.orig/unix/configure
-+++ tk8.5-8.5.10/unix/configure
+--- tk8.5-8.5.11.orig/unix/configure
++++ tk8.5-8.5.11/unix/configure
 @@ -1431,6 +1431,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \
  			; do
---- tk8.5-8.5.10.orig/unix/tcl.m4
-+++ tk8.5-8.5.10/unix/tcl.m4
+--- tk8.5-8.5.11.orig/unix/tcl.m4
++++ tk8.5-8.5.11/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/manpages.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.10.orig/unix/installManPage
-+++ tk8.5-8.5.10/unix/installManPage
+--- tk8.5-8.5.11.orig/unix/installManPage
++++ tk8.5-8.5.11/unix/installManPage
 @@ -91,8 +91,16 @@
  	exit 2 ;;
  esac

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.5-8.5.10.orig/unix/configure
-+++ tk8.5-8.5.10/unix/configure
+--- tk8.5-8.5.11.orig/unix/configure
++++ tk8.5-8.5.11/unix/configure
 @@ -4743,6 +4743,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_SUFFIX=".so"
  
---- tk8.5-8.5.10.orig/unix/tcl.m4
-+++ tk8.5-8.5.10/unix/tcl.m4
+--- tk8.5-8.5.11.orig/unix/tcl.m4
++++ tk8.5-8.5.11/unix/tcl.m4
 @@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/rpath.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -3,8 +3,8 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.5-8.5.10.orig/unix/configure
-+++ tk8.5-8.5.10/unix/configure
+--- tk8.5-8.5.11.orig/unix/configure
++++ tk8.5-8.5.11/unix/configure
 @@ -5558,6 +5558,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,8 +15,8 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.5-8.5.10.orig/unix/Makefile.in
-+++ tk8.5-8.5.10/unix/Makefile.in
+--- tk8.5-8.5.11.orig/unix/Makefile.in
++++ tk8.5-8.5.11/unix/Makefile.in
 @@ -717,7 +717,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 ".."}}'`;\
@@ -26,8 +26,8 @@
  	    ) > "$(PKG_INDEX)"; \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.10.orig/unix/tcl.m4
-+++ tk8.5-8.5.10/unix/tcl.m4
+--- tk8.5-8.5.11.orig/unix/tcl.m4
++++ tk8.5-8.5.11/unix/tcl.m4
 @@ -1401,6 +1401,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -1,5 +1,5 @@
---- tk8.5-8.5.10.orig/unix/configure
-+++ tk8.5-8.5.10/unix/configure
+--- tk8.5-8.5.11.orig/unix/configure
++++ tk8.5-8.5.11/unix/configure
 @@ -11114,7 +11114,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.10.orig/unix/configure.in
-+++ tk8.5-8.5.10/unix/configure.in
+--- tk8.5-8.5.11.orig/unix/configure.in
++++ tk8.5-8.5.11/unix/configure.in
 @@ -605,7 +605,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi

Modified: tk8.5/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/tkport.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -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.10.orig/generic/tkPort.h
-+++ tk8.5-8.5.10/generic/tkPort.h
+--- tk8.5-8.5.11.orig/generic/tkPort.h
++++ tk8.5-8.5.11/generic/tkPort.h
 @@ -27,7 +27,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-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -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.10.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.10/unix/tkConfig.sh.in
+--- tk8.5-8.5.11.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.11/unix/tkConfig.sh.in
 @@ -53,7 +53,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.5/trunk/debian/patches/xft.diff
===================================================================
--- tk8.5/trunk/debian/patches/xft.diff	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/patches/xft.diff	2011-12-08 11:54:03 UTC (rev 1200)
@@ -4,8 +4,8 @@
 Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
 Last-updated: Sun, 26 Jun 2011 12:14:01 +0400
 
---- tk8.5-8.5.10.orig/unix/configure.in
-+++ tk8.5-8.5.10/unix/configure.in
+--- tk8.5-8.5.11.orig/unix/configure.in
++++ tk8.5-8.5.11/unix/configure.in
 @@ -528,8 +528,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
@@ -17,8 +17,8 @@
  	fi
  	AC_MSG_RESULT([$found_xft])
  	dnl make sure that compiling against Xft header file doesn't bomb
---- tk8.5-8.5.10.orig/unix/configure
-+++ tk8.5-8.5.10/unix/configure
+--- tk8.5-8.5.11.orig/unix/configure
++++ tk8.5-8.5.11/unix/configure
 @@ -10843,8 +10843,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2011-12-08 11:30:37 UTC (rev 1199)
+++ tk8.5/trunk/debian/rules	2011-12-08 11:54:03 UTC (rev 1200)
@@ -29,7 +29,9 @@
 	quilt push -a || test $$? = 2
 	touch patch-stamp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 	cd unix && \
@@ -170,8 +172,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_8.5.10.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5.10-src.tar.gz
+	wget -O tk8.5_8.5.11.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5.11-src.tar.gz
 
-.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: patch unpatch clean-patched build build-arch build-indep clean binary-indep binary-arch binary install get-orig-source

More information about the Pkg-tcltk-commits mailing list