diff -Nru /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/changelog /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/changelog
--- /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/changelog	2006-08-19 07:21:19.000000000 +0200
+++ /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/changelog	2007-03-25 01:33:12.000000000 +0100
@@ -1,3 +1,16 @@
+avifile (1:0.7.44.20051021-2.2ubuntu1) feisty; urgency=low
+
+  * Rebuild against new libdirectfb-0.9-25. (LP: #95405)
+  * Adhere to DebianMaintainerField.
+  * debian/README.Debian: update debian-multimedia repository apt lines.
+    (LP: #38017)
+  * Use quilt patchsystem:
+    + debian/patches/01_fix_non-template_pair_build_failure.diff: patch taken
+      from Bug #395386 in Debian BTS to work around a bug of gcc
+      (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29469).
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Sun, 25 Mar 2007 01:24:13 +0100
+
 avifile (1:0.7.44.20051021-2.2) unstable; urgency=low
 
   * NMU.
diff -Nru /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/control /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/control
--- /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/control	2006-08-19 07:20:09.000000000 +0200
+++ /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/control	2007-03-25 01:34:41.000000000 +0100
@@ -1,9 +1,10 @@
 Source: avifile
 Section: graphics
 Priority: optional
-Maintainer: Zdenek Kabelac <kabi@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Zdenek Kabelac <kabi@debian.org>
 Standards-Version: 3.5.8
-Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.1.1-2), libsdl1.2-dev | libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev, libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, autoconf (>= 2.13-1), automake1.9, libtool, gettext, patch, netpbm | pnmtopng
+Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.1.1-2), libsdl1.2-dev | libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev, libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, autoconf (>= 2.13-1), automake1.9, libtool, gettext, patch, netpbm | pnmtopng, quilt (>= 0.40)
 
 Package: libavifile-0.7c2
 Architecture: any
