[Pkg-tcltk-commits] r953 - in expect/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-10-17 13:11:58 +0000 (Sat, 17 Oct 2009)
New Revision: 953

Modified:
   expect/trunk/debian/changelog
   expect/trunk/debian/control
   expect/trunk/debian/patches/16-logfile.patch
   expect/trunk/debian/patches/19-tk-init.patch
   expect/trunk/debian/rules
Log:
[expect]
  * Added buid conflicy with autoconf2.13 because autoconf 2.50 or newer is
    required to process configure.in template.
  * Fixed building with the current config.sub and config.guess from
    autotools-dev package (closes: #551332).
  * Fixed cleaning after build is done.


Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog	2009-10-17 07:18:37 UTC (rev 952)
+++ expect/trunk/debian/changelog	2009-10-17 13:11:58 UTC (rev 953)
@@ -1,8 +1,12 @@
-expect (5.44.1.14-2) UNRELEASED; urgency=low
+expect (5.44.1.14-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Added buid conflicy with autoconf2.13 because autoconf 2.50 or newer is
+    required to process configure.in template.
+  * Fixed building with the current config.sub and config.guess from
+    autotools-dev package (closes: #551332).
+  * Fixed cleaning after build is done.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 17 Oct 2009 11:18:35 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 17 Oct 2009 16:55:29 +0400
 
 expect (5.44.1.14-1) unstable; urgency=low
 

Modified: expect/trunk/debian/control
===================================================================
--- expect/trunk/debian/control	2009-10-17 07:18:37 UTC (rev 952)
+++ expect/trunk/debian/control	2009-10-17 13:11:58 UTC (rev 953)
@@ -5,6 +5,7 @@
 Build-Depends:
  debhelper (>= 7.0.50~), quilt (>=0.46-7), autotools-dev, autoconf, tcl8.5-dev, tk8.5-dev,
  x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev
+Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3
 Homepage: http://sourceforge.net/projects/expect/
 

Modified: expect/trunk/debian/patches/16-logfile.patch
===================================================================
--- expect/trunk/debian/patches/16-logfile.patch	2009-10-17 07:18:37 UTC (rev 952)
+++ expect/trunk/debian/patches/16-logfile.patch	2009-10-17 13:11:58 UTC (rev 953)
@@ -4,7 +4,7 @@
 diff -Naurp expect.orig/exp_log.c expect/exp_log.c
 --- expect.orig/exp_log.c	2009-08-03 06:58:30.000000000 +0000
 +++ expect/exp_log.c	2009-08-03 09:12:40.000000000 +0000
-@@ -471,7 +471,7 @@ expLogChannelOpen(interp,filename,append
+@@ -499,7 +499,7 @@ expLogChannelOpen(interp,filename,append
  	Tcl_DStringAppend(&tsdPtr->logFilename,filename,-1);
      }
  

Modified: expect/trunk/debian/patches/19-tk-init.patch
===================================================================
--- expect/trunk/debian/patches/19-tk-init.patch	2009-10-17 07:18:37 UTC (rev 952)
+++ expect/trunk/debian/patches/19-tk-init.patch	2009-10-17 13:11:58 UTC (rev 953)
@@ -4,7 +4,7 @@
 
 --- expect-5.44.1.14.orig/exp_main_tk.c
 +++ expect-5.44.1.14/exp_main_tk.c
-@@ -162,13 +162,7 @@
+@@ -162,13 +173,7 @@
   * the "argv" variable in Tk_Init.
   */
  
@@ -19,7 +19,7 @@
  
  /* for Expect */
  int my_rc = 1;
-@@ -181,21 +175,6 @@
+@@ -181,21 +186,6 @@
  int print_version = 0;
  
  static Tk_ArgvInfo argTable[] = {
@@ -50,7 +50,7 @@
      {(char *) NULL, TK_ARGV_END, (char *) NULL, (char *) NULL,
  	(char *) NULL}
  };
-@@ -243,11 +224,11 @@
+@@ -243,11 +235,11 @@
      Tcl_Interp *interp;		/* Interpreter to initialize. */
  {
      CONST char *p;
@@ -66,7 +66,7 @@
  
      /*
       * If there is an "argv" variable, get its value, extract out
-@@ -255,8 +236,7 @@
+@@ -255,8 +247,7 @@
       * the arguments that we used.
       */
  
@@ -76,7 +76,7 @@
      p = Tcl_GetVar2(interp, "argv", (char *) NULL, TCL_GLOBAL_ONLY);
      argv = NULL;
      if (p != NULL) {
-@@ -285,115 +265,57 @@
+@@ -285,115 +276,57 @@
  	    }
  	}
  

Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules	2009-10-17 07:18:37 UTC (rev 952)
+++ expect/trunk/debian/rules	2009-10-17 13:11:58 UTC (rev 953)
@@ -12,15 +12,22 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-
 	rm -f *.a *.o
 	rm -rf shared
+	rm -f expect_cf.h tcldbgcf.h
+	[ ! -f tclconfig/config.guess~ ] || mv -f tclconfig/config.guess~ tclconfig/config.guess
+	[ ! -f tclconfig/config.sub~ ] || mv -f tclconfig/config.sub~ tclconfig/config.sub
+	[ ! -f config.guess~ ] || mv -f config.guess~ config.guess
+	[ ! -f config.sub~ ] || mv -f config.sub~ config.sub
+	[ ! -f configure~ ] || mv -f configure~ configure
+	[ ! -f testsuite/Makefile ] || $(MAKE) -C testsuite distclean
 
-	rm -f config.guess config.sub
-
 override_dh_auto_configure:
-	cp -f /usr/share/misc/config.guess config.guess
-	cp -f /usr/share/misc/config.sub config.sub
+	cp -f configure configure~
+	cp -fb /usr/share/misc/config.guess tclconfig/config.guess
+	cp -fb /usr/share/misc/config.sub tclconfig/config.sub
+	cp -fb /usr/share/misc/config.guess config.guess
+	cp -fb /usr/share/misc/config.sub config.sub
 
 	autoconf
 	#patch -Np1 -i debian/patches/static-names.diff