[Pkg-tcltk-commits] r1298 - in tk8.6/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Wed Sep 19 05:00:01 UTC 2012
Author: sgolovan
Date: 2012-09-19 05:00:00 +0000 (Wed, 19 Sep 2012)
New Revision: 1298
Modified:
tk8.6/trunk/debian/changelog
tk8.6/trunk/debian/patches/manpages.diff
tk8.6/trunk/debian/patches/non-linux.diff
tk8.6/trunk/debian/patches/rpath.diff
tk8.6/trunk/debian/patches/xft.diff
tk8.6/trunk/debian/rules
Log:
[tk8.6]
* New upstream beta release.
Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/trunk/debian/changelog 2012-09-19 05:00:00 UTC (rev 1298)
@@ -1,8 +1,8 @@
-tk8.6 (8.6.0~b2-3) UNRELEASED; urgency=low
+tk8.6 (8.6.0~b3-1) experimental; urgency=low
- * NOT RELEASED YET
+ * New upstream beta release.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 20:50:28 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 19 Sep 2012 08:45:34 +0400
tk8.6 (8.6.0~b2-2) experimental; urgency=low
Modified: tk8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.6/trunk/debian/patches/manpages.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/trunk/debian/patches/manpages.diff 2012-09-19 05:00:00 UTC (rev 1298)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.6b2.orig/unix/installManPage
-+++ tk8.6b2/unix/installManPage
+--- tk8.6-8.6.0~b3.orig/unix/installManPage
++++ tk8.6-8.6.0~b3/unix/installManPage
@@ -92,12 +92,20 @@
exit 2 ;;
esac
Modified: tk8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/trunk/debian/patches/non-linux.diff 2012-09-19 05:00:00 UTC (rev 1298)
@@ -1,9 +1,9 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tk8.6b2.orig/unix/configure
-+++ tk8.6b2/unix/configure
-@@ -4497,6 +4497,9 @@
+--- tk8.6-8.6.0~b3.orig/unix/configure
++++ tk8.6-8.6.0~b3/unix/configure
+@@ -4512,6 +4512,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -13,7 +13,7 @@
fi
fi
-@@ -5333,7 +5336,7 @@
+@@ -5424,7 +5427,7 @@
fi
;;
@@ -22,9 +22,9 @@
SHLIB_CFLAGS="-fPIC"
SHLIB_SUFFIX=".so"
---- tk8.6b2.orig/unix/tcl.m4
-+++ tk8.6b2/unix/tcl.m4
-@@ -925,6 +925,9 @@
+--- tk8.6-8.6.0~b3.orig/unix/tcl.m4
++++ tk8.6-8.6.0~b3/unix/tcl.m4
+@@ -924,6 +924,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -34,7 +34,7 @@
fi
fi
])
-@@ -1379,7 +1382,7 @@
+@@ -1400,7 +1403,7 @@
])
])
;;
Modified: tk8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.6/trunk/debian/patches/rpath.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/trunk/debian/patches/rpath.diff 2012-09-19 05:00:00 UTC (rev 1298)
@@ -3,9 +3,9 @@
Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
---- tk8.6b2.orig/unix/configure
-+++ tk8.6b2/unix/configure
-@@ -5343,6 +5343,9 @@
+--- tk8.6-8.6.0~b3.orig/unix/configure
++++ tk8.6-8.6.0~b3/unix/configure
+@@ -5434,6 +5434,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.6b2.orig/unix/Makefile.in
-+++ tk8.6b2/unix/Makefile.in
-@@ -725,7 +725,7 @@
+--- tk8.6-8.6.0~b3.orig/unix/Makefile.in
++++ tk8.6-8.6.0~b3/unix/Makefile.in
+@@ -731,7 +731,7 @@
echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} 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 @DLL_INSTALL_DIR@/"
---- tk8.6b2.orig/unix/tcl.m4
-+++ tk8.6b2/unix/tcl.m4
-@@ -1389,6 +1389,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 join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
++ echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [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.6-8.6.0~b3.orig/unix/tcl.m4
++++ tk8.6-8.6.0~b3/unix/tcl.m4
+@@ -1410,6 +1410,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
Modified: tk8.6/trunk/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/trunk/debian/patches/xft.diff 2012-09-19 05:00:00 UTC (rev 1298)
@@ -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.6b2.orig/unix/configure.in
-+++ tk8.6b2/unix/configure.in
-@@ -548,8 +548,8 @@
+--- tk8.6-8.6.0~b3.orig/unix/configure.in
++++ tk8.6-8.6.0~b3/unix/configure.in
+@@ -557,8 +557,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.6b2.orig/unix/configure
-+++ tk8.6b2/unix/configure
-@@ -10692,8 +10692,8 @@
+--- tk8.6-8.6.0~b3.orig/unix/configure
++++ tk8.6-8.6.0~b3/unix/configure
+@@ -10851,8 +10851,8 @@
XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
if test "$found_xft" = "no" ; then
found_xft=yes
Modified: tk8.6/trunk/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/trunk/debian/rules 2012-09-19 05:00:00 UTC (rev 1298)
@@ -103,8 +103,8 @@
dh_shlibdeps -ldebian/tk$(v)/usr/lib
get-orig-source:
- wget -O tk$(v)_$(v).0~b2.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk$(v)b2-src.tar.gz
+ wget -O tk$(v)_$(v).0~b3.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk$(v)b3-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