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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Jun 26 08:13:27 UTC 2013 

Author: sgolovan
Date: 2013-06-26 08:13:26 +0000 (Wed, 26 Jun 2013)
New Revision: 1377

Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/control
   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]
  * Merged changes from experimental.
  * Fixed loading Tk library, broken in experimental.
  * Bumped standards version to 3.9.4.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/changelog	2013-06-26 08:13:26 UTC (rev 1377)
@@ -1,9 +1,31 @@
-tk8.5 (8.5.11-3) UNRELEASED; urgency=low
+tk8.5 (8.5.14-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Fixed loading Tk library, broken in experimental.
+  * Bumped standards version to 3.9.4.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 29 May 2012 20:21:43 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 26 Jun 2013 12:06:23 +0400
 
+tk8.5 (8.5.14-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Apr 2013 14:03:59 +0400
+
+tk8.5 (8.5.13-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 24 Nov 2012 12:08:12 +0400
+
+tk8.5 (8.5.12-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 28 Jul 2012 10:54:19 +0400
+
 tk8.5 (8.5.11-2) unstable; urgency=low
 
   * Install FontId(3tk) and MeasureChar(3tk) manpages because they are

Modified: tk8.5/trunk/debian/control
===================================================================
--- tk8.5/trunk/debian/control	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/control	2013-06-26 08:13:26 UTC (rev 1377)
@@ -4,7 +4,7 @@
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.tcl.tk/
 
 Package: tk8.5

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.11.orig/unix/configure
-+++ tk8.5-8.5.11/unix/configure
+--- tk8.5-8.5.14.orig/unix/configure
++++ tk8.5-8.5.14/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.11.orig/unix/tcl.m4
-+++ tk8.5-8.5.11/unix/tcl.m4
+--- tk8.5-8.5.14.orig/unix/tcl.m4
++++ tk8.5-8.5.14/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	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/manpages.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.11.orig/unix/installManPage
-+++ tk8.5-8.5.11/unix/installManPage
+--- tk8.5-8.5.14.orig/unix/installManPage
++++ tk8.5-8.5.14/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	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -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.11.orig/unix/configure
-+++ tk8.5-8.5.11/unix/configure
+--- tk8.5-8.5.14.orig/unix/configure
++++ tk8.5-8.5.14/unix/configure
 @@ -4743,6 +4743,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,18 +13,9 @@
  	    fi
  	fi
  
-@@ -5548,7 +5551,7 @@
- fi
- 
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 
---- tk8.5-8.5.11.orig/unix/tcl.m4
-+++ tk8.5-8.5.11/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tk8.5-8.5.14.orig/unix/tcl.m4
++++ tk8.5-8.5.14/unix/tcl.m4
+@@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -34,12 +25,3 @@
  	    fi
  	fi
      ])
-@@ -1391,7 +1394,7 @@
- 	        ])
- 	    ])
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/rpath.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -3,9 +3,9 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.5-8.5.11.orig/unix/configure
-+++ tk8.5-8.5.11/unix/configure
-@@ -5558,6 +5558,9 @@
+--- tk8.5-8.5.14.orig/unix/configure
++++ tk8.5-8.5.14/unix/configure
+@@ -5634,6 +5634,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.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 }";\
+--- tk8.5-8.5.14.orig/unix/Makefile.in
++++ tk8.5-8.5.14/unix/Makefile.in
+@@ -702,7 +702,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)\
--		[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.5-8.5.11.orig/unix/tcl.m4
-+++ tk8.5-8.5.11/unix/tcl.m4
-@@ -1401,6 +1401,9 @@
+ 	    if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
+-	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\
++	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0]] Tk]";\
+ 	    else \
+ 	    echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
+ 	    echo "	|| ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
+--- tk8.5-8.5.14.orig/unix/tcl.m4
++++ tk8.5-8.5.14/unix/tcl.m4
+@@ -1422,6 +1422,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	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.11.orig/unix/configure
-+++ tk8.5-8.5.11/unix/configure
-@@ -11114,7 +11114,7 @@
+--- tk8.5-8.5.14.orig/unix/configure
++++ tk8.5-8.5.14/unix/configure
+@@ -11415,7 +11415,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.5-8.5.11.orig/unix/configure.in
-+++ tk8.5-8.5.11/unix/configure.in
-@@ -605,7 +605,7 @@
+--- tk8.5-8.5.14.orig/unix/configure.in
++++ tk8.5-8.5.14/unix/configure.in
+@@ -638,7 +638,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.5/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/tkport.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -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.11.orig/generic/tkPort.h
-+++ tk8.5-8.5.11/generic/tkPort.h
+--- tk8.5-8.5.14.orig/generic/tkPort.h
++++ tk8.5-8.5.14/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	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -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.11.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.11/unix/tkConfig.sh.in
+--- tk8.5-8.5.14.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.14/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	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/patches/xft.diff	2013-06-26 08:13:26 UTC (rev 1377)
@@ -4,9 +4,9 @@
 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.11.orig/unix/configure.in
-+++ tk8.5-8.5.11/unix/configure.in
-@@ -528,8 +528,8 @@
+--- tk8.5-8.5.14.orig/unix/configure.in
++++ tk8.5-8.5.14/unix/configure.in
+@@ -478,8 +478,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes
@@ -17,9 +17,9 @@
  	fi
  	AC_MSG_RESULT([$found_xft])
  	dnl make sure that compiling against Xft header file doesn't bomb
---- tk8.5-8.5.11.orig/unix/configure
-+++ tk8.5-8.5.11/unix/configure
-@@ -10843,8 +10843,8 @@
+--- tk8.5-8.5.14.orig/unix/configure
++++ tk8.5-8.5.14/unix/configure
+@@ -10641,8 +10641,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2013-06-26 08:03:54 UTC (rev 1376)
+++ tk8.5/trunk/debian/rules	2013-06-26 08:13:26 UTC (rev 1377)
@@ -96,14 +96,13 @@
 	dh_compress -Xusr/share/doc/tk$(v)/examples/
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V 'tk$(v) (>= 8.5.0)'
+	dh_makeshlibs -V 'tk$(v) (>= $(v).0)'
 
 override_dh_shlibdeps:
 	dh_shlibdeps -ldebian/tk$(v)/usr/lib
 
 get-orig-source:
-	wget -O tk8.5_8.5.11.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5.11-src.tar.gz
+	wget -O tk$(v)_$(v).14.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk$(v).14-src.tar.gz
 
 .PHONY: override_dh_auto_configure override_dh_auto_configure override_dh_auto_build override_dh_auto_install override_dh_compress override_dh_makeshlibs override_dh_shlibdeps get-orig-source
-

More information about the Pkg-tcltk-commits mailing list