[Pkg-tcltk-commits] r1137 - in tk8.5/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sun Jun 26 08:21:29 UTC 2011
Author: sgolovan
Date: 2011-06-26 08:21:29 +0000 (Sun, 26 Jun 2011)
New Revision: 1137
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
tk8.5/trunk/debian/tk8.5.postinst
Log:
[tk8.5]
* New upstream release (closes: #580731).
* Changed wish8.5 alternative priority to 850 to make it higher than wish8.4
priority (closes: #585942).
* Bumped standards version to 3.9.2.
Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/changelog 2011-06-26 08:21:29 UTC (rev 1137)
@@ -1,8 +1,11 @@
-tk8.5 (8.5.9-3) UNRELEASED; urgency=low
+tk8.5 (8.5.10-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release (closes: #580731).
+ * Changed wish8.5 alternative priority to 850 to make it higher than wish8.4
+ priority (closes: #585942).
+ * Bumped standards version to 3.9.2.
- -- Sergei Golovan <sgolovan at debian.org> Thu, 03 Mar 2011 20:12:57 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 26 Jun 2011 12:14:18 +0400
tk8.5 (8.5.9-2) unstable; urgency=low
Modified: tk8.5/trunk/debian/control
===================================================================
--- tk8.5/trunk/debian/control 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/control 2011-06-26 08:21:29 UTC (rev 1137)
@@ -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, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0), quilt
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Homepage: http://www.tcl.tk/
Package: tk8.5
Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/confsearch.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -2,8 +2,8 @@
and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
installation.
---- tk8.5-8.5.9.orig/unix/configure
-+++ tk8.5-8.5.9/unix/configure
+--- tk8.5-8.5.10.orig/unix/configure
++++ tk8.5-8.5.10/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.9.orig/unix/tcl.m4
-+++ tk8.5-8.5.9/unix/tcl.m4
+--- tk8.5-8.5.10.orig/unix/tcl.m4
++++ tk8.5-8.5.10/unix/tcl.m4
@@ -93,6 +93,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
@@ -22,7 +22,7 @@
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
-@@ -224,6 +225,7 @@
+@@ -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` \
Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/manpages.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.5-8.5.9.orig/unix/installManPage
-+++ tk8.5-8.5.9/unix/installManPage
+--- tk8.5-8.5.10.orig/unix/installManPage
++++ tk8.5-8.5.10/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-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/non-linux.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -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.9.orig/unix/configure
-+++ tk8.5-8.5.9/unix/configure
+--- tk8.5-8.5.10.orig/unix/configure
++++ tk8.5-8.5.10/unix/configure
@@ -4743,6 +4743,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,18 +13,18 @@
fi
fi
-@@ -5524,7 +5527,7 @@
+@@ -5548,7 +5551,7 @@
fi
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
---- tk8.5-8.5.9.orig/unix/tcl.m4
-+++ tk8.5-8.5.9/unix/tcl.m4
-@@ -964,6 +964,9 @@
+
+--- tk8.5-8.5.10.orig/unix/tcl.m4
++++ tk8.5-8.5.10/unix/tcl.m4
+@@ -962,6 +962,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -34,12 +34,12 @@
fi
fi
])
-@@ -1410,7 +1413,7 @@
+@@ -1391,7 +1394,7 @@
])
])
;;
- Linux*)
+ Linux*|GNU*|NetBSD-Debian)
SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
+
Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/rpath.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -3,9 +3,9 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
---- tk8.5-8.5.9.orig/unix/configure
-+++ tk8.5-8.5.9/unix/configure
-@@ -5535,6 +5535,9 @@
+--- tk8.5-8.5.10.orig/unix/configure
++++ tk8.5-8.5.10/unix/configure
+@@ -5558,6 +5558,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,9 +15,9 @@
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
---- tk8.5-8.5.9.orig/unix/Makefile.in
-+++ tk8.5-8.5.9/unix/Makefile.in
-@@ -719,7 +719,7 @@
+--- tk8.5-8.5.10.orig/unix/Makefile.in
++++ tk8.5-8.5.10/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 ".."}}'`;\
echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
@@ -26,9 +26,9 @@
) > "$(PKG_INDEX)"; \
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.9.orig/unix/tcl.m4
-+++ tk8.5-8.5.9/unix/tcl.m4
-@@ -1421,6 +1421,9 @@
+--- tk8.5-8.5.10.orig/unix/tcl.m4
++++ tk8.5-8.5.10/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-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/tklibrary.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.9.orig/unix/configure
-+++ tk8.5-8.5.9/unix/configure
-@@ -11087,7 +11087,7 @@
+--- tk8.5-8.5.10.orig/unix/configure
++++ tk8.5-8.5.10/unix/configure
+@@ -11114,7 +11114,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.9.orig/unix/configure.in
-+++ tk8.5-8.5.9/unix/configure.in
-@@ -607,7 +607,7 @@
+--- tk8.5-8.5.10.orig/unix/configure.in
++++ tk8.5-8.5.10/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-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/tkport.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -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.5-8.5.9.orig/generic/tkPort.h
-+++ tk8.5-8.5.9/generic/tkPort.h
-@@ -29,7 +29,7 @@
+--- tk8.5-8.5.10.orig/generic/tkPort.h
++++ tk8.5-8.5.10/generic/tkPort.h
+@@ -27,7 +27,7 @@
# if defined(MAC_OSX_TK)
# include "tkMacOSXPort.h"
# else
Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/tkprivate.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -2,9 +2,9 @@
with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
puts private Tk headers there).
---- tk8.5-8.5.9.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.9/unix/tkConfig.sh.in
-@@ -55,7 +55,7 @@
+--- tk8.5-8.5.10.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.10/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.
Modified: tk8.5/trunk/debian/patches/xft.diff
===================================================================
--- tk8.5/trunk/debian/patches/xft.diff 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/patches/xft.diff 2011-06-26 08:21:29 UTC (rev 1137)
@@ -2,11 +2,11 @@
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: Thu, 03 Mar 2011 11:00:32 +0300
+Last-updated: Sun, 26 Jun 2011 12:14:01 +0400
---- tk8.5-8.5.9.orig/unix/configure.in
-+++ tk8.5-8.5.9/unix/configure.in
-@@ -530,8 +530,8 @@
+--- tk8.5-8.5.10.orig/unix/configure.in
++++ tk8.5-8.5.10/unix/configure.in
+@@ -528,8 +528,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
@@ -17,18 +17,9 @@
fi
AC_MSG_RESULT([$found_xft])
dnl make sure that compiling against Xft header file doesn't bomb
-@@ -552,7 +552,7 @@
- CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
- tk_oldLibs=$LIBS
- LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-- AC_CHECK_LIB(Xft, FT_New_Face, [], [
-+ AC_CHECK_LIB(Xft, XftFontOpen, [], [
- found_xft=no
- ])
- CFLAGS=$tk_oldCFlags
---- tk8.5-8.5.9.orig/unix/configure
-+++ tk8.5-8.5.9/unix/configure
-@@ -10816,8 +10816,8 @@
+--- tk8.5-8.5.10.orig/unix/configure
++++ tk8.5-8.5.10/unix/configure
+@@ -10843,8 +10843,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
@@ -39,56 +30,3 @@
fi
echo "$as_me:$LINENO: result: $found_xft" >&5
echo "${ECHO_T}$found_xft" >&6
-@@ -10892,9 +10892,9 @@
- tk_oldLibs=$LIBS
- LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-
--echo "$as_me:$LINENO: checking for FT_New_Face in -lXft" >&5
--echo $ECHO_N "checking for FT_New_Face in -lXft... $ECHO_C" >&6
--if test "${ac_cv_lib_Xft_FT_New_Face+set}" = set; then
-+echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
-+echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
-+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -10912,11 +10912,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char FT_New_Face ();
-+char XftFontOpen ();
- int
- main ()
- {
--FT_New_Face ();
-+XftFontOpen ();
- ;
- return 0;
- }
-@@ -10943,20 +10943,20 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_lib_Xft_FT_New_Face=yes
-+ ac_cv_lib_Xft_XftFontOpen=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_Xft_FT_New_Face=no
-+ac_cv_lib_Xft_XftFontOpen=no
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_FT_New_Face" >&5
--echo "${ECHO_T}$ac_cv_lib_Xft_FT_New_Face" >&6
--if test $ac_cv_lib_Xft_FT_New_Face = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
-+if test $ac_cv_lib_Xft_XftFontOpen = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBXFT 1
- _ACEOF
Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/rules 2011-06-26 08:21:29 UTC (rev 1137)
@@ -170,8 +170,8 @@
binary: binary-indep binary-arch
get-orig-source:
- wget -O tk8.5_8.5.9.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.5.9-src.tar.gz
+ wget -O tk8.5_8.5.10.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk8.5.10-src.tar.gz
.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
Modified: tk8.5/trunk/debian/tk8.5.postinst
===================================================================
--- tk8.5/trunk/debian/tk8.5.postinst 2011-06-26 08:20:46 UTC (rev 1136)
+++ tk8.5/trunk/debian/tk8.5.postinst 2011-06-26 08:21:29 UTC (rev 1137)
@@ -3,7 +3,7 @@
set -e
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.5 840 \
+ update-alternatives --install /usr/bin/wish wish /usr/bin/wish8.5 850 \
--slave /usr/share/man/man1/wish.1.gz wish.1 \
/usr/share/man/man1/wish8.5.1.gz
fi
More information about the Pkg-tcltk-commits
mailing list