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

Mon Jun 30 10:18:01 UTC 2008

Author: sgolovan-guest
Date: 2008-06-30 10:18:00 +0000 (Mon, 30 Jun 2008)
New Revision: 664

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


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

--- tk8.5/trunk/debian/changelog	2008-06-30 10:14:02 UTC (rev 663)
+++ tk8.5/trunk/debian/changelog	2008-06-30 10:18:00 UTC (rev 664)
@@ -1,9 +1,15 @@
-tk8.5 (8.5.2-2) UNRELEASED; urgency=low
+tk8.5 (8.5.2-2) unstable; urgency=low
 
   * Fixed clean target to work with debhelper 7.0 (made dh_clean the last
     command, so debhelper logs are removed now).
+  * Protected quilt calls in debian/rules to make the source package
+    convertible to 3.0 (quilt) format (closes: #484927).
+  * Added a patch by Stanislav Maslovski which restores relative inlude path
+    for tkUnixPort.h in tkPort.h. This is harmless if unix directory is
+    included into a serach path but allows to maintain backward compatibility
+    (closes: #488501).
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 01 May 2008 12:33:38 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 30 Jun 2008 14:08:57 +0400
 
 tk8.5 (8.5.2-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/patches/series
===================================================================
--- tk8.5/trunk/debian/patches/series	2008-06-30 10:14:02 UTC (rev 663)
+++ tk8.5/trunk/debian/patches/series	2008-06-30 10:18:00 UTC (rev 664)
@@ -1,3 +1,4 @@
+tkport.diff
 tklibrary.diff
 tkprivate.diff
 confsearch.diff

Added: tk8.5/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff	                        (rev 0)
+++ tk8.5/trunk/debian/patches/tkport.diff	2008-06-30 10:18:00 UTC (rev 664)
@@ -0,0 +1,14 @@
+Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
+
+--- tk8.5-8.5.2.orig/generic/tkPort.h
++++ tk8.5-8.5.2/generic/tkPort.h
+@@ -29,7 +29,7 @@
+ #   if defined(MAC_OSX_TK)
+ #	include "tkMacOSXPort.h"
+ #   else
+-#	include "tkUnixPort.h"
++#	include "../unix/tkUnixPort.h"
+ #   endif
+ #endif
+ 

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2008-06-30 10:14:02 UTC (rev 663)
+++ tk8.5/trunk/debian/rules	2008-06-30 10:18:00 UTC (rev 664)
@@ -20,13 +20,13 @@
 
 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
@@ -46,7 +46,7 @@
 		      --enable-man-symlinks \
 		      --enable-man-compression=gzip && \
 	  $(MAKE) CFLAGS="$(CFLAGS)"
-# Build the static library.
+	# Build the static library.
 	cd unix && \
 	  ar cr libtk$(v).a *.o && \
 	  ar d libtk$(v).a tkAppInit.o && \
@@ -58,7 +58,7 @@
 	dh_testroot
 	dh_clean
 
-clean-patched:
+clean-patched: patch-stamp
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp install-stamp
@@ -75,21 +75,21 @@
 	  $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
 		  MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
 		  MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 install
-# Fix up pkgInstall.tcl
+	# Fix up pkgInstall.tcl
 	cp debian/tmp/usr/lib/tk$(v)/* debian/tmp/usr/share/tcltk/tk$(v)
-# Fix up the libraries.
+	# Fix up the libraries.
 	cp unix/libtk$(v).a debian/tmp/usr/lib
 	mv debian/tmp/usr/lib/libtk$(v).so debian/tmp/usr/lib/libtk$(v).so.0
 	ln -sf libtk$(v).so.0 debian/tmp/usr/lib/libtk$(v).so
 	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tk$(v)
-# Fix up the include files.
+	# Fix up the include files.
 	install -d debian/tmp/usr/include/tcl$(v)/tk-private/generic
 	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tk-private/generic
 	install -d debian/tmp/usr/include/tcl$(v)/tk-private/unix
 	cp unix/*.h debian/tmp/usr/include/tcl$(v)/tk-private/unix
 	install -d debian/tmp/usr/include/tcl$(v)/tk-private/compat
 	cp compat/*.h debian/tmp/usr/include/tcl$(v)/tk-private/compat
-# Fix up the manpages.
+	# Fix up the manpages.
 	cd debian/tmp/usr/share/man/man1 && \
 	  mv wish.1.gz wish$(v).1.gz
 	cd debian/tmp/usr/share/man/man3 && \
@@ -142,14 +142,14 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_movefiles -a
-# now, fix up file locations for .sh
+	# now, fix up file locations for .sh
 	mv debian/tk$(v)/usr/share/tcltk/tk$(v)/*.sh \
 	   debian/tk$(v)-dev/usr/share/tcltk/tk$(v)
 	ln -s ../../share/tcltk/tk$(v)/tkConfig.sh \
 	      debian/tk$(v)-dev/usr/lib/tk$(v)/tkConfig.sh
 	dh_installdocs -a
 	install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/
-# move around the demos
+	# move around the demos
 	cp -a library/demos/* `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/
 	rm -f debian/tk$(v)/usr/share/doc/tk$(v)/examples/license.terms
 	dh_installmenu -a


