[Pkg-tcltk-commits] r422 - in tk8.5/trunk/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Wed Dec 19 08:25:10 UTC 2007 

Author: sgolovan-guest
Date: 2007-12-19 08:25:10 +0000 (Wed, 19 Dec 2007)
New Revision: 422

Added:
   tk8.5/trunk/debian/watch
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/tkprivate.diff
   tk8.5/trunk/debian/rules
   tk8.5/trunk/debian/tk8.5.dirs
Log:
[tk8.5]
  * New upstream release.
  * Removed empty directory /usr/share/tk8.5 from the binary package.
  * Added uscan control file debian/watch.
  * Changed tk8.5 version in shlibs to 8.5.0.
  * Bumped standards version to 3.7.3.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/changelog	2007-12-19 08:25:10 UTC (rev 422)
@@ -1,8 +1,12 @@
-tk8.5 (0.b3-2) UNRELEASED; urgency=low
+tk8.5 (8.5.0-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Removed empty directory /usr/share/tk8.5 from the binary package.
+  * Added uscan control file debian/watch.
+  * Changed tk8.5 version in shlibs to 8.5.0.
+  * Bumped standards version to 3.7.3.
 
- -- Sergei Golovan <sgolovan at debian.org>  Wed, 21 Nov 2007 19:52:14 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 19 Dec 2007 11:19:51 +0300
 
 tk8.5 (0.b3-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/control
===================================================================
--- tk8.5/trunk/debian/control	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/control	2007-12-19 08:25:10 UTC (rev 422)
@@ -3,8 +3,8 @@
 Priority: optional
 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 | x-dev, libx11-dev, libxt-dev, libxss-dev | libxext-dev, libxft-dev, tcl8.5-dev (>= 0.b1), quilt
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, libxss-dev | libxext-dev, libxft-dev, tcl8.5-dev (>= 0.b3), quilt
+Standards-Version: 3.7.3
 Homepage: http://www.tcl.tk/
 
 Package: tk8.5
@@ -37,7 +37,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: x11proto-core-dev | x-dev, libx11-dev, tcl8.5-dev (>= 0.b1), tk8.5 (= ${binary:Version})
+Depends: x11proto-core-dev | x-dev, libx11-dev, tcl8.5-dev (>= 0.b3), tk8.5 (= ${binary:Version})
 Suggests: tk8.5-doc
 Description: Tk toolkit for Tcl and X11, v8.5 - development files
  Tk is a cross-platform graphical toolkit which provides the Motif

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2007-12-19 08:25:10 UTC (rev 422)
@@ -2,10 +2,10 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
-Index: tk8.5-0.b3/unix/configure
+Index: tk8.5-8.5.0/unix/configure
 ===================================================================
---- tk8.5-0.b3.orig/unix/configure	2007-11-21 19:05:20.000000000 +0300
-+++ tk8.5-0.b3/unix/configure	2007-11-21 19:05:28.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/configure	2007-12-19 11:22:32.000000000 +0300
++++ tk8.5-8.5.0/unix/configure	2007-12-19 11:22:41.000000000 +0300
 @@ -1430,6 +1430,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
@@ -14,10 +14,10 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
-Index: tk8.5-0.b3/unix/tcl.m4
+Index: tk8.5-8.5.0/unix/tcl.m4
 ===================================================================
---- tk8.5-0.b3.orig/unix/tcl.m4	2007-11-20 18:46:42.000000000 +0300
-+++ tk8.5-0.b3/unix/tcl.m4	2007-11-21 19:05:28.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/tcl.m4	2007-12-17 20:57:25.000000000 +0300
++++ tk8.5-8.5.0/unix/tcl.m4	2007-12-19 11:22:41.000000000 +0300
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/patches/manpages.diff	2007-12-19 08:25:10 UTC (rev 422)
@@ -2,10 +2,10 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
-Index: tk8.5-0.b3/unix/installManPage
+Index: tk8.5-8.5.0/unix/installManPage
 ===================================================================
---- tk8.5-0.b3.orig/unix/installManPage	2007-11-20 18:46:42.000000000 +0300
-+++ tk8.5-0.b3/unix/installManPage	2007-11-21 19:07:26.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/installManPage	2007-12-17 20:57:25.000000000 +0300
++++ tk8.5-8.5.0/unix/installManPage	2007-12-19 11:22:49.000000000 +0300
 @@ -51,7 +51,16 @@
      }' $MANPAGE`
  

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2007-12-19 08:25:10 UTC (rev 422)
@@ -1,10 +1,10 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
-Index: tk8.5-0.b3/unix/configure
+Index: tk8.5-8.5.0/unix/configure
 ===================================================================
---- tk8.5-0.b3.orig/unix/configure	2007-11-21 19:07:17.000000000 +0300
-+++ tk8.5-0.b3/unix/configure	2007-11-21 19:07:21.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/configure	2007-12-19 11:22:44.000000000 +0300
++++ tk8.5-8.5.0/unix/configure	2007-12-19 11:22:47.000000000 +0300
 @@ -4741,6 +4741,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -24,10 +24,10 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
-Index: tk8.5-0.b3/unix/tcl.m4
+Index: tk8.5-8.5.0/unix/tcl.m4
 ===================================================================
---- tk8.5-0.b3.orig/unix/tcl.m4	2007-11-21 19:07:17.000000000 +0300
-+++ tk8.5-0.b3/unix/tcl.m4	2007-11-21 19:07:21.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/tcl.m4	2007-12-19 11:22:44.000000000 +0300
++++ tk8.5-8.5.0/unix/tcl.m4	2007-12-19 11:22:47.000000000 +0300
 @@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/patches/rpath.diff	2007-12-19 08:25:10 UTC (rev 422)
@@ -3,10 +3,10 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
-Index: tk8.5-0.b3/unix/configure
+Index: tk8.5-8.5.0/unix/configure
 ===================================================================
---- tk8.5-0.b3.orig/unix/configure	2007-11-21 19:05:28.000000000 +0300
-+++ tk8.5-0.b3/unix/configure	2007-11-21 19:07:17.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/configure	2007-12-19 11:22:41.000000000 +0300
++++ tk8.5-8.5.0/unix/configure	2007-12-19 11:22:44.000000000 +0300
 @@ -5549,6 +5549,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -17,10 +17,10 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
-Index: tk8.5-0.b3/unix/Makefile.in
+Index: tk8.5-8.5.0/unix/Makefile.in
 ===================================================================
---- tk8.5-0.b3.orig/unix/Makefile.in	2007-11-20 18:46:42.000000000 +0300
-+++ tk8.5-0.b3/unix/Makefile.in	2007-11-21 19:07:17.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/Makefile.in	2007-12-17 20:57:25.000000000 +0300
++++ tk8.5-8.5.0/unix/Makefile.in	2007-12-19 11:22:44.000000000 +0300
 @@ -710,7 +710,7 @@
  		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
@@ -30,10 +30,10 @@
  	    ) > $(PKG_INDEX); \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
-Index: tk8.5-0.b3/unix/tcl.m4
+Index: tk8.5-8.5.0/unix/tcl.m4
 ===================================================================
---- tk8.5-0.b3.orig/unix/tcl.m4	2007-11-21 19:05:28.000000000 +0300
-+++ tk8.5-0.b3/unix/tcl.m4	2007-11-21 19:07:17.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/tcl.m4	2007-12-19 11:22:41.000000000 +0300
++++ tk8.5-8.5.0/unix/tcl.m4	2007-12-19 11:22:44.000000000 +0300
 @@ -1429,6 +1429,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	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2007-12-19 08:25:10 UTC (rev 422)
@@ -1,7 +1,7 @@
-Index: tk8.5-0.b3/unix/configure
+Index: tk8.5-8.5.0/unix/configure
 ===================================================================
---- tk8.5-0.b3.orig/unix/configure	2007-11-20 18:46:42.000000000 +0300
-+++ tk8.5-0.b3/unix/configure	2007-11-21 19:05:20.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/configure	2007-12-17 20:57:25.000000000 +0300
++++ tk8.5-8.5.0/unix/configure	2007-12-19 11:22:32.000000000 +0300
 @@ -10554,7 +10554,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
@@ -11,10 +11,10 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
-Index: tk8.5-0.b3/unix/configure.in
+Index: tk8.5-8.5.0/unix/configure.in
 ===================================================================
---- tk8.5-0.b3.orig/unix/configure.in	2007-11-20 18:46:42.000000000 +0300
-+++ tk8.5-0.b3/unix/configure.in	2007-11-21 19:05:20.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/configure.in	2007-12-17 20:57:25.000000000 +0300
++++ tk8.5-8.5.0/unix/configure.in	2007-12-19 11:22:32.000000000 +0300
 @@ -558,7 +558,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi

Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2007-12-19 08:25:10 UTC (rev 422)
@@ -2,10 +2,10 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
-Index: tk8.5-0.b3/unix/tkConfig.sh.in
+Index: tk8.5-8.5.0/unix/tkConfig.sh.in
 ===================================================================
---- tk8.5-0.b3.orig/unix/tkConfig.sh.in	2007-11-20 18:46:42.000000000 +0300
-+++ tk8.5-0.b3/unix/tkConfig.sh.in	2007-11-21 19:05:25.000000000 +0300
+--- tk8.5-8.5.0.orig/unix/tkConfig.sh.in	2007-12-17 20:57:25.000000000 +0300
++++ tk8.5-8.5.0/unix/tkConfig.sh.in	2007-12-19 11:22:39.000000000 +0300
 @@ -55,7 +55,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/rules	2007-12-19 08:25:10 UTC (rev 422)
@@ -156,7 +156,7 @@
 	dh_fixperms -a
 	dh_strip -a
 	dh_compress -a -Xusr/share/doc/tk$(v)/examples/
-	dh_makeshlibs -a -V 'tk$(v) (>= 0.b1)'
+	dh_makeshlibs -a -V 'tk$(v) (>= 8.5.0)'
 	dh_installdeb -a
 	dh_shlibdeps -a -ldebian/tk$(v)/usr/lib
 	dh_gencontrol -a
@@ -169,8 +169,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_0.b3.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5b3-src.tar.gz
+	wget -O tk8.5_8.5.0.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5.0-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.dirs
===================================================================
--- tk8.5/trunk/debian/tk8.5.dirs	2007-12-19 08:15:03 UTC (rev 421)
+++ tk8.5/trunk/debian/tk8.5.dirs	2007-12-19 08:25:10 UTC (rev 422)
@@ -1 +1 @@
-usr/share/tk8.5
+usr/share

Added: tk8.5/trunk/debian/watch
===================================================================
--- tk8.5/trunk/debian/watch	                        (rev 0)
+++ tk8.5/trunk/debian/watch	2007-12-19 08:25:10 UTC (rev 422)
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/tcl/tk(8\.5\.\d+)-src\.tar\.gz

More information about the Pkg-tcltk-commits mailing list