[Pkg-tcltk-commits] r1503 - in tk8.5/branches/experimental/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Sep 25 17:50:14 UTC 2013 

Author: sgolovan
Date: 2013-09-25 17:50:14 +0000 (Wed, 25 Sep 2013)
New Revision: 1503

Added:
   tk8.5/branches/experimental/debian/tk8.5-dev.dirs
   tk8.5/branches/experimental/debian/tk8.5-dev.install
Removed:
   tk8.5/branches/experimental/debian/libtk8.5-dev.dirs
   tk8.5/branches/experimental/debian/libtk8.5-dev.install
Modified:
   tk8.5/branches/experimental/debian/changelog
   tk8.5/branches/experimental/debian/control
   tk8.5/branches/experimental/debian/patches/confsearch.diff
   tk8.5/branches/experimental/debian/patches/manpages.diff
   tk8.5/branches/experimental/debian/patches/non-linux.diff
   tk8.5/branches/experimental/debian/patches/tklibrary.diff
   tk8.5/branches/experimental/debian/patches/tkprivate.diff
   tk8.5/branches/experimental/debian/patches/xft.diff
   tk8.5/branches/experimental/debian/rules
Log:
[tk8.5-experimental]
  * New upstream release.
  * Renamed the development package back to tk8.5-dev after a discussion on
    debian-devel mailing list.
  * Make tk8.5-doc replace tk8.5 because of moving the
    /usr/share/tcltk/tk8.5/demos link (closes: #722940).


Modified: tk8.5/branches/experimental/debian/changelog
===================================================================
--- tk8.5/branches/experimental/debian/changelog	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/changelog	2013-09-25 17:50:14 UTC (rev 1503)
@@ -1,8 +1,12 @@
-tk8.5 (8.5.14-6) UNRELEASED; urgency=low
+tk8.5 (8.5.15-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Renamed the development package back to tk8.5-dev after a discussion on
+    debian-devel mailing list.
+  * Make tk8.5-doc replace tk8.5 because of moving the
+    /usr/share/tcltk/tk8.5/demos link (closes: #722940).
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 19 Aug 2013 22:38:08 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 25 Sep 2013 21:42:34 +0400
 
 tk8.5 (8.5.14-5) experimental; urgency=low
 

Modified: tk8.5/branches/experimental/debian/control
===================================================================
--- tk8.5/branches/experimental/debian/control	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/control	2013-09-25 17:50:14 UTC (rev 1503)
@@ -4,7 +4,7 @@
 Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev,
- libx11-dev, libxss-dev, libxext-dev, libxft-dev, libtcl8.5-dev (>= 8.5.14-3)
+ libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.14-3)
 Standards-Version: 3.9.4
 Homepage: http://www.tcl.tk/
 
@@ -38,17 +38,14 @@
  This package contains the Tk library and supplementary packages you
  need to run Tk-enabled apps.
 
-Package: libtk8.5-dev
+Package: tk8.5-dev
 Section: libdevel
 Priority: optional
 Architecture: any
 Depends: dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxss-dev,
- libxext-dev, libxft-dev, libtcl8.5-dev (>= 8.5.14-2),
+ libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.14-2),
  libtk8.5 (= ${binary:Version}), tk8.5, ${misc:Depends}
 Suggests: tk8.5-doc
-Conflicts: tk8.5-dev
-Replaces: tk8.5-dev
-Provides: tk8.5-dev
 Multi-Arch: same
 Description: Tk toolkit for Tcl and X11, v8.5 - development files
  Tk is a cross-platform graphical toolkit which provides the Motif
@@ -63,6 +60,7 @@
 Depends: ${misc:Depends}
 Suggests: tk8.5
 Conflicts: tkdoc, tk8.3-doc, tk8.4-doc, tk8.5 (<< 8.5.14-2)
+Replaces: tk8.5 (<< 8.5.14-2)
 Provides: tkdoc
 Description: Tk toolkit for Tcl and X11, v8.5 - manual pages
  Tk is a cross-platform graphical toolkit which provides the Motif

Deleted: tk8.5/branches/experimental/debian/libtk8.5-dev.dirs
===================================================================
--- tk8.5/branches/experimental/debian/libtk8.5-dev.dirs	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/libtk8.5-dev.dirs	2013-09-25 17:50:14 UTC (rev 1503)
@@ -1 +0,0 @@
-usr/lib/tk8.5

Deleted: tk8.5/branches/experimental/debian/libtk8.5-dev.install
===================================================================
--- tk8.5/branches/experimental/debian/libtk8.5-dev.install	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/libtk8.5-dev.install	2013-09-25 17:50:14 UTC (rev 1503)
@@ -1,4 +0,0 @@
-usr/include
-usr/lib/*/*.a
-usr/lib/*/tk*/*.sh
-debian/tkConfig.sh	usr/lib/tk8.5

Modified: tk8.5/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/confsearch.diff	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/patches/confsearch.diff	2013-09-25 17:50:14 UTC (rev 1503)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.14.orig/unix/configure
-+++ tk8.5-8.5.14/unix/configure
+--- tk8.5-8.5.15.orig/unix/configure
++++ tk8.5-8.5.15/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.14.orig/unix/tcl.m4
-+++ tk8.5-8.5.14/unix/tcl.m4
+--- tk8.5-8.5.15.orig/unix/tcl.m4
++++ tk8.5-8.5.15/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/branches/experimental/debian/patches/manpages.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/manpages.diff	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/patches/manpages.diff	2013-09-25 17:50:14 UTC (rev 1503)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.14.orig/unix/installManPage
-+++ tk8.5-8.5.14/unix/installManPage
+--- tk8.5-8.5.15.orig/unix/installManPage
++++ tk8.5-8.5.15/unix/installManPage
 @@ -91,8 +91,16 @@
  	exit 2 ;;
  esac

Modified: tk8.5/branches/experimental/debian/patches/non-linux.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/non-linux.diff	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/patches/non-linux.diff	2013-09-25 17:50:14 UTC (rev 1503)
@@ -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.14.orig/unix/configure
-+++ tk8.5-8.5.14/unix/configure
-@@ -4743,6 +4743,9 @@
+--- tk8.5-8.5.15.orig/unix/configure
++++ tk8.5-8.5.15/unix/configure
+@@ -4744,6 +4744,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,8 +13,8 @@
  	    fi
  	fi
  
---- tk8.5-8.5.14.orig/unix/tcl.m4
-+++ tk8.5-8.5.14/unix/tcl.m4
+--- tk8.5-8.5.15.orig/unix/tcl.m4
++++ tk8.5-8.5.15/unix/tcl.m4
 @@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tk8.5/branches/experimental/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tklibrary.diff	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/patches/tklibrary.diff	2013-09-25 17:50:14 UTC (rev 1503)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.14.orig/unix/configure
-+++ tk8.5-8.5.14/unix/configure
-@@ -11415,7 +11415,7 @@
+--- tk8.5-8.5.15.orig/unix/configure
++++ tk8.5-8.5.15/unix/configure
+@@ -11326,7 +11326,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.14.orig/unix/configure.in
-+++ tk8.5-8.5.14/unix/configure.in
-@@ -638,7 +638,7 @@
+--- tk8.5-8.5.15.orig/unix/configure.in
++++ tk8.5-8.5.15/unix/configure.in
+@@ -641,7 +641,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.5/branches/experimental/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tkprivate.diff	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/patches/tkprivate.diff	2013-09-25 17:50:14 UTC (rev 1503)
@@ -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.14.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.14/unix/tkConfig.sh.in
+--- tk8.5-8.5.15.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.15/unix/tkConfig.sh.in
 @@ -53,7 +53,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.5/branches/experimental/debian/patches/xft.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/xft.diff	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/patches/xft.diff	2013-09-25 17:50:14 UTC (rev 1503)
@@ -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.14.orig/unix/configure.in
-+++ tk8.5-8.5.14/unix/configure.in
-@@ -478,8 +478,8 @@
+--- tk8.5-8.5.15.orig/unix/configure.in
++++ tk8.5-8.5.15/unix/configure.in
+@@ -481,8 +481,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.14.orig/unix/configure
-+++ tk8.5-8.5.14/unix/configure
-@@ -10641,8 +10641,8 @@
+--- tk8.5-8.5.15.orig/unix/configure
++++ tk8.5-8.5.15/unix/configure
+@@ -10552,8 +10552,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
  	    found_xft=yes

Modified: tk8.5/branches/experimental/debian/rules
===================================================================
--- tk8.5/branches/experimental/debian/rules	2013-09-25 17:36:58 UTC (rev 1502)
+++ tk8.5/branches/experimental/debian/rules	2013-09-25 17:50:14 UTC (rev 1503)
@@ -113,8 +113,8 @@
 	dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
 
 get-orig-source:
-	wget -O tk$(v)_$(v).14.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk$(v).14-src.tar.gz
+	wget -O tk$(v)_$(v).15.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk$(v).15-src.tar.gz
 
 .PHONY: override_dh_auto_clean override_dh_auto_configure override_dh_auto_build \
 	override_dh_auto_install override_dh_compress override_dh_makeshlibs \

Copied: tk8.5/branches/experimental/debian/tk8.5-dev.dirs (from rev 1428, tk8.5/branches/experimental/debian/libtk8.5-dev.dirs)
===================================================================
--- tk8.5/branches/experimental/debian/tk8.5-dev.dirs	                        (rev 0)
+++ tk8.5/branches/experimental/debian/tk8.5-dev.dirs	2013-09-25 17:50:14 UTC (rev 1503)
@@ -0,0 +1 @@
+usr/lib/tk8.5

Copied: tk8.5/branches/experimental/debian/tk8.5-dev.install (from rev 1428, tk8.5/branches/experimental/debian/libtk8.5-dev.install)
===================================================================
--- tk8.5/branches/experimental/debian/tk8.5-dev.install	                        (rev 0)
+++ tk8.5/branches/experimental/debian/tk8.5-dev.install	2013-09-25 17:50:14 UTC (rev 1503)
@@ -0,0 +1,4 @@
+usr/include
+usr/lib/*/*.a
+usr/lib/*/tk*/*.sh
+debian/tkConfig.sh	usr/lib/tk8.5

More information about the Pkg-tcltk-commits mailing list