[Pkg-tcltk-commits] r1304 - in tk8.6/tags: . 8.6.0~b3-1/debian 8.6.0~b3-1/debian/patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Sep 21 04:57:16 UTC 2012
Author: sgolovan
Date: 2012-09-21 04:57:15 +0000 (Fri, 21 Sep 2012)
New Revision: 1304
Added:
tk8.6/tags/8.6.0~b3-1/
tk8.6/tags/8.6.0~b3-1/debian/changelog
tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff
tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff
tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff
tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff
tk8.6/tags/8.6.0~b3-1/debian/rules
Removed:
tk8.6/tags/8.6.0~b3-1/debian/changelog
tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff
tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff
tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff
tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff
tk8.6/tags/8.6.0~b3-1/debian/rules
Log:
[svn-buildpackage] Tagging tk8.6 8.6.0~b3-1
Deleted: tk8.6/tags/8.6.0~b3-1/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/tags/8.6.0~b3-1/debian/changelog 2012-09-21 04:57:15 UTC (rev 1304)
@@ -1,87 +0,0 @@
-tk8.6 (8.6.0~b2-3) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 20:50:28 +0400
-
-tk8.6 (8.6.0~b2-2) experimental; urgency=low
-
- * Fixed options(3tk) manpage.
- * Install FontId(3tk) and MeasureChar(3tk) manpages because they are
- referenced in the other manpages.
- * Fixed references to tclvars manpage.
- * Removed Chris Waters wrom the uploaders list (closes: #664118).
- * Switched to 3.0 (quilt) source package format.
- * Bumped debhelper compatibility version to 8.
- * Added hardening build flags using dpkg-buildflags.
- * Bumped standards version to 3.9.3.
-
- -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 20:44:31 +0400
-
-tk8.6 (8.6.0~b2-1) experimental; urgency=low
-
- * New upstream beta release.
-
- -- Sergei Golovan <sgolovan at debian.org> Mon, 08 Aug 2011 23:12:55 +0400
-
-tk8.6 (8.6.0~b2~rc4-1) experimental; urgency=low
-
- * New upstream beta release candidate.
-
- -- Sergei Golovan <sgolovan at debian.org> Sun, 07 Aug 2011 12:30:32 +0400
-
-tk8.6 (8.6.0~b2~rc0-1) experimental; urgency=low
-
- * New upstream beta release candidate.
- * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6
- * Fixed Xft detection in configure script, which is broken since xft-config
- was removed from the libxft-dev package.
- * Added README.source which explains how to apply quilt patches.
- * Bumped standards version to 3.9.2.
-
- -- Sergei Golovan <sgolovan at debian.org> Thu, 21 Jul 2011 10:31:32 +0400
-
-tk8.6 (8.6.0~b1-3) experimental; urgency=low
-
- * Added libxft-dev to tk8.6-dev dependencies because -lXft is stored in
- tkConfig.sh configuration script.
- * Replaced xterm by xvt in recommended dependencies to reduce implicit
- dependencies list.
- * Added ${misc:Depends} to debian/control file because the binary packages
- are built using debhelper.
- * Bumped standards version to 3.9.1.
-
- -- Sergei Golovan <sgolovan at debian.org> Sun, 31 Oct 2010 14:58:40 +0300
-
-tk8.6 (8.6.0~b1-2) experimental; urgency=low
-
- * Don't remove wish alternative in case of package upgrade because the
- manually installed alternative is also removed which isn't desirable.
-
- -- Sergei Golovan <sgolovan at debian.org> Sun, 01 Mar 2009 10:39:30 +0300
-
-tk8.6 (8.6.0~b1-1) experimental; urgency=low
-
- * New upstream beta release.
- * Added private ttk headers to tk8.6-dev binary package.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 27 Dec 2008 14:39:54 +0300
-
-tk8.6 (8.6.0~a3-1) experimental; urgency=low
-
- * New upstream alpha release.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 11 Oct 2008 02:19:43 +0400
-
-tk8.6 (8.6.0~a2-1) experimental; urgency=low
-
- * New upstream alpha release.
-
- -- Sergei Golovan <sgolovan at debian.org> Sat, 23 Aug 2008 12:35:08 +0400
-
-tk8.6 (8.6.0~a1-1) experimental; urgency=low
-
- * Initial alpha release (closes: #488655).
-
- -- Sergei Golovan <sgolovan at debian.org> Mon, 30 Jun 2008 15:57:54 +0400
-
Copied: tk8.6/tags/8.6.0~b3-1/debian/changelog (from rev 1303, tk8.6/trunk/debian/changelog)
===================================================================
--- tk8.6/tags/8.6.0~b3-1/debian/changelog (rev 0)
+++ tk8.6/tags/8.6.0~b3-1/debian/changelog 2012-09-21 04:57:15 UTC (rev 1304)
@@ -0,0 +1,87 @@
+tk8.6 (8.6.0~b3-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 21 Sep 2012 08:49:05 +0400
+
+tk8.6 (8.6.0~b2-2) experimental; urgency=low
+
+ * Fixed options(3tk) manpage.
+ * Install FontId(3tk) and MeasureChar(3tk) manpages because they are
+ referenced in the other manpages.
+ * Fixed references to tclvars manpage.
+ * Removed Chris Waters wrom the uploaders list (closes: #664118).
+ * Switched to 3.0 (quilt) source package format.
+ * Bumped debhelper compatibility version to 8.
+ * Added hardening build flags using dpkg-buildflags.
+ * Bumped standards version to 3.9.3.
+
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 20:44:31 +0400
+
+tk8.6 (8.6.0~b2-1) experimental; urgency=low
+
+ * New upstream beta release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 08 Aug 2011 23:12:55 +0400
+
+tk8.6 (8.6.0~b2~rc4-1) experimental; urgency=low
+
+ * New upstream beta release candidate.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 07 Aug 2011 12:30:32 +0400
+
+tk8.6 (8.6.0~b2~rc0-1) experimental; urgency=low
+
+ * New upstream beta release candidate.
+ * Moved /usr/share/tcltk/tk8.6/tkConfig.sh back to the /usr/lib/tk8.6
+ * Fixed Xft detection in configure script, which is broken since xft-config
+ was removed from the libxft-dev package.
+ * Added README.source which explains how to apply quilt patches.
+ * Bumped standards version to 3.9.2.
+
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 21 Jul 2011 10:31:32 +0400
+
+tk8.6 (8.6.0~b1-3) experimental; urgency=low
+
+ * Added libxft-dev to tk8.6-dev dependencies because -lXft is stored in
+ tkConfig.sh configuration script.
+ * Replaced xterm by xvt in recommended dependencies to reduce implicit
+ dependencies list.
+ * Added ${misc:Depends} to debian/control file because the binary packages
+ are built using debhelper.
+ * Bumped standards version to 3.9.1.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 31 Oct 2010 14:58:40 +0300
+
+tk8.6 (8.6.0~b1-2) experimental; urgency=low
+
+ * Don't remove wish alternative in case of package upgrade because the
+ manually installed alternative is also removed which isn't desirable.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 01 Mar 2009 10:39:30 +0300
+
+tk8.6 (8.6.0~b1-1) experimental; urgency=low
+
+ * New upstream beta release.
+ * Added private ttk headers to tk8.6-dev binary package.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 27 Dec 2008 14:39:54 +0300
+
+tk8.6 (8.6.0~a3-1) experimental; urgency=low
+
+ * New upstream alpha release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 11 Oct 2008 02:19:43 +0400
+
+tk8.6 (8.6.0~a2-1) experimental; urgency=low
+
+ * New upstream alpha release.
+
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 23 Aug 2008 12:35:08 +0400
+
+tk8.6 (8.6.0~a1-1) experimental; urgency=low
+
+ * Initial alpha release (closes: #488655).
+
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 30 Jun 2008 15:57:54 +0400
+
Deleted: tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff
===================================================================
--- tk8.6/trunk/debian/patches/manpages.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -1,27 +0,0 @@
-Patch by Chris Waters fixes installing of several manual pages which
-aren't installed by upstream script but are referenced inside other
-manual pages.
-
---- tk8.6b2.orig/unix/installManPage
-+++ tk8.6b2/unix/installManPage
-@@ -92,12 +92,20 @@
- exit 2 ;;
- esac
-
-+Name=`basename $ManPage .$Section`
- SrcDir=`dirname $ManPage`
-
- ########################################################################
- ### Process Page to Create Target Pages
- ###
-
-+Specials="FindPhoto FontId MeasureChar"
-+for n in $Specials; do
-+ if [ "$Name" = "$n" ] ; then
-+ Names="$n $Names"
-+ fi
-+done
-+
- First=""
- for Target in $Names; do
- Target=$Target.$Section$Suffix
Copied: tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff (from rev 1298, tk8.6/trunk/debian/patches/manpages.diff)
===================================================================
--- tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff (rev 0)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/manpages.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -0,0 +1,27 @@
+Patch by Chris Waters fixes installing of several manual pages which
+aren't installed by upstream script but are referenced inside other
+manual pages.
+
+--- tk8.6-8.6.0~b3.orig/unix/installManPage
++++ tk8.6-8.6.0~b3/unix/installManPage
+@@ -92,12 +92,20 @@
+ exit 2 ;;
+ esac
+
++Name=`basename $ManPage .$Section`
+ SrcDir=`dirname $ManPage`
+
+ ########################################################################
+ ### Process Page to Create Target Pages
+ ###
+
++Specials="FindPhoto FontId MeasureChar"
++for n in $Specials; do
++ if [ "$Name" = "$n" ] ; then
++ Names="$n $Names"
++ fi
++done
++
+ First=""
+ for Target in $Names; do
+ Target=$Target.$Section$Suffix
Deleted: tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -1,45 +0,0 @@
-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 @@
- if test "`uname -s`" = "AIX" ; then
- tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
- fi
-+ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
-+ tcl_cv_sys_version=NetBSD-Debian
-+ fi
- fi
- fi
-
-@@ -5333,7 +5336,7 @@
- fi
-
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_SUFFIX=".so"
-
---- tk8.6b2.orig/unix/tcl.m4
-+++ tk8.6b2/unix/tcl.m4
-@@ -925,6 +925,9 @@
- if test "`uname -s`" = "AIX" ; then
- tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
- fi
-+ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
-+ tcl_cv_sys_version=NetBSD-Debian
-+ fi
- fi
- fi
- ])
-@@ -1379,7 +1382,7 @@
- ])
- ])
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_SUFFIX=".so"
-
Copied: tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff (from rev 1298, tk8.6/trunk/debian/patches/non-linux.diff)
===================================================================
--- tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff (rev 0)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/non-linux.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -0,0 +1,45 @@
+Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
+building on non-linux Debian architectures.
+
+--- 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
++ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++ tcl_cv_sys_version=NetBSD-Debian
++ fi
+ fi
+ fi
+
+@@ -5424,7 +5427,7 @@
+ fi
+
+ ;;
+- Linux*)
++ Linux*|GNU*|NetBSD-Debian)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_SUFFIX=".so"
+
+--- 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
++ if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++ tcl_cv_sys_version=NetBSD-Debian
++ fi
+ fi
+ fi
+ ])
+@@ -1400,7 +1403,7 @@
+ ])
+ ])
+ ;;
+- Linux*)
++ Linux*|GNU*|NetBSD-Debian)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_SUFFIX=".so"
+
Deleted: tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff
===================================================================
--- tk8.6/trunk/debian/patches/rpath.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -1,40 +0,0 @@
-Patch by Chris Waters removes -rpath from search flags and adds -soname
-to library build options.
-
-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 @@
- # get rid of the warnings.
- #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-+ # following line added by CW for Debian GNU/Linux
-+ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
-+
- 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 @@
- 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 @@
- # get rid of the warnings.
- #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-+ # following line added by CW for Debian GNU/Linux
-+ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
-+
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
Copied: tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff (from rev 1298, tk8.6/trunk/debian/patches/rpath.diff)
===================================================================
--- tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff (rev 0)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/rpath.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -0,0 +1,40 @@
+Patch by Chris Waters removes -rpath from search flags and adds -soname
+to library build options.
+
+Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
+
+--- 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"
+
++ # following line added by CW for Debian GNU/Linux
++ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
++
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+--- 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 ".."}}'`;\
+ 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"
+
++ # following line added by CW for Debian GNU/Linux
++ TK_SHLIB_LD_EXTRAS="-Wl,-soname,\${TK_LIB_FILE}.0"
++
+ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
Deleted: tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -1,32 +0,0 @@
-Author: Sergei Golovan
-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: Wed, 20 Jul 2011 16:11:14 +0400
-
---- tk8.6b2.orig/unix/configure.in
-+++ tk8.6b2/unix/configure.in
-@@ -548,8 +548,8 @@
- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
- if test "$found_xft" = "no" ; then
- found_xft=yes
-- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
-- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
-+ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
-+ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
- 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 @@
- XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
- if test "$found_xft" = "no" ; then
- found_xft=yes
-- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
-- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
-+ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
-+ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
- fi
- echo "$as_me:$LINENO: result: $found_xft" >&5
- echo "${ECHO_T}$found_xft" >&6
Copied: tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff (from rev 1298, tk8.6/trunk/debian/patches/xft.diff)
===================================================================
--- tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff (rev 0)
+++ tk8.6/tags/8.6.0~b3-1/debian/patches/xft.diff 2012-09-21 04:57:15 UTC (rev 1304)
@@ -0,0 +1,32 @@
+Author: Sergei Golovan
+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: Wed, 20 Jul 2011 16:11:14 +0400
+
+--- 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
+- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
++ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+ fi
+ AC_MSG_RESULT([$found_xft])
+ dnl make sure that compiling against Xft header file doesn't bomb
+--- 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
+- XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+- XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++ XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
++ XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+ fi
+ echo "$as_me:$LINENO: result: $found_xft" >&5
+ echo "${ECHO_T}$found_xft" >&6
Deleted: tk8.6/tags/8.6.0~b3-1/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules 2012-09-19 04:44:36 UTC (rev 1297)
+++ tk8.6/tags/8.6.0~b3-1/debian/rules 2012-09-21 04:57:15 UTC (rev 1304)
@@ -1,110 +0,0 @@
-#!/usr/bin/make -f
-
-v = 8.6
-DIR = $(shell pwd)/debian/tmp
-
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-# See bug #446335
-CFLAGS += -fno-unit-at-a-time
-endif
-
-%:
- dh $@
-
-override_dh_auto_configure:
- TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- dh_auto_configure -Dunix -- \
- --includedir=/usr/include/tcl$(v) \
- --with-tcl=/usr/lib/tcl$(v) \
- --enable-shared \
- --enable-threads \
- --disable-rpath \
- --enable-xft \
- --enable-man-symlinks
-
-override_dh_auto_build:
- $(MAKE) -C unix
- # Build the static library
- cd unix && \
- ar cr libtk$(v).a *.o && \
- ar d libtk$(v).a tkAppInit.o && \
- ranlib libtk$(v).a
-
-override_dh_auto_install:
- $(MAKE) -C unix INSTALL_ROOT=$(DIR) \
- MAN_INSTALL_DIR=$(DIR)/usr/share/man \
- MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \
- install
- # Fix up pkgInstall.tcl
- cp $(DIR)/usr/lib/tk$(v)/* $(DIR)/usr/share/tcltk/tk$(v)
- # Fix up the libraries
- cp unix/libtk$(v).a $(DIR)/usr/lib
- mv $(DIR)/usr/lib/libtk$(v).so $(DIR)/usr/lib/libtk$(v).so.0
- ln -sf libtk$(v).so.0 $(DIR)/usr/lib/libtk$(v).so
- mv $(DIR)/usr/lib/*.sh $(DIR)/usr/lib/tk$(v)
- # Fix up the include files
- install -d $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk
- cp generic/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic
- cp generic/ttk/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk
- install -d $(DIR)/usr/include/tcl$(v)/tk-private/unix
- cp unix/*.h $(DIR)/usr/include/tcl$(v)/tk-private/unix
- install -d $(DIR)/usr/include/tcl$(v)/tk-private/compat
- cp compat/*.h $(DIR)/usr/include/tcl$(v)/tk-private/compat
- # move around the demos
- install -d -m 755 $(DIR)/usr/share/doc/tk$(v)/examples
- cp -a library/demos/* $(DIR)/usr/share/doc/tk$(v)/examples/
- rm -f $(DIR)/usr/share/doc/tk$(v)/examples/license.terms
- rm -rf $(DIR)/usr/share/tcltk/tk$(v)/demos
- ln -sf ../../doc/tk$(v)/examples $(DIR)/usr/share/tcltk/tk$(v)/demos
- # Fix up the manpages.
- cd $(DIR)/usr/share/man/man1 && mv wish.1 wish$(v).1
- cd $(DIR)/usr/share/man/man3 && \
- for f in *.[3n] ; do \
- f2=$$(echo $$f | sed -e 's/\.[3n]/.3tk/') ; \
- if [ -L $$f ]; then \
- l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tk/') ; \
- rm $$f ; \
- ln -sf $$l $$f2 ; \
- else \
- sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tk/' \
- -e 's/\([0-9A-Za-z]\+\)(3)/\1(3tk)/g' \
- -e 's/bgerror(n)/bgerror(3tcl)/g' \
- -e 's/fconfigure(n)/fconfigure(3tcl)/g' \
- -e 's/history(n)/history(3tcl)/g' \
- -e 's/interp(n)/interp(3tcl)/g' \
- -e 's/library(n)/library(3tcl)/g' \
- -e 's/load(n)/load(3tcl)/g' \
- -e 's/package(n)/package(3tcl)/g' \
- -e 's/puts(n)/puts(3tcl)/g' \
- -e 's/safe(n)/safe(3tcl)/g' \
- -e 's/source(n)/source(3tcl)/g' \
- -e 's/tclvars(n)/tclvars(3tcl)/g' \
- -e 's/tclvars\\fR(n)/tclvars\\fR(3tcl)/g' \
- -e 's/unknown(n)/unknown(3tcl)/g' \
- -e 's/(n)/(3tk)/g' \
- -e 's/^\.de OP$$/.de OOP/' \
- -e 's/^.OP /.OOP /' \
- $$f >$$f2 ; \
- rm $$f ; \
- fi ; \
- done
-
-override_dh_compress:
- dh_compress -Xusr/share/doc/tk$(v)/examples/
-
-override_dh_makeshlibs:
- dh_makeshlibs -V 'tk$(v) (>= $(v).0~b1)'
-
-override_dh_shlibdeps:
- 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
-
-.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
-
Copied: tk8.6/tags/8.6.0~b3-1/debian/rules (from rev 1298, tk8.6/trunk/debian/rules)
===================================================================
--- tk8.6/tags/8.6.0~b3-1/debian/rules (rev 0)
+++ tk8.6/tags/8.6.0~b3-1/debian/rules 2012-09-21 04:57:15 UTC (rev 1304)
@@ -0,0 +1,110 @@
+#!/usr/bin/make -f
+
+v = 8.6
+DIR = $(shell pwd)/debian/tmp
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
+ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+# See bug #446335
+CFLAGS += -fno-unit-at-a-time
+endif
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ dh_auto_configure -Dunix -- \
+ --includedir=/usr/include/tcl$(v) \
+ --with-tcl=/usr/lib/tcl$(v) \
+ --enable-shared \
+ --enable-threads \
+ --disable-rpath \
+ --enable-xft \
+ --enable-man-symlinks
+
+override_dh_auto_build:
+ $(MAKE) -C unix
+ # Build the static library
+ cd unix && \
+ ar cr libtk$(v).a *.o && \
+ ar d libtk$(v).a tkAppInit.o && \
+ ranlib libtk$(v).a
+
+override_dh_auto_install:
+ $(MAKE) -C unix INSTALL_ROOT=$(DIR) \
+ MAN_INSTALL_DIR=$(DIR)/usr/share/man \
+ MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \
+ install
+ # Fix up pkgInstall.tcl
+ cp $(DIR)/usr/lib/tk$(v)/* $(DIR)/usr/share/tcltk/tk$(v)
+ # Fix up the libraries
+ cp unix/libtk$(v).a $(DIR)/usr/lib
+ mv $(DIR)/usr/lib/libtk$(v).so $(DIR)/usr/lib/libtk$(v).so.0
+ ln -sf libtk$(v).so.0 $(DIR)/usr/lib/libtk$(v).so
+ mv $(DIR)/usr/lib/*.sh $(DIR)/usr/lib/tk$(v)
+ # Fix up the include files
+ install -d $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk
+ cp generic/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic
+ cp generic/ttk/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk
+ install -d $(DIR)/usr/include/tcl$(v)/tk-private/unix
+ cp unix/*.h $(DIR)/usr/include/tcl$(v)/tk-private/unix
+ install -d $(DIR)/usr/include/tcl$(v)/tk-private/compat
+ cp compat/*.h $(DIR)/usr/include/tcl$(v)/tk-private/compat
+ # move around the demos
+ install -d -m 755 $(DIR)/usr/share/doc/tk$(v)/examples
+ cp -a library/demos/* $(DIR)/usr/share/doc/tk$(v)/examples/
+ rm -f $(DIR)/usr/share/doc/tk$(v)/examples/license.terms
+ rm -rf $(DIR)/usr/share/tcltk/tk$(v)/demos
+ ln -sf ../../doc/tk$(v)/examples $(DIR)/usr/share/tcltk/tk$(v)/demos
+ # Fix up the manpages.
+ cd $(DIR)/usr/share/man/man1 && mv wish.1 wish$(v).1
+ cd $(DIR)/usr/share/man/man3 && \
+ for f in *.[3n] ; do \
+ f2=$$(echo $$f | sed -e 's/\.[3n]/.3tk/') ; \
+ if [ -L $$f ]; then \
+ l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tk/') ; \
+ rm $$f ; \
+ ln -sf $$l $$f2 ; \
+ else \
+ sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tk/' \
+ -e 's/\([0-9A-Za-z]\+\)(3)/\1(3tk)/g' \
+ -e 's/bgerror(n)/bgerror(3tcl)/g' \
+ -e 's/fconfigure(n)/fconfigure(3tcl)/g' \
+ -e 's/history(n)/history(3tcl)/g' \
+ -e 's/interp(n)/interp(3tcl)/g' \
+ -e 's/library(n)/library(3tcl)/g' \
+ -e 's/load(n)/load(3tcl)/g' \
+ -e 's/package(n)/package(3tcl)/g' \
+ -e 's/puts(n)/puts(3tcl)/g' \
+ -e 's/safe(n)/safe(3tcl)/g' \
+ -e 's/source(n)/source(3tcl)/g' \
+ -e 's/tclvars(n)/tclvars(3tcl)/g' \
+ -e 's/tclvars\\fR(n)/tclvars\\fR(3tcl)/g' \
+ -e 's/unknown(n)/unknown(3tcl)/g' \
+ -e 's/(n)/(3tk)/g' \
+ -e 's/^\.de OP$$/.de OOP/' \
+ -e 's/^.OP /.OOP /' \
+ $$f >$$f2 ; \
+ rm $$f ; \
+ fi ; \
+ done
+
+override_dh_compress:
+ dh_compress -Xusr/share/doc/tk$(v)/examples/
+
+override_dh_makeshlibs:
+ dh_makeshlibs -V 'tk$(v) (>= $(v).0~b1)'
+
+override_dh_shlibdeps:
+ dh_shlibdeps -ldebian/tk$(v)/usr/lib
+
+get-orig-source:
+ 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