diff -pruN 1.3.40-3/debian/changelog 1.3.40-3ubuntu1/debian/changelog
--- 1.3.40-3/debian/changelog	2010-07-09 21:59:06.000000000 +0100
+++ 1.3.40-3ubuntu1/debian/changelog	2010-08-02 10:31:11.000000000 +0100
@@ -1,3 +1,16 @@
+swig1.3 (1.3.40-3ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable (LP: #612130), remaining changes:
+    - Drop libchicken-dev from the build-depends (it's in universe)
+    - Remove Pike from package description and from configure flags
+    - drop "--without-mzscheme", we don't have it in our build-depends
+    - use php-config5
+    - Clean Runtime/ as well.
+    - debian/rules (clean): Remove Lib/ocaml/swigp4.ml.
+  * debian/rules: Remove hardcoded python version.
+
+ -- Artur Rona <ari-tczew@tlen.pl>  Sat, 31 Jul 2010 17:26:45 +0200
+
 swig1.3 (1.3.40-3) unstable; urgency=low
 
   * debian/control: Line wrap build dependencies (closes: #556356).
@@ -9,6 +22,20 @@ swig1.3 (1.3.40-3) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Fri, 09 Jul 2010 22:58:21 +0200
 
+swig1.3 (1.3.40-2ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing (LP: #356529), remaining changes:
+    - Drop libchicken-dev from the build-depends (it's in universe)
+    - Remove Pike from package description and from configure flags
+    - drop "--without-mzscheme", we don't have it in our build-depends
+    - use php-config5
+    - Clean Runtime/ as well.
+    - debian/rules (clean): Remove Lib/ocaml/swigp4.ml.
+  * debian/rules: Remove hardcoded python version.
+  * Remove upper limit for python from Build-Depends.
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Sun, 15 Nov 2009 14:00:28 +0100
+
 swig1.3 (1.3.40-2) unstable; urgency=low
 
   * Retarget for unstable.
@@ -51,6 +78,26 @@ swig1.3 (1.3.38-1) experimental; urgency
 
  -- Torsten Landschoff <torsten@debian.org>  Thu, 26 Feb 2009 16:16:07 +0100
 
+swig1.3 (1.3.36-1ubuntu2) jaunty; urgency=low
+
+  * debian/control: update build dependency to python-dev (<<3.0) to build the
+    package with python2.6 (LP: #356805)
+
+ -- Fabrice Coutadeur <coutadeurf@gmail.com>  Tue, 07 Apr 2009 05:47:25 +0000
+
+swig1.3 (1.3.36-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Drop pike and libchicken-dev from the build-depends 
+      (both are universe)
+    - Use python2.5 instead of python2.4.
+    - use php5
+    - Clean Runtime/ as well.
+    - debian/Rules (clean): Remove Lib/ocaml/swigp4.ml.
+    - drop "--without-mzscheme", we don't have it in our build-depends
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 10 Nov 2008 16:29:56 +0100
+
 swig1.3 (1.3.36-1) unstable; urgency=low
 
   * New upstream release (closes: #488342).
@@ -61,6 +108,18 @@ swig1.3 (1.3.36-1) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Sun, 06 Jul 2008 03:07:56 +0200
 
+swig1.3 (1.3.35-4ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Drop support for pike.
+    - Use python2.5 instead of python2.4.
+    - use php5
+    - Clean Runtime/ as well.
+    - Force a few environment variables.
+    - debian/Rules (clean): Remove Lib/ocaml/swigp4.ml.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 20 Jun 2008 18:33:37 +0200
+
 swig1.3 (1.3.35-4) unstable; urgency=low
 
   * Acknowledge NMUs (closes: #476718, #477906). Thanks, guys!
@@ -133,6 +192,17 @@ swig1.3 (1.3.33-3) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Mon, 11 Feb 2008 18:38:17 +0100
 
+swig1.3 (1.3.33-2ubuntu1) hardy; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Drop support for pike.
+    - Use python2.5 instead of python2.4.
+    - Clean Runtime/ as well.
+    - Force a few environment variables.
+  * debian/Rules (clean): Remove Lib/ocaml/swigp4.ml.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 06 Dec 2007 10:27:08 +0000
+
 swig1.3 (1.3.33-2) unstable; urgency=low
 
   * debian/rules: Only run make distclean if the Makefile exists to make 
@@ -178,12 +248,44 @@ swig1.3 (1.3.31-2) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Wed, 22 Aug 2007 21:29:04 +0200
 
+swig1.3 (1.3.31-1ubuntu3) feisty; urgency=low
+
+  * And fix the python-dev build dependency. Happy Saturday Evening.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 13 Jan 2007 19:44:18 +0100
+
+swig1.3 (1.3.31-1ubuntu2) feisty; urgency=low
+
+  * Really drop support for pike7.6.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 13 Jan 2007 18:00:24 +0100
+
+swig1.3 (1.3.31-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - drop support for pike
+    - use php5 instead of php4
+    - clean Runtime/ as well
+    - force a few environment variables
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 20 Dec 2006 14:43:24 +0100
+
 swig1.3 (1.3.31-1) unstable; urgency=low
 
   * New upstream release (closes: #401211).
  
  -- Torsten Landschoff <torsten@debian.org>  Sat,  2 Dec 2006 01:56:34 +0100
 
+swig1.3 (1.3.29-2.1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - drop support for pike
+    - use php5 instead of php4
+    - clean Runtime/ as well
+    - force a few environment variables
+
+ -- Scott James Remnant <scott@ubuntu.com>  Tue, 28 Nov 2006 13:15:18 +0000
+
 swig1.3 (1.3.29-2.1) unstable; urgency=medium
 
   * Non-maintainer upload, BSP Zurich/Switzerland.
@@ -218,6 +320,15 @@ swig1.3 (1.3.29-1) unstable; urgency=low
  
  -- Torsten Landschoff <torsten@debian.org>  Mon,  7 Aug 2006 23:17:07 +0200
 
+swig1.3 (1.3.28-1.1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - don't use pike,
+    - use python 2.4,
+    - use php5.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 10 Jul 2006 16:07:11 +0100
+
 swig1.3 (1.3.28-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -249,6 +360,18 @@ swig1.3 (1.3.27-2) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Sat,  4 Feb 2006 02:11:39 +0100
 
+swig1.3 (1.3.27-1ubuntu2) dapper; urgency=low
+
+  * Change build depedency from chicken-dev to libchicken-dev.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 18 May 2006 15:48:06 +0100
+
+swig1.3 (1.3.27-1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian again, for the new subversion packages.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon,  5 Dec 2005 01:16:04 +1100
+
 swig1.3 (1.3.27-1) unstable; urgency=low
 
   * New upstream release.
@@ -263,6 +386,80 @@ swig1.3 (1.3.27-1) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Wed, 23 Nov 2005 00:54:00 +0100
 
+swig1.3 (1.3.25-1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.  Ubuntu #19335
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed,  9 Nov 2005 12:32:29 +0100
+
+swig1.3 (1.3.25-1) unstable; urgency=low
+
+  * New upstream release (closes: #293325).
+    + Includes fix to resource leak when using default arguments in 
+      constructors (closes: #297335).
+    + Puts -help and -version output on stdout (closes: #285038).
+
+ -- Torsten Landschoff <torsten@debian.org>  Thu, 22 Sep 2005 09:59:22 +0200
+
+swig1.3 (1.3.24-1ubuntu4) breezy; urgency=low
+
+  * Use php5-dev instead of php4-dev, to kick php4 out of main.
+  * Drop support for generation of pike bindings, as nothing uses it,
+    and swig is the only thing keeping pike7.6 in main (Ubuntu #13796)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu,  1 Sep 2005 18:35:55 +1000
+
+swig1.3 (1.3.24-1ubuntu3) breezy; urgency=low
+
+  * Fix python build dependency.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 May 2005 21:42:21 +0000
+
+swig1.3 (1.3.24-1ubuntu2) breezy; urgency=low
+
+  * Rebuild for new C++ ABI
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 18 May 2005 15:43:46 +0000
+
+swig1.3 (1.3.24-1ubuntu1) breezy; urgency=low
+
+  * Resynchronise with Debian.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 14 Apr 2005 23:40:16 +0100
+
+swig1.3 (1.3.24-1) unstable; urgency=low
+
+  * New upstream release (closes: #290895, #293694):
+    + Implements C# optional parameters (closes: #283314).
+  * Update config.guess, config.sub.
+  * Adjust for new pike version 7.6.
+  * Work around broken automake refresh feature
+  * Don't try to build/install runtime anymore
+  * Kill meta data for runtime packages
+  * Include CHANGES.current in the package (closes: #273912)
+
+ -- Torsten Landschoff <torsten@debian.org>  Sat, 12 Feb 2005 17:12:09 +0100
+
+swig1.3 (1.3.22-6) unstable; urgency=low
+
+  * Apply patch to fix breakage when returning const C++ objects
+    (closes: #294241). Thanks to Jeremy H. Brown for pointing this out.
+
+ -- Torsten Landschoff <torsten@debian.org>  Tue,  8 Feb 2005 20:26:27 +0100
+
+swig1.3 (1.3.22-5ubuntu2) hoary; urgency=low
+
+  * Build using python2.4 and pike7.6. Closes: #4146.
+
+ -- Matthias Klose <m@klose.in-berlin.de>  Mon, 10 Jan 2005 09:48:52 +0100
+
+swig1.3 (1.3.22-5ubuntu1) hoary; urgency=low
+
+  * Resynchronise with Debian.
+  * Make sure that we clean Runtime/ as well
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Tue,  7 Dec 2004 18:39:42 +0100
+
 swig1.3 (1.3.25-1) unstable; urgency=low
 
   * New upstream release (closes: #293325).
@@ -309,6 +506,12 @@ swig1.3 (1.3.22-4) unstable; urgency=low
  
  -- Torsten Landschoff <torsten@debian.org>  Wed, 10 Nov 2004 00:41:09 +0100
 
+swig1.3 (1.3.22-3ubuntu1) hoary; urgency=low
+
+  * Resync with Debian.
+
+ -- Daniel Stone <daniel.stone@canonical.com>  Tue,  2 Nov 2004 18:16:27 +0100
+
 swig1.3 (1.3.22-3) unstable; urgency=high
 
   * Urgency high because sarge is waiting for a fixed swig. This 
@@ -348,6 +551,12 @@ swig1.3 (1.3.22-1) unstable; urgency=low
 
  -- Torsten Landschoff <torsten@debian.org>  Sat, 25 Sep 2004 16:42:18 +0200
 
+swig1.3 (1.3.21-5ubuntu1) warty; urgency=low
+
+  * Fix linking for ruby, python, perl and tcl bindings
+
+ -- Thom May <thom@planetarytramp.net>  Mon,  2 Aug 2004 15:57:10 +0100
+
 swig1.3 (1.3.21-5) unstable; urgency=low
 
   * Acknowledge NMUs (closes: #248822, #246452). Thanks, Matthias!
@@ -683,4 +892,3 @@ swig (1.1.b5.p2-1) contrib; urgency=low
 
  -- Klee Dienes <klee@debian.org>  Fri, 7 Feb 1997 10:49:04 -0500
 
-
diff -pruN 1.3.40-3/debian/control 1.3.40-3ubuntu1/debian/control
--- 1.3.40-3/debian/control	2010-07-09 21:57:33.000000000 +0100
+++ 1.3.40-3ubuntu1/debian/control	2010-08-02 10:31:11.000000000 +0100
@@ -1,7 +1,8 @@
 Source: swig1.3
 Section: interpreters
 Priority: optional
-Maintainer: Torsten Landschoff <torsten@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Torsten Landschoff <torsten@debian.org>
 Standards-Version: 3.7.3
 Homepage: http://www.swig.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-swig/trunk
@@ -11,7 +12,6 @@ Build-Depends: bison,
                gcj [!hppa !mips !mipsel !alpha !arm !hurd-i386],
                gij [!hppa !mips !mipsel !alpha !arm !hurd-i386],
                guile-1.8-dev,
-               libchicken-dev [!m68k !mips !mipsel],
                libperl-dev,
                libpcre3-dev [!m68k !mips !mipsel],
                php5-cgi,
@@ -31,7 +31,7 @@ Suggests: swig-examples, swig-doc
 Description: Generate scripting interfaces to C/C++ code
  SWIG is a compiler that makes it easy to integrate C and C++ code
  with other languages including Perl, PHP, Tcl, Ruby, Python, Java, 
- Guile, Mzscheme, Chicken, OCaml, Pike, and C#.
+ Guile, Mzscheme, Chicken, OCaml, and C#.
  .
  Swig takes a set of ANSI C/C++ declarations and generates an 
  interface for them to your favorite scripting language.
@@ -42,7 +42,7 @@ Depends: swig (>= 1.3.0)
 Description: Generate scripting interfaces to C/C++ code
  SWIG is a compiler that makes it easy to integrate C and C++ code
  with other languages including Perl, PHP, Tcl, Ruby, Python, Java, 
- Guile, Mzscheme, Chicken, OCaml, Pike, and C#.
+ Guile, Mzscheme, Chicken, OCaml, and C#.
  .
  This is just an upgrade convenience package. For the real stuff 
  look at the swig package.
diff -pruN 1.3.40-3/debian/rules 1.3.40-3ubuntu1/debian/rules
--- 1.3.40-3/debian/rules	2009-08-06 23:41:54.000000000 +0100
+++ 1.3.40-3ubuntu1/debian/rules	2010-08-02 10:31:11.000000000 +0100
@@ -19,12 +19,8 @@ CONFIGURE_ARGS := \
 	--prefix=/usr --mandir=/usr/share/man	\
 	--with-tclconfig=/usr/lib/tcl8.4		\
 	--with-tclincl=/usr/include/tcl8.4		\
-	--with-python=/usr/bin/python2.5		\
 	--with-ruby=/usr/bin/ruby1.8			\
-	--with-pike=/usr/bin/pike7.6			\
-	--with-pikeincl=/usr/include/pike/7.6.24	\
-	--with-swiglibdir=/usr/share/swig1.3		\
-	--without-mzscheme
+	--with-swiglibdir=/usr/share/swig1.3
 
 DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
@@ -70,7 +66,7 @@ configure-stamp: $(QUILT_STAMPFN)
 	touch aclocal.m4
 	touch configure
 	touch Source/Makefile.in
-	PHP4INC="`php-config --includes`" \
+	PHP4INC="`php-config5 --includes`" \
 	CFLAGS="-g -O2 `perl -e 'use Config; print $$Config{ccflags};'`" \
 	./configure $(CONFIGURE_ARGS)
 	touch configure-stamp
@@ -89,9 +85,11 @@ clean: patch
 	rm -f config.log config.status
 	rm -f preinst-swig
 	rm -f Source/Include/swigconfig.h Source/Include/stamp-h1
+	rm -f Runtime/php_swigrun.h Runtime/swigrun.php Runtime/swigrun.pm Runtime/swigrun.py Runtime/swigrun.scm
 	rm -f `find -name Makefile.in|sed 's,\.in$$,,'`
 	rm -Rf Source/.deps
 	rm -Rf Lib/swigwarn.swg swig.spec
+	rm -f Lib/ocaml/swigp4.ml
 	dh_clean
 	debian/rules unpatch
 