diff -Nru /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/patches/01_fix_non-template_pair_build_failure.diff /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/patches/01_fix_non-template_pair_build_failure.diff
--- /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/patches/01_fix_non-template_pair_build_failure.diff	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/patches/01_fix_non-template_pair_build_failure.diff	2007-03-25 01:19:28.000000000 +0100
@@ -0,0 +1,130 @@
+--- avifile-0.7.44.20051021.orig/include/avm_map.h	2004-02-19 11:39:56.000000000 +0000
++++ avifile-0.7.44.20051021/include/avm_map.h	2006-10-22 01:37:30.000000000 +0000
+@@ -28,47 +28,48 @@
+     bool operator()(const Key& k1, const Key& k2) const { return k1==k2; }
+ };
+ 
++template <class Key, class Value> struct _avm_map_pair
++{
++    Key key;
++    Value value;
++    _avm_map_pair() : key(Key()), value(Value()) {}
++    _avm_map_pair(Key k, Value v) : key(k), value(v) {}
++    _avm_map_pair(const _avm_map_pair<Key, Value>& p) : key(p.key), value(p.value) {}
++};
++
++template <class Key, class Value> struct _avm_map_binary_tree_node
++{
++    _avm_map_pair<Key, Value>* entry;
++    _avm_map_binary_tree_node<Key, Value>* left;
++    Key minval;
++    _avm_map_binary_tree_node<Key, Value>* right;
++    _avm_map_binary_tree_node<Key, Value>* parent;
++    Key maxval;
++    _avm_map_binary_tree_node(_avm_map_binary_tree_node<Key, Value>* ptr=0) : entry(0), left(0), right(0), parent(ptr), weight(1) {}
++    int weight;
++    void destroy()
++    {
++	if(left)
++	{
++	    left->destroy();
++	    delete left;
++	}
++	if(right)
++	{
++	    right->destroy();
++	    delete right;
++	}
++	delete entry;
++    }
++};
++
+ // do not use this container in time critical context
+ // search time is between log(N) and N, depending on order of element insertion
+ template <class Key, class Value, class Compare = less<Key>, class equal = equal<Key> > class avm_map
+ {
+ protected:
+-    template <class Key1, class Value1> struct pair
+-    {
+-	Key1 key;
+-	Value1 value;
+-	pair() : key(Key()), value(Value()) {}
+-	pair(Key1 k, Value1 v) : key(k), value(v) {}
+-	pair(const pair<Key1, Value1>& p) : key(p.key), value(p.value) {}
+-    };
+-    typedef pair<Key, Value> _Tpair;
+-
+-    template <class Key1, class Value1> struct binary_tree_node
+-    {
+-	avm_map::pair<Key1, Value1>* entry;
+-	binary_tree_node<Key1, Value1>* left;
+-	Key1 minval;
+-	binary_tree_node<Key1, Value1>* right;
+-	binary_tree_node<Key1, Value1>* parent;
+-	Key1 maxval;
+-	binary_tree_node(binary_tree_node<Key1, Value1>* ptr=0) : entry(0), left(0), right(0), parent(ptr), weight(1) {}
+-	int weight;
+-	void destroy()
+-	{
+-	    if(left)
+-	    {
+-		left->destroy();
+-		delete left;
+-	    }
+-	    if(right)
+-	    {
+-		right->destroy();
+-		delete right;
+-	    }
+-	    delete entry;
+-	}
+-    };
+-    typedef binary_tree_node<Key, Value> _Tnode;
++    typedef _avm_map_pair<Key, Value> _Tpair;
++    typedef _avm_map_binary_tree_node<Key, Value> _Tnode;
+ 
+     _Tnode* m_pTree;
+     Value* m_pDefaultValue;
+@@ -190,7 +191,7 @@
+ template <class Key, class Value, class Compare, class Equal> avm_map<Key, Value, Compare, Equal>::avm_map()
+ {
+     m_pTree=new _Tnode;
+-    m_pTree->entry = new pair<Key, Value>;
++    m_pTree->entry = new _Tpair;
+     m_pDefaultValue=&(m_pTree->entry->value);
+ }
+ 
+@@ -268,14 +269,14 @@
+ 	    if(m_sC(ptr->entry->key, key))
+ 	    {
+ 		ptr->left->entry=ptr->entry;
+-		ptr->right->entry=new pair<Key, Value>(key, value);
++		ptr->right->entry=new _Tpair(key, value);
+ 		ptr->entry=0;
+ 		update_min_max_weights(ptr);
+ 		return &(ptr->right->entry->value);
+ 	    }
+ 	    else
+ 	    {
+-		ptr->left->entry=new pair<Key, Value>(key, value);
++		ptr->left->entry=new _Tpair(key, value);
+ 		ptr->right->entry=ptr->entry;
+ 		ptr->entry=0;
+ 		update_min_max_weights(ptr);
+@@ -305,14 +306,14 @@
+ 	if(!ptr->left)
+ 	{
+ 	    ptr->left=new _Tnode(ptr);
+-	    ptr->left->entry=new pair<Key, Value>(key, value);
++	    ptr->left->entry=new _Tpair(key, value);
+ 	    update_min_max_weights(ptr);
+ 	    return &(ptr->left->entry->value);
+ 	}
+ 	if(!ptr->right)
+ 	{
+ 	    ptr->right=new _Tnode(ptr);
+-	    ptr->right->entry=new pair<Key, Value>(key, value);
++	    ptr->right->entry=new _Tpair(key, value);
+ 	    update_min_max_weights(ptr);
+ 	    return &(ptr->right->entry->value);
+ 	}
diff -Nru /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/patches/series /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/patches/series
--- /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/patches/series	2007-03-25 01:23:51.000000000 +0100
@@ -0,0 +1 @@
+01_fix_non-template_pair_build_failure.diff
diff -Nru /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/README.debian /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/README.debian
--- /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/README.debian	2005-02-24 11:47:47.000000000 +0100
+++ /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/README.debian	2007-03-25 00:42:01.000000000 +0100
@@ -8,8 +8,8 @@
  * Unofficial Debian packages which might be useful for many users could
    be found here - use this apt line:
    
-   deb ftp://ftp.nerim.net/debian-marillat/ unstable main
-   deb-src http://perso.wanadoo.fr/debian/ unstable main
+   deb http://mirror.home-dn.net/debian-multimedia unstable main
+   deb-src http://mirror.home-dn.net/debian-multimedia unstable main
 
    Should contain Win32 codecs and other various packages which
    users might find very usable 
diff -Nru /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/rules /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/rules
--- /tmp/T4EBBv9gEp/avifile-0.7.44.20051021/debian/rules	2006-06-03 21:15:49.000000000 +0200
+++ /tmp/Vz7huXjdUI/avifile-0.7.44.20051021/debian/rules	2007-03-25 01:23:33.000000000 +0100
@@ -8,6 +8,8 @@
 # This version is for a multibinary package. It also allows you to build any
 # of the binary packages independantly, via binary-<package> targets.
 
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -63,7 +65,7 @@
 	$(MAKE)
 	touch build-stamp
 
-cleanB:
+cleanB: unpatch
 	@dh_testdir
 	@dh_clean
 #	rm -rf core `find debian/* -type d ! -name CVS`
@@ -76,7 +78,7 @@
 	@rm -rf debian/docs .snprj build-stamp configure-stamp
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	@echo "---=== Debian package is build with Lame support ===---"
 	@echo "           library is being linked at runtime"