[Pkg-tcltk-commits] r1489 - in tk8.6/branches/experimental/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Sep 24 16:30:37 UTC 2013
Author: sgolovan
Date: 2013-09-24 16:30:37 +0000 (Tue, 24 Sep 2013)
New Revision: 1489
Modified:
tk8.6/branches/experimental/debian/changelog
tk8.6/branches/experimental/debian/control
tk8.6/branches/experimental/debian/patches/confsearch.diff
tk8.6/branches/experimental/debian/patches/manpages.diff
tk8.6/branches/experimental/debian/patches/non-linux.diff
tk8.6/branches/experimental/debian/patches/tklibrary.diff
tk8.6/branches/experimental/debian/patches/tkprivate.diff
tk8.6/branches/experimental/debian/patches/xft.diff
tk8.6/branches/experimental/debian/rules
Log:
[tk8.6-experimental]
* New upstream release.
* Make tk8.6-doc replace tck8.6 because of moving the
/usr/share/tcltk/tk8.6/demos link.
Modified: tk8.6/branches/experimental/debian/changelog
===================================================================
--- tk8.6/branches/experimental/debian/changelog 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/changelog 2013-09-24 16:30:37 UTC (rev 1489)
@@ -1,8 +1,10 @@
-tk8.6 (8.6.0-5) UNRELEASED; urgency=low
+tk8.6 (8.6.1-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Make tk8.6-doc replace tck8.6 because of moving the
+ /usr/share/tcltk/tk8.6/demos link.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 19 Aug 2013 22:38:25 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 24 Sep 2013 20:23:15 +0400
tk8.6 (8.6.0-4) experimental; urgency=low
Modified: tk8.6/branches/experimental/debian/control
===================================================================
--- tk8.6/branches/experimental/debian/control 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/control 2013-09-24 16:30:37 UTC (rev 1489)
@@ -64,6 +64,7 @@
Depends: ${misc:Depends}
Suggests: tk8.6
Conflicts: tkdoc, tk8.6 (<< 8.6.0-2)
+Replaces: tk8.6 (<< 8.6.0-2)
Provides: tkdoc
Description: Tk toolkit for Tcl and X11 v8.6 - manual pages
Tk is a cross-platform graphical toolkit which provides the Motif
Modified: tk8.6/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tk8.6/branches/experimental/debian/patches/confsearch.diff 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/patches/confsearch.diff 2013-09-24 16:30:37 UTC (rev 1489)
@@ -2,9 +2,9 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
---- tk8.6-8.6.0.orig/unix/configure
-+++ tk8.6-8.6.0/unix/configure
-@@ -1432,6 +1432,7 @@
+--- tk8.6-8.6.1.orig/unix/configure
++++ tk8.6-8.6.1/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` \
@@ -12,8 +12,8 @@
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
---- tk8.6-8.6.0.orig/unix/tcl.m4
-+++ tk8.6-8.6.0/unix/tcl.m4
+--- tk8.6-8.6.1.orig/unix/tcl.m4
++++ tk8.6-8.6.1/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
Modified: tk8.6/branches/experimental/debian/patches/manpages.diff
===================================================================
--- tk8.6/branches/experimental/debian/patches/manpages.diff 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/patches/manpages.diff 2013-09-24 16:30:37 UTC (rev 1489)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.6-8.6.0.orig/unix/installManPage
-+++ tk8.6-8.6.0/unix/installManPage
+--- tk8.6-8.6.1.orig/unix/installManPage
++++ tk8.6-8.6.1/unix/installManPage
@@ -92,12 +92,20 @@
exit 2 ;;
esac
Modified: tk8.6/branches/experimental/debian/patches/non-linux.diff
===================================================================
--- tk8.6/branches/experimental/debian/patches/non-linux.diff 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/patches/non-linux.diff 2013-09-24 16:30:37 UTC (rev 1489)
@@ -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.orig/unix/configure
-+++ tk8.6-8.6.0/unix/configure
-@@ -4512,6 +4512,9 @@
+--- tk8.6-8.6.1.orig/unix/configure
++++ tk8.6-8.6.1/unix/configure
+@@ -4521,6 +4521,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -13,18 +13,9 @@
fi
fi
-@@ -5424,7 +5427,7 @@
- fi
-
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_SUFFIX=".so"
-
---- tk8.6-8.6.0.orig/unix/tcl.m4
-+++ tk8.6-8.6.0/unix/tcl.m4
-@@ -924,6 +924,9 @@
+--- tk8.6-8.6.1.orig/unix/tcl.m4
++++ tk8.6-8.6.1/unix/tcl.m4
+@@ -928,6 +928,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -34,12 +25,3 @@
fi
fi
])
-@@ -1400,7 +1403,7 @@
- ])
- ])
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_SUFFIX=".so"
-
Modified: tk8.6/branches/experimental/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/branches/experimental/debian/patches/tklibrary.diff 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/patches/tklibrary.diff 2013-09-24 16:30:37 UTC (rev 1489)
@@ -1,6 +1,6 @@
---- tk8.6-8.6.0.orig/unix/configure
-+++ tk8.6-8.6.0/unix/configure
-@@ -11115,7 +11115,7 @@
+--- tk8.6-8.6.1.orig/unix/configure
++++ tk8.6-8.6.1/unix/configure
+@@ -11213,7 +11213,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.orig/unix/configure.in
-+++ tk8.6-8.6.0/unix/configure.in
-@@ -634,7 +634,7 @@
+--- tk8.6-8.6.1.orig/unix/configure.in
++++ tk8.6-8.6.1/unix/configure.in
+@@ -666,7 +666,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.6/branches/experimental/debian/patches/tkprivate.diff
===================================================================
--- tk8.6/branches/experimental/debian/patches/tkprivate.diff 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/patches/tkprivate.diff 2013-09-24 16:30:37 UTC (rev 1489)
@@ -2,8 +2,8 @@
with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tk headers there).
---- tk8.6-8.6.0.orig/unix/tkConfig.sh.in
-+++ tk8.6-8.6.0/unix/tkConfig.sh.in
+--- tk8.6-8.6.1.orig/unix/tkConfig.sh.in
++++ tk8.6-8.6.1/unix/tkConfig.sh.in
@@ -53,7 +53,7 @@
# String to pass to linker to pick up the Tk library from its
Modified: tk8.6/branches/experimental/debian/patches/xft.diff
===================================================================
--- tk8.6/branches/experimental/debian/patches/xft.diff 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/patches/xft.diff 2013-09-24 16:30:37 UTC (rev 1489)
@@ -4,9 +4,9 @@
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.6-8.6.0.orig/unix/configure.in
-+++ tk8.6-8.6.0/unix/configure.in
-@@ -557,8 +557,8 @@
+--- tk8.6-8.6.1.orig/unix/configure.in
++++ tk8.6-8.6.1/unix/configure.in
+@@ -485,8 +485,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.6-8.6.0.orig/unix/configure
-+++ tk8.6-8.6.0/unix/configure
-@@ -10851,8 +10851,8 @@
+--- tk8.6-8.6.1.orig/unix/configure
++++ tk8.6-8.6.1/unix/configure
+@@ -10370,8 +10370,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
Modified: tk8.6/branches/experimental/debian/rules
===================================================================
--- tk8.6/branches/experimental/debian/rules 2013-09-24 16:22:40 UTC (rev 1488)
+++ tk8.6/branches/experimental/debian/rules 2013-09-24 16:30:37 UTC (rev 1489)
@@ -114,8 +114,8 @@
dh_shlibdeps -ldebian/libtk$(v)/usr/lib/$(DEB_HOST_MULTIARCH)
get-orig-source:
- wget -O tk$(v)_$(v).0.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk$(v).0-src.tar.gz
+ wget -O tk$(v)_$(v).1.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk$(v).1-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 \
More information about the Pkg-tcltk-commits
mailing list