diff -u grsync-0.6.3/debian/control grsync-0.6.3/debian/control
--- grsync-0.6.3/debian/control
+++ grsync-0.6.3/debian/control
@@ -1,7 +1,8 @@
 Source: grsync
 Section: x11
 Priority: optional
-Maintainer: Daniel Baumann <daniel@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7), quilt, autotools-dev, intltool, libgtk2.0-dev, libxml-parser-perl
 Standards-Version: 3.8.0
 Homepage: http://www.opbyte.it/grsync/
diff -u grsync-0.6.3/debian/changelog grsync-0.6.3/debian/changelog
--- grsync-0.6.3/debian/changelog
+++ grsync-0.6.3/debian/changelog
@@ -1,3 +1,10 @@
+grsync (0.6.3-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #381175
+    - Add debian/patches/03-menu.dpatch: moving to System from Network.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Thu, 28 May 2009 11:48:41 +0530
+
 grsync (0.6.3-1) unstable; urgency=low
 
   * Merging upstream version 0.6.3.
@@ -6,6 +13,19 @@
 
  -- Daniel Baumann <daniel@debian.org>  Mon, 18 May 2009 12:07:34 +0200
 
+grsync (0.6.2-1ubuntu2) karmic; urgency=low
+
+  * debian/patches/series: Really apply 03-menu.dpatch
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Sat, 02 May 2009 12:07:18 +0200
+
+grsync (0.6.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #357800)
+    * Add debian/patches/03-menu.dpatch: moving to System from Network.  
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Sat, 02 May 2009 12:02:32 +0200
+
 grsync (0.6.2-1) unstable; urgency=low
 
   * Updating vcs fields in control file.
@@ -22,6 +42,14 @@
 
  -- Daniel Baumann <daniel@debian.org>  Wed, 18 Feb 2009 09:34:00 +0100
 
+grsync (0.6.1-3ubuntu1) jaunty; urgency=low
+
+  * Add debian/patches/03-menu.dpatch: moving to System from Network.  
+    Thanks to Leo Cacciari for the original patch. (Closes: #523140, 
+    LP: #354912)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 08 Apr 2009 11:07:17 -0700
+
 grsync (0.6.1-3) unstable; urgency=medium
 
   * Renaming locale directories to their generic name (Closes: #484640).
@@ -145,0 +174 @@
+
diff -u grsync-0.6.3/debian/patches/series grsync-0.6.3/debian/patches/series
--- grsync-0.6.3/debian/patches/series
+++ grsync-0.6.3/debian/patches/series
@@ -1,0 +2 @@
+03-menu.dpatch
only in patch2:
unchanged:
--- grsync-0.6.3.orig/debian/patches/03-menu.dpatch
+++ grsync-0.6.3/debian/patches/03-menu.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-menu.dpatch by  <leothehobbit@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Ubuntu: http://launchpad.net/bugs/354912
+## DP: Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523140
+## DP: Description: moving from Network to System since grsync has no
+## network capabilities
+
+@DPATCH@
+diff -urNad grsync-0.6.1~/grsync.desktop grsync-0.6.1/grsync.desktop
+--- grsync-0.6.1~/grsync.desktop	2007-08-20 16:17:09.000000000 +0200
++++ grsync-0.6.1/grsync.desktop	2009-04-08 12:36:44.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=grsync.png
+ Terminal=false
+ Type=Application
+-Categories=Application;Network;
++Categories=Application;System;
+ Comment=Synchronize files with rsync
+ Comment[fr]=Interface GTK pour rsync
+ Comment[it]=Sincronizza file con rsync