[Pkg-tcltk-commits] r662 - in tcl8.5/trunk/debian: . patches

Mon Jun 30 10:08:24 UTC 2008

Author: sgolovan-guest
Date: 2008-06-30 10:08:23 +0000 (Mon, 30 Jun 2008)
New Revision: 662

Added:
   tcl8.5/trunk/debian/patches/tclport.diff
Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/patches/series
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * Protected quilt calls in debian/rules to make the source package
    convertible to 3.0 (quilt) format (closes: #484915).
  * Added a patch by Stanislav Maslovski which restores relative inlude path
    for tclUnixPort.h in tclPort.h. This is harmful if unix directory is
    included into a serach path but allows to maintain backward compatibility
    (closes: #488491).


Modified: tcl8.5/trunk/debian/changelog
===================================================================

--- tcl8.5/trunk/debian/changelog	2008-06-30 00:20:43 UTC (rev 661)
+++ tcl8.5/trunk/debian/changelog	2008-06-30 10:08:23 UTC (rev 662)
@@ -1,8 +1,13 @@
-tcl8.5 (8.5.2-3) UNRELEASED; urgency=low
+tcl8.5 (8.5.2-3) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Protected quilt calls in debian/rules to make the source package
+    convertible to 3.0 (quilt) format (closes: #484915).
+  * Added a patch by Stanislav Maslovski which restores relative inlude path
+    for tclUnixPort.h in tclPort.h. This is harmful if unix directory is
+    included into a serach path but allows to maintain backward compatibility
+    (closes: #488491).
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 26 Jun 2008 20:09:55 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 30 Jun 2008 12:37:40 +0400
 
 tcl8.5 (8.5.2-2) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/patches/series
===================================================================
--- tcl8.5/trunk/debian/patches/series	2008-06-30 00:20:43 UTC (rev 661)
+++ tcl8.5/trunk/debian/patches/series	2008-06-30 10:08:23 UTC (rev 662)
@@ -1,3 +1,4 @@
+tclport.diff
 tcllibrary.diff
 tclpackagepath.diff
 tclprivate.diff

Added: tcl8.5/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclport.diff	                        (rev 0)
+++ tcl8.5/trunk/debian/patches/tclport.diff	2008-06-30 10:08:23 UTC (rev 662)
@@ -0,0 +1,14 @@
+Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
+
+--- tcl8.5-8.5.2.orig/generic/tclPort.h
++++ tcl8.5-8.5.2/generic/tclPort.h
+@@ -24,7 +24,7 @@
+ #if defined(__WIN32__)
+ #   include "../win/tclWinPort.h"
+ #else
+-#   include "tclUnixPort.h"
++#   include "../unix/tclUnixPort.h"
+ #endif
+ 
+ #if !defined(LLONG_MIN)

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2008-06-30 00:20:43 UTC (rev 661)
+++ tcl8.5/trunk/debian/rules	2008-06-30 10:08:23 UTC (rev 662)
@@ -26,19 +26,19 @@
 
 unpatch:
 	dh_testdir
-	-quilt pop -a
+	quilt pop -a || test $$? = 2
 	rm -rf patch-stamp .pc
 
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
-	quilt push -a
+	quilt push -a || test $$? = 2
 	touch patch-stamp
 
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
-# So so ugly but it works...
+	# So so ugly but it works...
 	touch generic/tclStubInit.c
 	cd unix && \
 	  TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
@@ -55,7 +55,7 @@
 		      --enable-man-compression=gzip && \
 	  touch ../generic/tclStubInit.c && \
 	  $(MAKE) CFLAGS="$(CFLAGS)"
-# Build the static library.
+	# Build the static library.
 	cd unix && \
 	  ar cr libtcl$(v).a *.o && \
 	  ar d libtcl$(v).a tclAppInit.o && \
@@ -67,12 +67,12 @@
 	dh_testroot
 	dh_clean
 
-clean-patched:
+clean-patched: patch-stamp
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
 	cd unix && [ ! -f Makefile ] || $(MAKE) distclean
-# Remove forgotten files
+	# Remove forgotten files
 	rm -f tests/pkg/pkga.so unix/config.log unix/Tcltest.so
 
 install: install-stamp
@@ -88,26 +88,26 @@
 		  MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
 		  TCL_MODULE_PATH="/usr/lib/tcltk /usr/share/tcltk" \
 		  install
-# Fix up the modules.
+	# Fix up the modules.
 	sed -i -e's:variable paths {}:variable paths {/usr/share/tcltk/tcl$(v)/tcl8}:' \
 	    debian/tmp/usr/share/tcltk/tcl$(v)/tm.tcl
 	install -d -m 755 `pwd`/debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
 	mv debian/tmp/usr/share/tcltk/tcl8/*/* debian/tmp/usr/share/tcltk/tcl$(v)/tcl8
-# Fix up the libraries.
+	# Fix up the libraries.
 	cp unix/libtcl$(v).a debian/tmp/usr/lib
 	#mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0
 	#ln -sf libtcl$(v).so.0 debian/tmp/usr/lib/libtcl$(v).so
 	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tcl$(v)
 	cp unix/tcl.m4 debian/tmp/usr/share/tcltk/tcl$(v)/tcl.m4
 	rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
-# Fix up the include files.
+	# Fix up the include files.
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
 	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/unix
 	cp unix/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/unix
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
 	cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
-# Fix up the manpages.
+	# Fix up the manpages.
 	cd debian/tmp/usr/share/man/man1 && \
 	  zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
 	  rm tclsh.1.gz
@@ -153,7 +153,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_movefiles -a
-# now, fix up file locations for .sh and .m4
+	# now, fix up file locations for .sh and .m4
 	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tcl.m4 \
 	   debian/tcl$(v)-dev/usr/share/aclocal/tcl$(v).m4
 	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tclConfig.sh \


