diff -u bzr-fastimport-0.9.0~bzr188/debian/rules bzr-fastimport-0.9.0~bzr188/debian/rules
--- bzr-fastimport-0.9.0~bzr188/debian/rules
+++ bzr-fastimport-0.9.0~bzr188/debian/rules
@@ -4,6 +4,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 get-orig-source:
 	bzr builddeb --export-only --build-dir=tmp
diff -u bzr-fastimport-0.9.0~bzr188/debian/changelog bzr-fastimport-0.9.0~bzr188/debian/changelog
--- bzr-fastimport-0.9.0~bzr188/debian/changelog
+++ bzr-fastimport-0.9.0~bzr188/debian/changelog
@@ -1,3 +1,12 @@
+bzr-fastimport (0.9.0~bzr188-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Correctly log git fast-export exports
+    (Closes: #523858), (LP: #347729)
+  * Add a dependency on quilt
+
+ -- Gonéri Le Bouder <goneri@rulezlan.org>  Thu, 13 Aug 2009 16:38:12 +0200
+
 bzr-fastimport (0.9.0~bzr188-1) unstable; urgency=low
 
   * New upstream snapshot.
diff -u bzr-fastimport-0.9.0~bzr188/debian/control bzr-fastimport-0.9.0~bzr188/debian/control
--- bzr-fastimport-0.9.0~bzr188/debian/control
+++ bzr-fastimport-0.9.0~bzr188/debian/control
@@ -5,7 +5,8 @@
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Homepage: https://launchpad.net/bzr-fastimport
 Build-Depends-Indep: bzr (>= 1.0)
-Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python
+Build-Depends: python-central (>= 0.5), cdbs (>= 0.4.43), 
+ debhelper (>= 5.0.37.2), python, quilt
 Standards-Version: 3.8.2
 XS-Python-Version: >= 2.4
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-fastimport/unstable/
only in patch2:
unchanged:
--- bzr-fastimport-0.9.0~bzr188.orig/debian/patches/series
+++ bzr-fastimport-0.9.0~bzr188/debian/patches/series
@@ -0,0 +1 @@
+fix-git-fast-export.diff -p0
only in patch2:
unchanged:
--- bzr-fastimport-0.9.0~bzr188.orig/debian/patches/fix-git-fast-export.diff
+++ bzr-fastimport-0.9.0~bzr188/debian/patches/fix-git-fast-export.diff
@@ -0,0 +1,14 @@
+Index: parser.py
+===================================================================
+--- parser.py.orig
++++ parser.py
+@@ -406,6 +406,9 @@
+         line = self.next_line()
+         if line is None:
+             return None
++        # git-fast-export puts "from :"
++        elif line.startswith('from :'):
++            return line[len('from :'):]
+         elif line.startswith('from '):
+             return line[len('from '):]
+         elif required_for: