diff -u git-core-1.5.6.3/debian/control git-core-1.5.6.3/debian/control
--- git-core-1.5.6.3/debian/control
+++ git-core-1.5.6.3/debian/control
@@ -1,8 +1,9 @@
 Source: git-core
 Section: devel
 Priority: optional
-Maintainer: Gerrit Pape <pape@smarden.org>
-Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72), libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl, unzip, tcl8.5, gettext, cvs, cvsps, libdbd-sqlite3-perl
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gerrit Pape <pape@smarden.org>
+Build-Depends: libz-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev, asciidoc (>> 8.0.0), xmlto, docbook-xsl (>> 1.72), libexpat1-dev, subversion, libsvn-perl | libsvn-core-perl, unzip, tcl8.5, gettext, cvs, libdbd-sqlite3-perl
 Standards-Version: 3.8.0.1
 Vcs-Git: http://smarden.org/git/git.git/
 
diff -u git-core-1.5.6.3/debian/changelog git-core-1.5.6.3/debian/changelog
--- git-core-1.5.6.3/debian/changelog
+++ git-core-1.5.6.3/debian/changelog
@@ -1,3 +1,14 @@
+git-core (1:1.5.6.3-1.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable (LP: #248750), remaining changes:
+    - debian/control: Drop recently introduced cvsps build dependency; it's only
+      necessary for some self tests, but is in universe.
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+  * Fix "Stack-based buffer overflow" (CVE-2008-3546) (LP: #256617)
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Mon, 11 Aug 2008 19:05:40 +0200
+
 git-core (1:1.5.6.3-1.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
@@ -193,6 +204,24 @@
 
  -- Gerrit Pape <pape@smarden.org>  Mon, 10 Mar 2008 10:38:51 +0000
 
+git-core (1:1.5.4.3-1ubuntu2) hardy; urgency=low
+
+  * debian/rules: Use wish8.4 for the tcl interpreter, to match our dependency
+    in debian/control. (LP: #196846)
+
+ -- Bryan Donlan <bdonlan@fushizen.net>  Sun, 06 Apr 2008 18:53:53 -0400
+
+git-core (1:1.5.4.3-1ubuntu1) hardy; urgency=low
+
+  * debian/control: Switch back Tcl/Tk dependencies to 8.4, since that's what
+    we settled for in Hardy.
+  * debian/control: Drop recently introduced cvsps build dependency; it's only
+    necessary for some self tests, but is in universe.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 27 Feb 2008 16:34:26 +0100
+
 git-core (1:1.5.4.3-1) unstable; urgency=low
 
   * new upstream point release.
@@ -1432,0 +1462 @@
+
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged:
only in patch2:
unchanged: