diff -u kdebase-3.5.7/debian/changelog kdebase-3.5.7/debian/changelog
--- kdebase-3.5.7/debian/changelog
+++ kdebase-3.5.7/debian/changelog
@@ -1,3 +1,10 @@
+kdebase (4:3.5.7-1ubuntu4) feisty; urgency=low
+
+  * Add kubuntu_97_icon alignement.diff it fix auto alignement on grid of
+    icon on desktop LP : 90801
+
+ -- Breuil Cyril <cyrilbport@gmail.com>  Thu, 31 May 2007 13:11:57 +0200
+
 kdebase (4:3.5.7-1ubuntu3) gutsy; urgency=low
 
   * Add kubuntu_96_gdm_logout_moved.diff ; the GDM control socket moved in
only in patch2:
unchanged:
--- kdebase-3.5.7.orig/debian/patches/kubuntu_97_icon_alignement.diff
+++ kdebase-3.5.7/debian/patches/kubuntu_97_icon_alignement.diff
@@ -0,0 +1,48 @@
+Index: kdesktop/krootwm.cc
+===================================================================
+--- kdesktop/krootwm.cc    2006-10-01 17:32:02.000000000 +0000
++++ kdesktop/krootwm.cc    2007-05-01 17:07:10.000000000 +0000
+@@ -241,7 +241,7 @@
+ 
+   // Read configuration for icons alignment
+   if ( m_bDesktopEnabled ) {
+-    m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() );
++    bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); 
+     if ( kapp->authorize( "editable_desktop_icons" ) ) {
+         m_pDesktop->iconView()->setItemsMovable( !KDesktopSettings::lockIcons() );
+         KToggleAction *aLockIcons = static_cast<KToggleAction*>(m_actionCollection->action("lock_icons")); 
+Index: kdesktop/krootwm.h
+===================================================================
+--- kdesktop/krootwm.h    2005-10-10 15:04:11.000000000 +0000
++++ kdesktop/krootwm.h    2007-05-01 17:45:24.000000000 +0000
+@@ -66,6 +66,7 @@
+   KRootWm(KDesktop*);
+   ~KRootWm();
+ 
++  bool startup;
+   void mousePressed( const QPoint& _global, int _button );
+   bool hasLeftButtonMenu() { return leftButtonChoice != NOTHING; } 
+ 
+Index: kdesktop/kdiconview.cc
+===================================================================
+--- kdesktop/kdiconview.cc    2007-05-01 17:20:28.000000000 +0000
++++ kdesktop/kdiconview.cc    2007-05-01 17:09: 18.000000000 +0000
+@@ -485,7 +485,7 @@
+ 
+     // Auto line-up icons
+     if ( b ) {
+-        lineupIcons();
++        if (!KRootWm::self()->startup) lineupIcons(); else KRootWm::self()->startup = false; 
+         connect( this, SIGNAL( iconMoved() ),
+                  this, SLOT( lineupIcons() ) );
+     }
+@@ -1438,7 +1438,7 @@
+               << " " << oldArea.width() << "x" << oldArea.height() << endl;
+ 
+     if ( m_autoAlign )
+-        lineupIcons();
++        int dummy = 0; //lineupIcons();
+     else {
+         bool needRepaint = false;
+         QIconViewItem* item;
+